From: Krzysztof Opasiak <k.opasiak@samsung.com>
Date: Tue, 27 Oct 2020 17:30:51 +0000 (+0000)
Subject: Merge "[SO] Import various CAs in truststore"
X-Git-Tag: 7.0.0~68
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0f4fb5208a4c0727e08ea1d2c3b5ca5c9e2d21a8;hp=-c;p=oom.git

Merge "[SO] Import various CAs in truststore"
---

0f4fb5208a4c0727e08ea1d2c3b5ca5c9e2d21a8
diff --combined kubernetes/so/components/so-etsi-nfvo-ns-lcm/templates/deployment.yaml
index 97ebd93ed1,2327e19b67..bc36fc1f46
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/templates/deployment.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/templates/deployment.yaml
@@@ -39,6 -39,7 +39,7 @@@ spec
                {{- if .Values.global.aafEnabled }}
                export $(grep '^c' {{ .Values.soHelpers.certInitializer.credsPath }}/mycreds.prop | xargs -0)
                export TRUSTSTORE_PASSWORD="${cadi_truststore_password}"
+               export TRUSTSTORE="file:/${TRUSTSTORE}"
                {{- if .Values.global.security.aaf.enabled }}
                export KEYSTORE_PASSWORD="${cadi_keystore_password}"
                {{- end }}
@@@ -82,7 -83,7 +83,7 @@@
                readOnly: true
              - name: {{ include "common.fullname" . }}-truststore
                mountPath: /app/client
 -              readonly: true
 +              readOnly: true
            livenessProbe:
              tcpSocket:
                port: {{ index .Values.livenessProbe.port }}