added filebeat to all components

[oom.git] / kubernetes / sdnc / templates / sdnc-deployment.yaml

diff --git a/kubernetes/sdnc/templates/sdnc-deployment.yaml b/kubernetes/sdnc/templates/sdnc-deployment.yaml
index eb1fdc8..8b4d0eb 100644 (file)
--- a/kubernetes/sdnc/templates/sdnc-deployment.yaml
+++ b/kubernetes/sdnc/templates/sdnc-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: sdnc
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-sdnc"
 spec:
   selector:
     matchLabels:
@@ -51,8 +51,17 @@ spec:
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: sdnc-controller-container
         volumeMounts:
-        - mountPath: /opt/openecomp/sdnc/data/properties
-          name: sdnc-conf
+        - mountPath: /etc/localtime
+          name: localtime
+          readOnly: true
+        - mountPath: /opt/openecomp/sdnc/data/properties/aaiclient.properties
+          name: sdnc-aaiclient-properties
+        - mountPath: /opt/openecomp/sdnc/data/properties/admportal.json
+          name: sdnc-admportal-json
+        - mountPath: /var/log/onap
+          name: sdnc-logs
+        - mountPath: /opt/opendaylight/current/etc/org.ops4j.pax.logging.cfg
+          name: sdnc-log-config
         ports:
         - containerPort: 8181
         readinessProbe:
@@ -60,9 +69,35 @@ spec:
             port: 8181
           initialDelaySeconds: 5
           periodSeconds: 10
+      - image: {{ .Values.image.filebeat }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: filebeat-onap
+        volumeMounts:
+        - mountPath: /usr/share/filebeat/filebeat.yml
+          name: filebeat-conf
+        - mountPath: /var/log/onap
+          name: sdnc-logs
+        - mountPath: /usr/share/filebeat/data
+          name: sdnc-data-filebeat
       volumes:
-        - name: sdnc-conf
+        - name: localtime
+          hostPath:
+            path: /etc/localtime
+        - name: filebeat-conf
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+        - name: sdnc-log-config
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/sdnc/org.ops4j.pax.logging.cfg
+        - name: sdnc-logs
+          emptyDir: {}
+        - name: sdnc-data-filebeat
+          emptyDir: {}
+        - name: sdnc-aaiclient-properties
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/aaiclient.properties
+        - name: sdnc-admportal-json
           hostPath:
-            path: /dockerdata-nfs/onapdemo/sdnc/conf
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/admportal.json
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"