chore: let's keep tls_certificates.create true when cert_manager is enabled

Author: francesco-furlan

charts/shield/templates/cluster/_tls.tpl

@@ -9,7 +9,7 @@
 {{- end }}
 
 {{- define "cluster.tls_certificates.secret_name" -}}
-  {{- if .Values.cluster.tls_certificates.create -}}
+  {{- if and (.Values.cluster.tls_certificates.create) (not (include "cluster.tls_certificates.use_cert_manager" .)) -}}
     {{- include "cluster.fullname" . }}-tls-certificates
   {{- else if (include "cluster.tls_certificates.use_cert_manager" .) -}}
     {{- include "cluster.tls_certificates.cm_certificate_name" . -}}
@@ -51,9 +51,6 @@
 {{- end }}
 
 {{- define "cluster.tls_certificates.check_conflicts" -}}
-  {{- if and .Values.cluster.tls_certificates.create .Values.cluster.tls_certificates.cert_manager.enabled -}}
-    {{- fail "Cannot specify both tls_certificates.create and tls_certificates.cert_manager.enabled" -}}
-  {{- end -}}
   {{- if and (not (quote .Values.cluster.tls_certificates.secret_name | empty)) .Values.cluster.tls_certificates.cert_manager.enabled -}}
     {{- fail "Cannot specify both tls_certificates.cert_manager.enabled and tls_certificates.secret_name" -}}
   {{- end -}}

charts/shield/templates/cluster/tls-certificates-admissionregistration.yaml

@@ -20,7 +20,6 @@
   {{- $_ := set $cert "Key" ($tlsCert.Key | b64enc) -}}
   {{- $_ := set $cert "CACert" ($ca.Cert | b64enc) -}}
 {{- end -}}
-{{- end -}}
 {{- if .Values.cluster.tls_certificates.create }}
 ---
 apiVersion: v1
@@ -35,6 +34,7 @@ data:
   {{ include "cluster.tls_certificates.private_key_file_name" . }}: {{ $cert.Key }}
   {{ include "cluster.tls_certificates.ca_cert_file_name" . }}: {{ $cert.CACert }}
 {{- end }}
+{{- end -}}
 {{- if and .Values.cluster.validatingwebhookconfiguration.create (include "cluster.audit_enabled" .) }}
 ---
 apiVersion: admissionregistration.k8s.io/v1

charts/shield/tests/cluster/cert-manager_test.yaml

@@ -51,7 +51,7 @@ tests:
     set:
       cluster:
         tls_certificates:
-          create: false
+          create: true
           cert_manager:
             enabled: true
             ca:
@@ -68,7 +68,7 @@ tests:
     set:
       cluster:
         tls_certificates:
-          create: false
+          create: true
           cert_manager:
             enabled: true
             ca:
@@ -87,7 +87,7 @@ tests:
     set:
       cluster:
         tls_certificates:
-          create: false
+          create: true
           cert_manager:
             enabled: true
             ca:
@@ -111,7 +111,7 @@ tests:
     set:
       cluster:
         tls_certificates:
-          create: false
+          create: true
           cert_manager:
             enabled: true
             ca:
@@ -151,7 +151,7 @@ tests:
     set:
       cluster:
         tls_certificates:
-          create: false
+          create: true
           cert_manager:
             enabled: true
             ca:
@@ -189,7 +189,7 @@ tests:
     set:
       cluster:
         tls_certificates:
-          create: false
+          create: true
           cert_manager:
             enabled: true
             ca:
@@ -238,7 +238,7 @@ tests:
     set:
       cluster:
         tls_certificates:
-          create: false
+          create: true
           cert_manager:
             enabled: true
             ca:
@@ -270,7 +270,7 @@ tests:
     set:
       cluster:
         tls_certificates:
-          create: false
+          create: true
           cert_manager:
             enabled: true
             ca:
@@ -310,7 +310,7 @@ tests:
             enabled: true
       cluster:
         tls_certificates:
-          create: false
+          create: true
           cert_manager:
             enabled: true
             ca:
@@ -357,7 +357,7 @@ tests:
             enabled: true
       cluster:
         tls_certificates:
-          create: false
+          create: true
           cert_manager:
             enabled: true
             ca:
@@ -379,7 +379,7 @@ tests:
             enabled: true
       cluster:
         tls_certificates:
-          create: false
+          create: true
           cert_manager:
             enabled: true
             ca:
@@ -410,7 +410,7 @@ tests:
             enabled: true
       cluster:
         tls_certificates:
-          create: false
+          create: true
           cert_manager:
             enabled: true
             ca:

charts/shield/tests/cluster/tls-certificates-admissionregistration_test.yaml

@@ -636,21 +636,6 @@ tests:
             scope: Namespaced
         documentIndex: 1
 
-  - it: Cert Manager Integration exclusive with tls create cert
-    set:
-      features:
-        detections:
-          kubernetes_audit:
-            enabled: true
-      cluster:
-        tls_certificates:
-          create: true
-          cert_manager:
-            enabled: true
-    asserts:
-      - failedTemplate:
-          errorPattern: "Cannot specify both"
-
   - it: Cert Manager Integration exclusive with tls secret name
     set:
       features:
@@ -675,7 +660,7 @@ tests:
             enabled: true
       cluster:
         tls_certificates:
-          create: false
+          create: true
           cert_manager:
             enabled: true
             ca:
@@ -706,7 +691,7 @@ tests:
             enabled: true
       cluster:
         tls_certificates:
-          create: false
+          create: true
           cert_manager:
             enabled: true
             ca:
@@ -738,7 +723,7 @@ tests:
           enabled: true
       cluster:
         tls_certificates:
-          create: false
+          create: true
           cert_manager:
             enabled: true
             ca:
@@ -768,7 +753,7 @@ tests:
           enabled: true
       cluster:
         tls_certificates:
-          create: false
+          create: true
           cert_manager:
             enabled: true
             ca: