X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fcomponents%2Fso-cnf-adapter%2Ftemplates%2Fdeployment.yaml;h=340571a59b8ad4683c82a5a632dbd4beb26a65ac;hb=38634d6ef44d9d4954e553445451992e33c1f2f5;hp=dfff4341f5f9177f5c67808a95ac70bd3429006f;hpb=13a3131a6816f874d1d605f4efed299f56b768c6;p=oom.git

diff --git a/kubernetes/so/components/so-cnf-adapter/templates/deployment.yaml b/kubernetes/so/components/so-cnf-adapter/templates/deployment.yaml
index dfff4341f5..340571a59b 100755
--- a/kubernetes/so/components/so-cnf-adapter/templates/deployment.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/templates/deployment.yaml
@@ -45,7 +45,7 @@ spec:
               {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "so-aai-creds" "key" "password") | indent 14 }}
             - name: MSO_KEY
               {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cnf-adapter-mso-key" "key" "password") | indent 14 }}
-          image: {{ .Values.global.dockerHubRepository }}/{{ .Values.global.soCryptoImage }}
+          image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.global.soCryptoImage }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           volumeMounts:
             - name: encoder
@@ -53,7 +53,7 @@ spec:
         {{ include "common.readinessCheck.waitFor" . | indent 8 | trim }}
       containers:
         - name: {{ include "common.name" . }}
-          image: {{ include "common.repository" . }}/{{ .Values.image }}
+          image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
           command:
             - sh
           args:
@@ -63,8 +63,7 @@ spec:
               export AAF_AUTH=$(echo "Basic ${AAF_BASE64}")
               export AAI_AUTH=$(cat /input/.aai_creds)
               {{- if .Values.global.aafEnabled }}
-              export $(grep '^c' {{ .Values.soHelpers.certInitializer.credsPath }}/mycreds.prop | xargs -0)
-              export TRUSTSTORE_PASSWORD="${cadi_truststore_password}"
+              export $(cat {{ .Values.soHelpers.certInitializer.credsPath }}/mycreds.prop | xargs -0)
               {{- if .Values.global.security.aaf.enabled }}
               export KEYSTORE_PASSWORD="${cadi_keystore_password}"
               {{- end }}
@@ -92,6 +91,7 @@ spec:
             - name: config
               mountPath: /app/config
               readOnly: true
+              readOnly: true
             - name: encoder
               mountPath: /input
           livenessProbe:
@@ -104,6 +104,7 @@ spec:
             timeoutSeconds: {{ index .Values.livenessProbe.timeoutSeconds}}
             successThreshold: {{ index .Values.livenessProbe.successThreshold}}
             failureThreshold: {{ index .Values.livenessProbe.failureThreshold}}
+      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes: {{ include "so.certificate.volumes" . | nindent 8 }}
         - name: logs
           emptyDir: {}