[DCAEGEN2] Update CMPv2 certs usage in dcaegen2-services

Updates:
- Add microservice specific flag to determine if CMPv2
should be used
- Add function to check if CMPv2 parts should be included

Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Issue-ID: DCAEGEN2-2630
Change-Id: If81c50c6029aafef40fa91c5295ad8ad24f953d3

2 files changed, 7 insertions, 2 deletions

diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/templates/certificates.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/templates/certificates.yaml
index 0db2138a4f..12a05885ca 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/templates/certificates.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/templates/certificates.yaml
@@ -14,6 +14,6 @@
 # limitations under the License.
 */}}
 
-{{ if and .Values.certDirectory .Values.global.cmpv2Enabled .Values.global.CMPv2CertManagerIntegration }}
+{{- if (include "dcaegen2-services-common.shouldUseCmpv2Certificates" .) -}}
 {{ include "certManagerCertificate.certificate" . }}
 {{ end }}
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
index 081bcdcc1a..32f5072309 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
@@ -58,8 +58,13 @@ certDirectory: /opt/app/dcae-certificate
 tlsServer: true
 
 # CMPv2 certificate
-# It is used only when global parameter cmpv2Enabled is 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
 certificates:
   - mountPath: /opt/app/dcae-certificate/external
     commonName: dcae-ves-collector