diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-11-03 14:30:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-11-03 14:30:05 +0000 |
| commit | 4569ca7ac777d5edbb26dcdf97fc94f6b81c683c (patch) | |
| tree | ed424560e486880d700c7e1fb9796fcaf0972c6d /kubernetes/so/components/so-vnfm-adapter/templates/deployment.yaml | |
| parent | 2e72c54ab1a32cf52d1b1b07693fb56afcb11b4d (diff) | |
| parent | a1bbe5c43828e8d54a7b43fde0d14834318c192e (diff) | |
Merge "[SO] Remove so-secret component"
Diffstat (limited to 'kubernetes/so/components/so-vnfm-adapter/templates/deployment.yaml')
| -rwxr-xr-x | kubernetes/so/components/so-vnfm-adapter/templates/deployment.yaml | 11 |
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" |