Run all components in one namespace

[oom.git] / kubernetes / aai / templates / search-data-service-deployment.yaml

diff --git a/kubernetes/aai/templates/search-data-service-deployment.yaml b/kubernetes/aai/templates/search-data-service-deployment.yaml
index f2db937..fc5a0d2 100644 (file)
--- a/kubernetes/aai/templates/search-data-service-deployment.yaml
+++ b/kubernetes/aai/templates/search-data-service-deployment.yaml
@@ -1,9 +1,11 @@
+#{{ if not .Values.disableAaiSearchDataService }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: search-data-service
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  name: aai-search-data-service
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.searchDataServiceReplicas }}
   selector:
     matchLabels:
       app: search-data-service
@@ -11,7 +13,7 @@ spec:
     metadata:
       labels:
         app: search-data-service
-      name: search-data-service
+      name: aai-search-data-service
     spec:
       containers:
       - name: search-data-service
@@ -25,10 +27,29 @@ spec:
         - name: KEY_MANAGER_PASSWORD
           value: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
         volumeMounts:
-        - mountPath: /opt/app/search-data-service/config/
+        - mountPath: /etc/localtime
+          name: localtime
+          readOnly: true
+        - mountPath: /opt/app/search-data-service/config/filter-config.json
+          subPath: filter-config.json
           name: aai-search-data-service-config
-        - mountPath: /logs/
+        - mountPath: /opt/app/search-data-service/config/elastic-search.properties
+          subPath: elastic-search.properties
+          name: aai-search-data-service-config
+        - mountPath: /opt/app/search-data-service/config/analysis-config.json
+          subPath: filter-config.json
+          name: aai-search-data-service-config
+        - mountPath: /opt/app/search-data-service/config/auth/tomcat_keystore
+          subPath: tomcat_keystore
+          name: aai-search-data-service-auth-config
+        - mountPath: /opt/app/search-data-service/config/auth/search_policy.json
+          subPath: search_policy.json
+          name: aai-search-data-search-policy-config
+        - mountPath: /var/log/onap
           name: aai-search-data-service-logs
+        - mountPath: /opt/app/search-data-service/bundleconfig/etc/logback.xml
+          name: aai-search-data-service-log-conf
+          subPath: logback.xml
         ports:
         - containerPort: 9509
         readinessProbe:
@@ -36,13 +57,41 @@ spec:
             port: 9509
           initialDelaySeconds: 5
           periodSeconds: 10
+      - name: filebeat-onap-aai-search
+        image: {{ .Values.image.filebeat }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        volumeMounts:
+        - mountPath: /usr/share/filebeat/filebeat.yml
+          subPath: filebeat.yml
+          name: filebeat-conf
+        - mountPath: /var/log/onap
+          name: aai-search-data-service-logs
+        - mountPath: /usr/share/filebeat/data
+          name: aai-search-data-service-filebeat
       volumes:
-      - name: aai-search-data-service-config
+      - name: localtime
         hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/search-data-service/appconfig/"
+          path: /etc/localtime
+      - name: aai-search-data-service-config
+        configMap:
+          name: aai-search-data-configmap
+      - name: aai-search-data-service-auth-config
+        secret:
+          secretName: aai-search-data-keystone-secret
+      - name: aai-search-data-search-policy-config
+        configMap:
+          name: aai-search-policy-configmap
+      - name: filebeat-conf
+        configMap:
+          name: aai-filebeat-configmap
       - name: aai-search-data-service-logs
-        hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/search-data-service/logs/"
+        emptyDir: {}
+      - name: aai-search-data-service-filebeat
+        emptyDir: {}
+      - name: aai-search-data-service-log-conf
+        configMap:
+         name: aai-search-data-service-log-configmap
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}