From a1bbe5c43828e8d54a7b43fde0d14834318c192e Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Wed, 28 Oct 2020 16:55:18 +0100 Subject: [SO] Remove so-secret component SO secret was used to give truststore to SO components. As we're using dynamic certificate retrieval, it's not needed anymore. Issue-ID: OOM-2534 Issue-ID: SO-3348 Signed-off-by: Sylvain Desbureaux Change-Id: I0eb2e052096923fc69bf5f1a1876d9a76a22102b --- .../so/components/so-etsi-nfvo-ns-lcm/templates/deployment.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'kubernetes/so/components/so-etsi-nfvo-ns-lcm/templates/deployment.yaml') diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/templates/deployment.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/templates/deployment.yaml index 9408c1f556..bf770bb992 100644 --- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/templates/deployment.yaml +++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/templates/deployment.yaml @@ -41,9 +41,8 @@ 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}" + export KEYSTORE_PASSWORD="${cadi_keystore_password_p12}" {{- end }} {{- end }} ./start-app.sh @@ -83,9 +82,6 @@ spec: - name: config mountPath: /app/config readOnly: true - - name: {{ include "common.fullname" . }}-truststore - mountPath: /app/client - readOnly: true livenessProbe: tcpSocket: port: {{ index .Values.livenessProbe.port }} @@ -100,8 +96,5 @@ spec: - name: config configMap: name: {{ include "common.fullname" . }}-app-configmap - - name: {{ include "common.fullname" . }}-truststore - secret: - secretName: {{ include "common.release" . }}-so-truststore-secret imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" -- cgit 1.2.3-korg