(helm/v1-alpha): Fix helm-chart scaffold by not scaffolding manifests with webhook conditions when webhooks are not used

Author: camilamacedo86

docs/book/src/getting-started/testdata/project/dist/chart/templates/certmanager/certificate.yaml

@@ -9,30 +9,6 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   selfSigned: {}
-{{- if .Values.webhook.enable }}
----
-# Certificate for the webhook
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  annotations:
-    {{- if .Values.crd.keep }}
-    "helm.sh/resource-policy": keep
-    {{- end }}
-  name: serving-cert
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "chart.labels" . | nindent 4 }}
-spec:
-  dnsNames:
-    - project.{{ .Release.Namespace }}.svc
-    - project.{{ .Release.Namespace }}.svc.cluster.local
-    - project-webhook-service.{{ .Release.Namespace }}.svc
-  issuerRef:
-    kind: Issuer
-    name: selfsigned-issuer
-  secretName: webhook-server-cert
-{{- end }}
 {{- if .Values.metrics.enable }}
 ---
 # Certificate for the metrics

docs/book/src/getting-started/testdata/project/dist/chart/templates/manager/manager.yaml

@@ -49,7 +49,7 @@ spec:
             {{- toYaml .Values.controllerManager.container.resources | nindent 12 }}
           securityContext:
             {{- toYaml .Values.controllerManager.container.securityContext | nindent 12 }}
-          {{- if and .Values.certmanager.enable (or .Values.webhook.enable .Values.metrics.enable) }}
+          {{- if and .Values.certmanager.enable .Values.metrics.enable }}
           volumeMounts:
             {{- if and .Values.metrics.enable .Values.certmanager.enable }}
             - name: metrics-certs
@@ -61,7 +61,7 @@ spec:
         {{- toYaml .Values.controllerManager.securityContext | nindent 8 }}
       serviceAccountName: {{ .Values.controllerManager.serviceAccountName }}
       terminationGracePeriodSeconds: {{ .Values.controllerManager.terminationGracePeriodSeconds }}
-      {{- if and .Values.certmanager.enable (or .Values.webhook.enable .Values.metrics.enable) }}
+      {{- if and .Values.certmanager.enable .Values.metrics.enable }}
       volumes:
         {{- if and .Values.metrics.enable .Values.certmanager.enable }}
         - name: metrics-certs

pkg/plugins/optional/helm/v1alpha/scaffolds/init.go

@@ -96,12 +96,12 @@ func (s *initScaffolder) Scaffold() error {
 			DeployImages: len(imagesEnvVars) > 0,
 			HasWebhooks:  hasWebhooks,
 		},
-		&templatescertmanager.Certificate{},
+		&templatescertmanager.Certificate{HasWebhooks: hasWebhooks},
 		&templatesmetrics.Service{},
 		&prometheus.Monitor{},
 	}
 
-	if len(mutatingWebhooks) > 0 || len(validatingWebhooks) > 0 {
+	if hasWebhooks && (len(mutatingWebhooks) > 0 || len(validatingWebhooks) > 0) {
 		buildScaffold = append(buildScaffold,
 			&templateswebhooks.Template{
 				MutatingWebhooks:   mutatingWebhooks,

pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/cert-manager/certificate.go

@@ -27,6 +27,9 @@ var _ machinery.Template = &Certificate{}
 type Certificate struct {
 	machinery.TemplateMixin
 	machinery.ProjectNameMixin
+
+	// HasWebhooks is true when webhooks were found in the config
+	HasWebhooks bool
 }
 
 // SetTemplateDefaults sets the default template configuration
@@ -53,6 +56,7 @@ metadata:
   namespace: {{ "{{ .Release.Namespace }}" }}
 spec:
   selfSigned: {}
+{{- if .HasWebhooks }}
 {{ "{{- if .Values.webhook.enable }}" }}
 ---
 # Certificate for the webhook
@@ -77,6 +81,7 @@ spec:
     name: selfsigned-issuer
   secretName: webhook-server-cert
 {{` + "`" + `{{- end }}` + "`" + `}}
+{{- end }}
 {{ "{{- if .Values.metrics.enable }}" }}
 ---
 # Certificate for the metrics

pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/manager/manager.go

@@ -114,7 +114,11 @@ spec:
             {{ "{{- toYaml .Values.controllerManager.container.resources | nindent 12 }}" }}
           securityContext:
             {{ "{{- toYaml .Values.controllerManager.container.securityContext | nindent 12 }}" }}
+{{- if .HasWebhooks }}
           {{ "{{- if and .Values.certmanager.enable (or .Values.webhook.enable .Values.metrics.enable) }}" }}
+{{- else }}
+          {{ "{{- if and .Values.certmanager.enable .Values.metrics.enable }}" }}
+{{- end }}
           volumeMounts:
 {{- if .HasWebhooks }}
             {{ "{{- if and .Values.webhook.enable .Values.certmanager.enable }}" }}
@@ -133,7 +137,11 @@ spec:
         {{ "{{- toYaml .Values.controllerManager.securityContext | nindent 8 }}" }}
       serviceAccountName: {{ "{{ .Values.controllerManager.serviceAccountName }}" }}
       terminationGracePeriodSeconds: {{ "{{ .Values.controllerManager.terminationGracePeriodSeconds }}" }}
+{{- if .HasWebhooks }}
       {{ "{{- if and .Values.certmanager.enable (or .Values.webhook.enable .Values.metrics.enable) }}" }}
+{{- else }}
+      {{ "{{- if and .Values.certmanager.enable .Values.metrics.enable }}" }}
+{{- end }}
       volumes:
 {{- if .HasWebhooks }}
         {{ "{{- if and .Values.webhook.enable .Values.certmanager.enable }}" }}