diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-10-28 16:55:18 +0100 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-02 16:30:57 +0100 |
| commit | a1bbe5c43828e8d54a7b43fde0d14834318c192e (patch) | |
| tree | edf33565e80919662953d786a98c4fe120cfa68c /kubernetes/so/components/so-etsi-nfvo-ns-lcm | |
| parent | c071ab6e0b6116d4d203cff9548aac1a9b2377cf (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-etsi-nfvo-ns-lcm')
| -rw-r--r-- | kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/so/components/so-etsi-nfvo-ns-lcm/templates/deployment.yaml | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml index c9aa5823bf..7b85b445a2 100644 --- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml +++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml @@ -58,7 +58,7 @@ etsi-catalog-manager: http: client: ssl: - trust-store: ${TRUSTSTORE} + trust-store: file:${TRUSTSTORE} trust-store-password: ${TRUSTSTORE_PASSWORD} {{- else }} endpoint: http://modeling-etsicatalog.{{ include "common.namespace" . }}:8806/api 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" |