diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-06-10 19:56:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-06-10 19:56:27 +0000 |
| commit | b8ee1572d5e6c8d358d64e15a4bd345dccbd6b79 (patch) | |
| tree | b6ac2e3c316a63af26baa501b671fad8c91a021e /kubernetes/dcaegen2-services | |
| parent | 502804fe000e6c934de299541a27807a0409600d (diff) | |
| parent | 598f2d8f5e84c92c42c5da0e4dbf9562f860b8f7 (diff) | |
Merge "[COMMON] Remove CertService client mechanism"
Diffstat (limited to 'kubernetes/dcaegen2-services')
3 files changed, 1 insertions, 3 deletions
diff --git a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl index 310d9ae662..328a4c625f 100644 --- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl +++ b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl @@ -495,7 +495,7 @@ spec: */}} {{- define "dcaegen2-services-common.shouldUseCmpv2Certificates" -}} {{- $certDir := default "" .Values.certDirectory . -}} - {{- if (and $certDir .Values.certificates .Values.global.cmpv2Enabled .Values.global.CMPv2CertManagerIntegration .Values.useCmpv2Certificates) -}} + {{- if (and $certDir .Values.certificates .Values.global.cmpv2Enabled .Values.useCmpv2Certificates) -}} true {{- end -}} {{- end -}} diff --git a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml index 223789a75f..64e4ba9b43 100644 --- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml @@ -68,7 +68,6 @@ secrets: # It is used only when: # - certDirectory is set # - global cmpv2Enabled flag is set to true -# - global CertManagerIntegration flag is set to true # - flag useCmpv2Certificates is set to true # Disabled by default useCmpv2Certificates: false diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml index 9e08ea1a69..982d770595 100644 --- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml @@ -61,7 +61,6 @@ tlsServer: true # It is used only when: # - certDirectory is set # - global cmpv2Enabled flag is set to true -# - global CertManagerIntegration flag is set to true # - flag useCmpv2Certificates is set to true # Disabled by default useCmpv2Certificates: false |