Merge "enable ssl propery should be bool"

[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 7413275..e166845 100644 (file)
--- a/kubernetes/aai/templates/search-data-service-deployment.yaml
+++ b/kubernetes/aai/templates/search-data-service-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiSearchDataService }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -30,8 +31,11 @@ spec:
           readOnly: true
         - mountPath: /opt/app/search-data-service/config/
           name: aai-search-data-service-config
-        - mountPath: /logs/
+        - 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:
@@ -39,6 +43,16 @@ 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
+          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: localtime
         hostPath:
@@ -46,9 +60,25 @@ spec:
       - name: aai-search-data-service-config
         hostPath:
           path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/search-data-service/appconfig/"
-      - name: aai-search-data-service-logs
+      - name: filebeat-conf
         hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/search-data-service/logs/"
+          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
+      - name: 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-configmap
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: aai-search-data-service-configmap
+  namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ (.Files.Glob "resources/search-data-service/conf/logback.xml").AsConfig | indent 2 }}
+#{{ end }}