From 57f764b92ac91973e8edbb0454507aec2a0f8fec Mon Sep 17 00:00:00 2001
From: Simon Larsen <simonlarsen@oneuptime.com>
Date: Wed, 24 Sep 2025 11:03:03 +0100
Subject: [PATCH] refactor: Update cert-manager configuration to use index for
 improved clarity

---
 .../oneuptime/templates/cluster-issuer.yaml       | 15 ++++++++-------
 HelmChart/Public/oneuptime/templates/ingress.yaml |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/HelmChart/Public/oneuptime/templates/cluster-issuer.yaml b/HelmChart/Public/oneuptime/templates/cluster-issuer.yaml
index cfceed99b8..9ccbf0840d 100644
--- a/HelmChart/Public/oneuptime/templates/cluster-issuer.yaml
+++ b/HelmChart/Public/oneuptime/templates/cluster-issuer.yaml
@@ -1,16 +1,17 @@
-{{- if .Values.cert-manager.enabled }}
+{{- if index .Values "cert-manager" "enabled" }}
 apiVersion: cert-manager.io/v1
 kind: ClusterIssuer
 metadata:
   name: {{ .Release.Name }}-letsencrypt
+  namespace: {{ .Release.Namespace }}
 spec:
   acme:
-    server: {{ .Values.cert-manager.letsEncrypt.server | quote }}
-    email: {{ .Values.cert-manager.letsEncrypt.email | quote }}
+    server: {{ index .Values "cert-manager" "letsEncrypt" "server" | quote }}
+    email: {{ index .Values "cert-manager" "letsEncrypt" "email" | quote }}
     privateKeySecretRef:
       name: {{ .Release.Name }}-letsencrypt
     solvers:
-    - http01:
-        ingress:
-          class: {{ .Values.oneuptimeIngress.className }}
-{{- end }}
\ No newline at end of file
+      - http01:
+          ingress:
+            class: {{ .Values.oneuptimeIngress.className }}
+{{- end }}
diff --git a/HelmChart/Public/oneuptime/templates/ingress.yaml b/HelmChart/Public/oneuptime/templates/ingress.yaml
index f824b394dc..782c20c160 100644
--- a/HelmChart/Public/oneuptime/templates/ingress.yaml
+++ b/HelmChart/Public/oneuptime/templates/ingress.yaml
@@ -14,8 +14,8 @@ metadata:
     {{- with $.Values.oneuptimeIngress.annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
-    {{- if $.Values.cert-manager.enabled }}
-    cert-manager.io/cluster-issuer: {{ printf "%s-%s" $.Release.Name "letsencrypt" }}
+    {{- if index $.Values "cert-manager" "enabled" }}
+    cert-manager.io/cluster-issuer: {{ $.Release.Name }}-letsencrypt
     {{- end }}
 spec:
   ingressClassName: {{ $.Values.oneuptimeIngress.className }}