diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-02-10 09:38:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-02-10 09:38:58 +0000 |
| commit | 5041b168ab3326aa829dbd5dd950dbde5e002acf (patch) | |
| tree | c1893be286f9cf2189d3dbc3826136a2f3acbe85 /kubernetes/sdnc/templates | |
| parent | bba1e249e30cd11552a21553b63881aac5fe1973 (diff) | |
| parent | 595710111489903aa963c028c364584cb5bebaa4 (diff) | |
Merge "[COMMON] Create certManagerCertificate chart"
Diffstat (limited to 'kubernetes/sdnc/templates')
| -rw-r--r-- | kubernetes/sdnc/templates/certificates.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/sdnc/templates/statefulset.yaml | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/kubernetes/sdnc/templates/certificates.yaml b/kubernetes/sdnc/templates/certificates.yaml index dda16176a5..c4eca61e35 100644 --- a/kubernetes/sdnc/templates/certificates.yaml +++ b/kubernetes/sdnc/templates/certificates.yaml @@ -1,5 +1,5 @@ {{/* -# Copyright © 2020 Nokia +# Copyright © 2020-2021 Nokia # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,6 +14,6 @@ # limitations under the License. */}} -{{ if .Values.global.CMPv2CertManagerIntegration }} -{{ include "common.certificate" . }} +{{ if and .Values.global.cmpv2Enabled .Values.global.CMPv2CertManagerIntegration }} +{{ include "certManagerCertificate.certificate" . }} {{ end }} diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml index 2158fefe19..51c50e4fec 100644 --- a/kubernetes/sdnc/templates/statefulset.yaml +++ b/kubernetes/sdnc/templates/statefulset.yaml @@ -203,6 +203,9 @@ spec: volumeMounts: {{ include "common.certInitializer.volumeMount" . | indent 10 }} {{ include "common.certServiceClient.volumeMounts" . | indent 10 }} +{{- if and .Values.global.cmpv2Enabled .Values.global.CMPv2CertManagerIntegration }} +{{ include "common.certManager.volumeMounts" . | indent 10 }} +{{- end }} - mountPath: /etc/localtime name: localtime readOnly: true @@ -317,6 +320,9 @@ spec: {{ else }} {{ include "common.certInitializer.volumes" . | nindent 8 }} {{ include "common.certServiceClient.volumes" . | nindent 8 }} +{{- if and .Values.global.cmpv2Enabled .Values.global.CMPv2CertManagerIntegration }} +{{ include "common.certManager.volumes" . | nindent 8 }} +{{- end }} volumeClaimTemplates: - metadata: name: {{ include "common.fullname" . }}-data |