diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-04-07 07:19:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-04-07 07:19:41 +0000 |
| commit | 5a2429acb1a73119ffe25652e1eb3cce0c6f93f8 (patch) | |
| tree | 9b074d09715997528ef1d65f9bf8d2d4a4ff9f6a /kubernetes/dmaap/components/message-router/templates | |
| parent | 287a29429cf74b3f9bf87e10e4157a74d8c6568a (diff) | |
| parent | 1135f2c9310ea4bbeec31ced75e735121b2df243 (diff) | |
Merge "update cert using secrets" into elalto
Diffstat (limited to 'kubernetes/dmaap/components/message-router/templates')
| -rw-r--r-- | kubernetes/dmaap/components/message-router/templates/secrets.yaml | 14 | ||||
| -rw-r--r-- | kubernetes/dmaap/components/message-router/templates/statefulset.yaml | 15 |
2 files changed, 29 insertions, 0 deletions
diff --git a/kubernetes/dmaap/components/message-router/templates/secrets.yaml b/kubernetes/dmaap/components/message-router/templates/secrets.yaml index 023b5a1614..90f63ec98a 100644 --- a/kubernetes/dmaap/components/message-router/templates/secrets.yaml +++ b/kubernetes/dmaap/components/message-router/templates/secrets.yaml @@ -26,3 +26,17 @@ metadata: data: {{ (.Files.Glob "resources/config/dmaap/mykey").AsSecrets | indent 2 }} type: Opaque +--- +apiVersion: v1 +kind: Secret +metadata: + name: {{ include "common.fullname" . }}-aaf-certs-secret + namespace: {{ include "common.namespace" . }} + labels: + app: {{ include "common.name" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +data: +{{ (.Files.Glob "resources/cert/*").AsSecrets | indent 2 }} +type: Opaque
\ No newline at end of file diff --git a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml b/kubernetes/dmaap/components/message-router/templates/statefulset.yaml index f6d67214a6..9f64b99d50 100644 --- a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml +++ b/kubernetes/dmaap/components/message-router/templates/statefulset.yaml @@ -87,6 +87,18 @@ spec: - mountPath: /appl/dmaapMR1/etc/keyfile subPath: mykey name: mykey + - mountPath: /bundleconfig/etc/org.onap.dmaap.mr.jks + subPath: org.onap.dmaap.mr.jks + name: aaf-certs-secret + - mountPath: /appl/dmaapMR1/etc/org.onap.dmaap.mr.trust.jks + subPath: org.onap.dmaap.mr.trust.jks + name: aaf-certs-secret + - mountPath: /appl/dmaapMR1/etc/org.onap.dmaap.mr.keyfile + subPath: org.onap.dmaap.mr.keyfile + name: aaf-certs-secret + - mountPath: /appl/dmaapMR1/etc/org.onap.dmaap.mr.p12 + subPath: org.onap.dmaap.mr.p12 + name: aaf-certs-secret resources: {{ include "common.resources" . | indent 12 }} volumes: @@ -105,5 +117,8 @@ spec: - name: mykey secret: secretName: {{ include "common.fullname" . }}-secret + - name: aaf-certs-secret + secret: + secretName: {{ include "common.fullname" . }}-aaf-certs-secret imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" |