Merge "vvp -- VNF Validation Platform"

[oom.git] / kubernetes / so / charts / so-monitoring / templates / deployment.yaml

diff --git a/kubernetes/so/charts/so-monitoring/templates/deployment.yaml b/kubernetes/so/charts/so-monitoring/templates/deployment.yaml
index 79d4662..bfedc05 100644 (file)
--- a/kubernetes/so/charts/so-monitoring/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-monitoring/templates/deployment.yaml
@@ -45,7 +45,7 @@ spec:
         volumeMounts:
         - name: logs
           mountPath: /app/logs
-        imagePullPolicy: {{ index .Values.pullPolicy }}
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         command: ["/bin/sh", "-c", "chown -Rf 1000:1000 /app/logs"]
       restartPolicy: Always
       containers:
@@ -84,36 +84,13 @@ spec:
             secretKeyRef:
               name: {{ .Release.Name}}-so-db-secrets
               key: mariadb.admin.password
-        - name: CADI_KEYSTORE_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Release.Name}}-so-ssl-pwd-secret
-              key: cadi_keystore_password
-        - name: CADI_TRUSTSTORE_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Release.Name}}-so-ssl-pwd-secret
-              key: cadi_truststore_password
-        - name: MSO_KEYSTORE_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Release.Name}}-so-ssl-client-secret
-              key: keystore_password
-        - name: MSO_TRUSTSTORE_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Release.Name}}-so-ssl-client-secret
-              key: truststore_password
         envFrom:
         - configMapRef:
             name: {{ include "common.fullname" . }}-configmap
-        imagePullPolicy:  {{ index .Values "global" "pullPolicy" }}
+        imagePullPolicy:  {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         volumeMounts:
         - name: logs
           mountPath: /app/logs
-        - name: certs
-          mountPath: /app/certs/
-          readOnly: true
         - name: config
           mountPath: /app/config
           readOnly: true
@@ -137,9 +114,6 @@ spec:
       volumes:
       - name: logs
         emptyDir: {}
-      - name: certs
-        secret:
-            secretName: {{ .Release.Name}}-so-ssl-secret
       - name: config
         configMap:
             name: {{ include "common.fullname" . }}-app-configmap