From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Fri, 28 May 2021 14:31:58 +0000 (+0000)
Subject: Merge "[DCAE] Add secrets as envs to application container in dcaegen2"
X-Git-Tag: 9.0.0~246
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ed5722da3c3974697f926665598eceab806bcb46;hp=77b740f2c94facef63eafcde23666c2133d2e5da;p=oom.git

Merge "[DCAE] Add secrets as envs to application container in dcaegen2"
---

diff --git a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
index 5de526288e..4554b50de8 100644
--- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
+++ b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
@@ -274,6 +274,10 @@ spec:
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}
         env:
+        {{- range $cred := .Values.credentials }}
+        - name: {{ $cred.name }}
+          {{- include "common.secret.envFromSecretFast" (dict "global" $ "uid" $cred.uid "key" $cred.key) | indent 10 }}
+        {{- end }}
         {{- if $certDir }}
         - name: DCAE_CA_CERTPATH
           value: {{ $certDir }}/cacert.pem
@@ -317,6 +321,8 @@ spec:
         volumeMounts:
         - mountPath: /app-config
           name: app-config
+        - mountPath: /app-config-input
+          name: app-config-input
         {{- if $logDir }}
         - mountPath: {{ $logDir}}
           name: component-log