diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-04-01 09:59:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-04-01 09:59:56 +0000 |
| commit | eac393265c9e926a3e18b1d4ede82c5c442eb65a (patch) | |
| tree | b435097825a806944ca29adcaa272aebaa59d099 /kubernetes/so/charts/so-openstack-adapter | |
| parent | bf1af5c0a0caad1830bd2f56dded7d8d7fe35b3e (diff) | |
| parent | aadf545643827a440b082f4dcf6afdfd1c2012e2 (diff) | |
Merge "[SO] Onboard ONAP CA during init phase"
Diffstat (limited to 'kubernetes/so/charts/so-openstack-adapter')
| -rwxr-xr-x | kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml | 6 | ||||
| -rwxr-xr-x | kubernetes/so/charts/so-openstack-adapter/values.yaml | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml index ca6be72273..e1c2069a44 100755 --- a/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml +++ b/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml @@ -34,7 +34,7 @@ spec: app: {{ include "common.name" . }} release: {{ include "common.release" . }} spec: - initContainers: + initContainers: {{ include "so.certificate.container_importer" . | nindent 6 }} - command: - /root/job_complete.py args: @@ -93,7 +93,7 @@ spec: - configMapRef: name: {{ include "common.fullname" . }}-configmap imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - volumeMounts: + volumeMounts: {{ include "so.certificate.volume-mounts" . | nindent 8 }} - name: logs mountPath: /app/logs - name: config @@ -120,7 +120,7 @@ spec: mountPath: /var/log/onap/so - name: {{ include "common.fullname" . }}-logs mountPath: /var/log/onap - volumes: + volumes: {{ include "so.certificate.volumes" . | nindent 6 }} - name: logs emptyDir: {} - name: config diff --git a/kubernetes/so/charts/so-openstack-adapter/values.yaml b/kubernetes/so/charts/so-openstack-adapter/values.yaml index 6a0b04b4d1..1ab46561d6 100755 --- a/kubernetes/so/charts/so-openstack-adapter/values.yaml +++ b/kubernetes/so/charts/so-openstack-adapter/values.yaml @@ -39,6 +39,14 @@ secrets: login: '{{ .Values.db.adminName }}' password: '{{ .Values.db.adminPassword }}' passwordPolicy: required + - uid: "so-onap-certs" + externalSecret: '{{ tpl (default "" .Values.certSecret) . }}' + type: generic + filePaths: '{{ .Values.secretsFilePaths }}' + +#secretsFilePaths: | +# - 'my file 1' +# - '{{ include "templateThatGeneratesFileName" . }}' ################################################################# # Application configuration defaults. |