Merge "Update annotations to spec for sdnc"

[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 4b12390..1c88fff 100644 (file)
--- a/kubernetes/sdnc/templates/sdnc-deployment.yaml
+++ b/kubernetes/sdnc/templates/sdnc-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableSdncSdnc }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -12,41 +13,30 @@ spec:
       labels:
         app: sdnc
       name: sdnc
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--container-name",
-                  "sdnc-db-container"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "valueFrom": {
-                          "fieldRef": {
-                              "apiVersion": "v1",
-                              "fieldPath": "metadata.namespace"
-                          }
-                      }
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "sdnc-readiness"
-          }
-          ]'
     spec:
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - sdnc-db-container
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: {{ .Values.image.readiness }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: sdnc-readiness
       containers:
       - command:
-        - /opt/openecomp/sdnc/bin/startODL.sh
+        - /opt/onap/sdnc/bin/startODL.sh
         env:
         - name: MYSQL_ROOT_PASSWORD
           value: openECOMP1.0
         - name: SDNC_CONFIG_DIR
-          value: /opt/openecomp/sdnc/data/properties
+          value: /opt/onap/sdnc/data/properties
         image: {{ .Values.image.sdnc }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: sdnc-controller-container
@@ -54,21 +44,46 @@ spec:
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
-        - mountPath: /opt/openecomp/sdnc/data/properties/aaiclient.properties
+        - mountPath: /opt/onap/sdnc/data/properties/aaiclient.properties
           name: sdnc-aaiclient-properties
-        - mountPath: /opt/openecomp/sdnc/data/properties/admportal.json
-          name: sdnc-admportal-json          
+        - mountPath: /opt/onap/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
+        - containerPort: 8101
         readinessProbe:
           tcpSocket:
             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: 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
@@ -77,3 +92,4 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/admportal.json
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}