Merge "[DCAEGEN2] Update CMPv2 certs usage in dcaegen2-services"

diff --combined kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
index 4554b50,1e7c3b4..310d9ae
--- 1/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
--- 2/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
+++ b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
@@@ -274,10 -274,6 +274,10 @@@ spec
          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
          name: {{ include "common.name" . }}
          env:
 +        {{- range $cred := .Values.credentials }}
 +        - name: {{ $cred.name }}
 +          {{- include "common.secret.envFromSecretFast" (dict "global" $ "uid" $cred.uid "key" $cred.key) | indent 10 }}
 +        {{- end }}
          {{- if $certDir }}
          - name: DCAE_CA_CERTPATH
            value: {{ $certDir }}/cacert.pem
@@@ -321,8 -317,6 +321,8 @@@
          volumeMounts:
          - mountPath: /app-config
            name: app-config
 +        - mountPath: /app-config-input
 +          name: app-config-input
          {{- if $logDir }}
          - mountPath: {{ $logDir}}
            name: component-log
@@@ -330,7 -324,7 +330,7 @@@
          {{- if $certDir }}
          - mountPath: {{ $certDir }}
            name: tls-info
-           {{- if and .Values.certificates .Values.global.cmpv2Enabled .Values.global.CMPv2CertManagerIntegration -}}
+           {{- if (include "dcaegen2-services-common.shouldUseCmpv2Certificates" .) -}}
            {{- include "common.certManager.volumeMountsReadOnly" . | nindent 8 -}}
            {{- end -}}
          {{- end }}
@@@ -428,7 -422,7 +428,7 @@@
        {{- if $certDir }}
        - emptyDir: {}
          name: tls-info
-         {{ if and .Values.certificates .Values.global.cmpv2Enabled .Values.global.CMPv2CertManagerIntegration -}}
+         {{ if (include "dcaegen2-services-common.shouldUseCmpv2Certificates" .) -}}
          {{ include "common.certManager.volumesReadOnly" . | nindent 6 }}
          {{- end }}
        {{- end }}
@@@ -449,7 -443,7 +449,7 @@@
  */}}
  {{- define "dcaegen2-services-common._certPostProcessor" -}}
    {{- $certDir := default "" .Values.certDirectory . -}}
-   {{- if and $certDir .Values.certificates .Values.global.cmpv2Enabled .Values.global.CMPv2CertManagerIntegration -}}
+   {{- if (include "dcaegen2-services-common.shouldUseCmpv2Certificates" .) -}}
      {{- $cmpv2Certificate := (index .Values.certificates 0) -}}
      {{- $cmpv2CertificateDir := $cmpv2Certificate.mountPath -}}
      {{- $certType := "pem" -}}
@@@ -486,3 -480,16 +486,16 @@@
        value: {{ $keystoreDestinationPaths | quote }}
    {{- end }}
  {{- end -}}
+ 
+ {{/*
+   Template returns string "true" if CMPv2 certificates should be used and nothing (so it can be used in with statements)
+   when they shouldn't. Example use:
+     {{- if (include "dcaegen2-services-common.shouldUseCmpv2Certificates" .) -}}
+ 
+ */}}
+ {{- define "dcaegen2-services-common.shouldUseCmpv2Certificates" -}}
+   {{- $certDir := default "" .Values.certDirectory . -}}
+   {{- if (and $certDir .Values.certificates .Values.global.cmpv2Enabled .Values.global.CMPv2CertManagerIntegration .Values.useCmpv2Certificates) -}}
+   true
+   {{- end -}}
+ {{- end -}}

diff --combined kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
index a675db6,32f5072..9e08ea1
--- 1/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
--- 2/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
@@@ -41,7 -41,7 +41,7 @@@ certPostProcessorImage: onap/org.onap.o
  # Application configuration defaults.
  #################################################################
  # application image
 -image: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.8.0
 +image: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.9.2
  pullPolicy: Always
  
  # log directory where logging sidecar should look for log files
@@@ -58,8 -58,13 +58,13 @@@ certDirectory: /opt/app/dcae-certificat
  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