X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Ftemplates%2Fdeployment.yaml;h=0f907372a3b73a1076b684a59b8612c562a30899;hb=5768008d908cb4868652746c6a2aa46437c8c1c2;hp=67630d2619e6627cb0df3ad70ab843cca1dd0ca5;hpb=87274bc2e86ea15b777b82be36ad029e3f94bac7;p=oom.git

diff --git a/kubernetes/so/templates/deployment.yaml b/kubernetes/so/templates/deployment.yaml
index 67630d2619..0f907372a3 100644
--- a/kubernetes/so/templates/deployment.yaml
+++ b/kubernetes/so/templates/deployment.yaml
@@ -35,7 +35,7 @@ spec:
         - /root/ready.py
         args:
         - --container-name
-        - mariadb
+        - {{ .Values.mariadb.nameOverride }}
         env:
         - name: NAMESPACE
           valueFrom:
@@ -49,7 +49,7 @@ spec:
         - name: {{ .Chart.Name }}
           command:
           - /tmp/start-jboss-server.sh
-          image: "{{ .Values.repository | default .Values.global.repository }}/{{ .Values.image }}"
+          image: "{{ include "common.repository" . }}/{{ .Values.image }}"
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           ports:
           - containerPort: {{ .Values.service.internalPort }}
@@ -58,14 +58,14 @@ spec:
           - containerPort: {{ .Values.service.internalPort4 }}
           - containerPort: {{ .Values.service.internalPort5 }}
           # disable liveness probe when breakpoints set in debugger
-          # so K8s doesn't restart unresponsive container 
-          {{- if eq .Values.liveness.enabled true }}
+          # so K8s doesn't restart unresponsive container
+          {{ if .Values.liveness.enabled }}
           livenessProbe:
             tcpSocket:
               port: {{ .Values.service.internalPort }}
             initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
-          {{ end -}}
+          {{ end }}
           readinessProbe:
             tcpSocket:
               port: {{ .Values.service.internalPort }}
@@ -86,16 +86,6 @@ spec:
           - mountPath: /opt/jboss/standalone/configuration/standalone-full-ha-mso.xml
             name: so-config
             subPath: standalone-full-ha-mso.xml
-          - mountPath: /etc/mso/config.d/topology.properties
-            name: so-config
-            subPath: topology.properties
-          - mountPath: /etc/mso/config.d/mso.workflow-message-adapter.properties
-            name: so-config
-            subPath: mso.workflow-message-adapter.properties
-          - mountPath: /etc/mso/config.d/mso.bpmn.urn.properties
-            name: so-config
-            subPath: mso.bpmn.urn.properties
-
           - mountPath: /var/log/onap
             name: so-logs
           - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-po-adapter-config/logback.network.xml
@@ -141,7 +131,7 @@ spec:
         affinity:
 {{ toYaml .Values.affinity | indent 10 }}
         {{- end }}
-        
+
         # side car containers
         - name: filebeat-onap
           image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
@@ -172,8 +162,11 @@ spec:
             - key: mso-docker.json
               path: mso-docker.json
               mode: 0755
-            - key: aai.crt
-              path: aai.crt
+            - key: onap-ca.crt
+              path: onap-ca.crt
+              mode: 0755
+            - key: onap-ca-new.crt
+              path: onap-ca-new.crt
               mode: 0755
             - key: encryption.key
               path: encryption.key
@@ -185,15 +178,6 @@ spec:
             - key: standalone-full-ha-mso.xml
               path: standalone-full-ha-mso.xml
               mode: 0644
-            - key: topology.properties
-              path: topology.properties
-              mode: 0644
-            - key: mso.workflow-message-adapter.properties
-              path: mso.workflow-message-adapter.properties
-              mode: 0644
-            - key: mso.bpmn.urn.properties
-              path: mso.bpmn.urn.properties
-              mode: 0644
         - name: so-logs
           emptyDir: {}
         - name: so-data-filebeat