🐛 fix: (helm/v1alpha1): move end block to the correct place

kubernetes-sigs · Dec 10, 2024 · ac4913b · ac4913b
1 parent 423d56b
commit ac4913b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...nal/helm/v1alpha/scaffolds/internal/templates/chart-templates/cert-manager/certificate.go b/...nal/helm/v1alpha/scaffolds/internal/templates/chart-templates/cert-manager/certificate.go
@@ -53,6 +53,7 @@ metadata:
   namespace: {{ "{{ .Release.Namespace }}" }}
 spec:
   selfSigned: {}
+{{` + "`" + `{{- end }}` + "`" + `}}
 {{ "{{- if .Values.webhook.enable }}" }}
 ---
 # Certificate for the webhook
@@ -77,7 +78,7 @@ spec:
     name: selfsigned-issuer
   secretName: webhook-server-cert
 {{` + "`" + `{{- end }}` + "`" + `}}
-{{ "{{- if and .Values.metrics.enable .Values.certmanager.enable }}" }}
+{{ "{{- if and .Values.certmanager.enable .Values.metrics.enable }}" }}
 ---
 # Certificate for the metrics
 apiVersion: cert-manager.io/v1
@@ -101,5 +102,4 @@ spec:
     name: selfsigned-issuer
   secretName: metrics-server-cert
 {{` + "`" + `{{- end }}` + "`" + `}}
-{{` + "`" + `{{- end }}` + "`" + `}}
 `
diff --git a/testdata/project-v4-with-plugins/dist/chart/templates/certmanager/certificate.yaml b/testdata/project-v4-with-plugins/dist/chart/templates/certmanager/certificate.yaml
@@ -9,6 +9,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   selfSigned: {}
+{{- end }}
 {{- if .Values.webhook.enable }}
 ---
 # Certificate for the webhook
@@ -33,7 +34,7 @@ spec:
     name: selfsigned-issuer
   secretName: webhook-server-cert
 {{- end }}
-{{- if and .Values.metrics.enable .Values.certmanager.enable }}
+{{- if and .Values.certmanager.enable .Values.metrics.enable }}
 ---
 # Certificate for the metrics
 apiVersion: cert-manager.io/v1
@@ -57,4 +58,3 @@ spec:
     name: selfsigned-issuer
   secretName: metrics-server-cert
 {{- end }}
-{{- end }}