summaryrefslogtreecommitdiffstats
path: root/kubernetes/so/components/so-vnfm-adapter/templates
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-10-28 16:55:18 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-02 16:30:57 +0100
commita1bbe5c43828e8d54a7b43fde0d14834318c192e (patch)
treeedf33565e80919662953d786a98c4fe120cfa68c /kubernetes/so/components/so-vnfm-adapter/templates
parentc071ab6e0b6116d4d203cff9548aac1a9b2377cf (diff)
[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 <sylvain.desbureaux@orange.com> Change-Id: I0eb2e052096923fc69bf5f1a1876d9a76a22102b
Diffstat (limited to 'kubernetes/so/components/so-vnfm-adapter/templates')
-rwxr-xr-xkubernetes/so/components/so-vnfm-adapter/templates/deployment.yaml11
1 files changed, 2 insertions, 9 deletions
diff --git a/kubernetes/so/components/so-vnfm-adapter/templates/deployment.yaml b/kubernetes/so/components/so-vnfm-adapter/templates/deployment.yaml
index 4f73fb39e7..24dd3d6d21 100755
--- a/kubernetes/so/components/so-vnfm-adapter/templates/deployment.yaml
+++ b/kubernetes/so/components/so-vnfm-adapter/templates/deployment.yaml
@@ -52,9 +52,8 @@ spec:
- |
export $(grep '^c' {{ .Values.soHelpers.certInitializer.credsPath }}/mycreds.prop | xargs -0)
export TRUSTSTORE_PASSWORD="${cadi_truststore_password}"
- {{- if .Values.global.security.aaf.enabled }}
- export KEYSTORE_PASSWORD="${cadi_keystore_password}"
- {{- end }}
+ export KEYSTORE_PASSWORD="${cadi_keystore_password_p12}"
+ export KEYSTORE="{{ .Values.soHelpers.certInitializer.credsPath }}/org.onap.so.p12"
/app/start-app.sh
{{- end }}
env:
@@ -69,9 +68,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 }}
@@ -89,8 +85,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"