diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-04-07 11:16:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-04-07 11:16:22 +0000 |
| commit | a391f4daa788e896e77300665a661b61e83b3e46 (patch) | |
| tree | fa931a90a61ecfadb4c3bf5ea7807adad53c04f6 /kubernetes/so/charts/so-vnfm-adapter | |
| parent | bcea64b75f3d8f17759fed3ad7f0051a5874b37c (diff) | |
| parent | 3ea400b4e62a027caa9bbba14b52d2c04e07f6c0 (diff) | |
Merge "Added trust store for SOL003 Adapter & ETSI Catalog Manager"
Diffstat (limited to 'kubernetes/so/charts/so-vnfm-adapter')
| -rwxr-xr-x | kubernetes/so/charts/so-vnfm-adapter/templates/deployment.yaml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/kubernetes/so/charts/so-vnfm-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-vnfm-adapter/templates/deployment.yaml index 00b36a838e..a720753f47 100755 --- a/kubernetes/so/charts/so-vnfm-adapter/templates/deployment.yaml +++ b/kubernetes/so/charts/so-vnfm-adapter/templates/deployment.yaml @@ -40,17 +40,17 @@ spec: image: {{ include "common.repository" . }}/{{ .Values.image }} resources: {{ include "common.resources" . | indent 12 }} - {{- if eq .Values.global.security.aaf.enabled true }} env: - name: TRUSTSTORE - value: /app/org.onap.so.trust.jks + value: {{ .Values.global.client.certs.truststore }} - name: TRUSTSTORE_PASSWORD valueFrom: secretKeyRef: name: {{ .Release.Name}}-so-client-certs-secret key: trustStorePassword + {{ if eq .Values.global.security.aaf.enabled true }} - name: KEYSTORE - value: /app/org.onap.so.jks + value: {{ .Values.global.client.certs.keystore }} - name: KEYSTORE_PASSWORD valueFrom: secretKeyRef: @@ -67,6 +67,9 @@ 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 }} @@ -84,5 +87,8 @@ 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" |