X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fcomponents%2Fso-appc-orchestrator%2Ftemplates%2Fdeployment.yaml;h=d6584250e20c2924c7932643325d6d8e24d459b2;hb=e4aac7a3c577b7bb9eaae93387d482f952ee4b72;hp=24592ba50a7df379a8098358c58977bbddc6d697;hpb=dd714d1a2746b16644abb42a3f4d3824cbc1132e;p=oom.git

diff --git a/kubernetes/so/components/so-appc-orchestrator/templates/deployment.yaml b/kubernetes/so/components/so-appc-orchestrator/templates/deployment.yaml
index 24592ba50a..d6584250e2 100644
--- a/kubernetes/so/components/so-appc-orchestrator/templates/deployment.yaml
+++ b/kubernetes/so/components/so-appc-orchestrator/templates/deployment.yaml
@@ -41,7 +41,7 @@ spec:
         env:
         - name: ACTUATOR_PASSWORD
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "server-actuator-creds" "key" "password") | indent 10 }}
-        image: {{ .Values.global.dockerHubRepository }}/{{ .Values.global.htpasswdImage }}
+        image: {{ include "repositoryGenerator.image.htpasswd" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         volumeMounts:
         - name: encoder
@@ -55,14 +55,13 @@ spec:
           - |
             export ACTUATOR_PASSWORD="$(cat /tmp/app/encoded)"
             {{- 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_p12}"
             {{- end }}
             {{- end }}
             /app/start-app.sh
-        image: {{ include "common.repository" . }}/{{ .Values.image }}
+        image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
         resources: {{ include "common.resources" . | nindent 12 }}
         env:
         - name: ACTUATOR_USERNAME
@@ -82,6 +81,7 @@ spec:
           mountPath: /app/config
           readOnly: true
 {{ include "so.helpers.livenessProbe" .| indent 8 }}
+      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes: {{ include "so.certificate.volumes" . | nindent 6 }}
       - name: logs
         emptyDir: {}