fix(clusterissuer): try to deal with the fact cert-manager contains a dash

charts/enterprise/clusterissuer/Chart.yaml

@@ -21,7 +21,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/enterprise/clusterissuer
   - https://cert-manager.io/
 type: application
-version: 1.0.12
+version: 1.0.13
 annotations:
   truecharts.org/catagories: |
     - core

charts/enterprise/clusterissuer/templates/clusterissuer/_ACME.tpl

@@ -1,10 +1,6 @@
 {{- define "certmanager.clusterissuer.acme" -}}
-{{- $namespace := "cert-manager" -}}
-{{- if $.Values.operator.certmanager -}}
-{{- if $.Values.operator.certmanager.namespace -}}
-{{- $namespace = $.Values.operator.certmanager.namespace -}}
-{{- end -}}
-{{- end -}}
+{{- $operator := index $.Values.operator "cert-manager" -}}
+{{- $namespace := $operator.namespace | default "cert-manager" -}}
 {{- range .Values.clusterIssuer.ACME }}
   {{- if not (mustRegexMatch "^[a-z]+(-?[a-z]){0,63}-?[a-z]+$" .name) -}}
     {{- fail "ACME - Expected name to be all lowercase with hyphens, but not start or end with a hyphen" -}}

charts/enterprise/clusterissuer/templates/clusterissuer/_CA.tpl

@@ -1,10 +1,6 @@
 {{- define "certmanager.clusterissuer.ca" -}}
-{{- $namespace := "cert-manager" -}}
-{{- if $.Values.operator.certmanager -}}
-{{- if $.Values.operator.certmanager.namespace -}}
-{{- $namespace = $.Values.operator.certmanager.namespace -}}
-{{- end -}}
-{{- end -}}
+{{- $operator := index $.Values.operator "cert-manager" -}}
+{{- $namespace := $operator.namespace | default "cert-manager" -}}
 
 {{- range .Values.clusterIssuer.CA }}
   {{- if not (mustRegexMatch "^[a-z]+(-?[a-z]){0,63}-?[a-z]+$" .name) -}}