diff options
author | Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-10-20 08:30:45 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-10-20 08:30:45 +0000 |
commit | 2544d29e156ad8b7e0036aa434273d2ea83c7804 (patch) | |
tree | e3fb6f1188cd34e6c9ce4119840063bb6c087238 /kubernetes/oof/templates/deployment.yaml | |
parent | 9c5531049326e3a445cd06d94ffc1e394bf29a55 (diff) | |
parent | 24a7ef35b6fb3ba85f79e1a6a0bf2fd50e872332 (diff) |
Merge "[OOF] Bump versions"
Diffstat (limited to 'kubernetes/oof/templates/deployment.yaml')
-rw-r--r-- | kubernetes/oof/templates/deployment.yaml | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/kubernetes/oof/templates/deployment.yaml b/kubernetes/oof/templates/deployment.yaml index 76d1a62604..cbf4156d23 100644 --- a/kubernetes/oof/templates/deployment.yaml +++ b/kubernetes/oof/templates/deployment.yaml @@ -73,6 +73,14 @@ spec: - name: {{ include "common.name" . }} image: "{{ include "common.repository" . }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + command: + - /bin/sh + args: + - "-c" + - | + grep -v '^$' /opt/osdf/osaaf/local/org.onap.oof.crt > /tmp/oof.crt + cat /tmp/oof.crt /opt/app/ssl_cert/intermediate_root_ca.pem /opt/app/ssl_cert/aaf_root_ca.cer >> /opt/osdf/org.onap.oof.crt + ./osdfapp.sh -x osdfapp.py ports: - containerPort: {{ .Values.service.internalPort }} # disable liveness probe when breakpoints set in debugger @@ -99,8 +107,11 @@ spec: name: {{ include "common.fullname" . }}-config subPath: osdf_config.yaml - mountPath: /opt/app/ssl_cert/aaf_root_ca.cer - name: {{ include "common.fullname" . }}-config + name: {{ include "common.fullname" . }}-onap-certs subPath: aaf_root_ca.cer + - mountPath: /opt/app/ssl_cert/intermediate_root_ca.pem + name: {{ include "common.fullname" . }}-onap-certs + subPath: intermediate_root_ca.pem - mountPath: /opt/osdf/config/common_config.yaml name: {{ include "common.fullname" . }}-config subPath: common_config.yaml @@ -129,11 +140,10 @@ spec: items: - key: osdf_config.yaml path: osdf_config.yaml - - key: aaf_root_ca.cer - path: aaf_root_ca.cer - key: common_config.yaml path: common_config.yaml - key: log.yml path: log.yml +{{ include "oof.certificate.volume" . | indent 8 }} imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" |