From 9eb66381451206b87bf0a2bcb96d618554c4eb79 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten <kjeld@schouten-lebbing.nl>
Date: Wed, 19 Jul 2023 14:40:43 +0200
Subject: [PATCH] fix(clusterissuer): try to deal with the fact cert-manager
 contains a dash

---
 charts/enterprise/clusterissuer/Chart.yaml                | 2 +-
 .../clusterissuer/templates/clusterissuer/_ACME.tpl       | 8 ++------
 .../clusterissuer/templates/clusterissuer/_CA.tpl         | 8 ++------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/charts/enterprise/clusterissuer/Chart.yaml b/charts/enterprise/clusterissuer/Chart.yaml
index 5adcf252e17..187347b0a5e 100644
--- a/charts/enterprise/clusterissuer/Chart.yaml
+++ b/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
diff --git a/charts/enterprise/clusterissuer/templates/clusterissuer/_ACME.tpl b/charts/enterprise/clusterissuer/templates/clusterissuer/_ACME.tpl
index ead8359f291..1d5c4865c16 100644
--- a/charts/enterprise/clusterissuer/templates/clusterissuer/_ACME.tpl
+++ b/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" -}}
diff --git a/charts/enterprise/clusterissuer/templates/clusterissuer/_CA.tpl b/charts/enterprise/clusterissuer/templates/clusterissuer/_CA.tpl
index af772bdbc7b..29e7c61099b 100644
--- a/charts/enterprise/clusterissuer/templates/clusterissuer/_CA.tpl
+++ b/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) -}}