From 5add3f7c927f09eb747dd6c415ea0f1422c32cd3 Mon Sep 17 00:00:00 2001
From: franklin <kevin@franklinkim.de>
Date: Tue, 14 Oct 2025 11:15:17 +0200
Subject: [PATCH] feat: only add secretName if configured

---
 waldur/templates/ingress-api-admin.yaml    | 2 +-
 waldur/templates/ingress-api.yaml          | 2 +-
 waldur/templates/ingress-homeport.yaml     | 2 +-
 waldur/templates/ingress-rmq-ws.yaml       | 2 +-
 waldur/templates/ingress-uvk-everypay.yaml | 4 ++++
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/waldur/templates/ingress-api-admin.yaml b/waldur/templates/ingress-api-admin.yaml
index 8907bb51..586255af 100644
--- a/waldur/templates/ingress-api-admin.yaml
+++ b/waldur/templates/ingress-api-admin.yaml
@@ -83,7 +83,7 @@ spec:
     {{ end }}
     {{ if .Values.ingress.tls.customMastermindSecretName }}
     secretName: {{ .Values.ingress.tls.customMastermindSecretName | quote }}
-    {{ else }}
+    {{ else if or (eq .Values.ingress.tls.source "secret") (eq .Values.ingress.tls.source "letsEncrypt") }}
     secretName: api-certificate
     {{ end }}
   {{ end }}
diff --git a/waldur/templates/ingress-api.yaml b/waldur/templates/ingress-api.yaml
index 967eb594..4bb18796 100755
--- a/waldur/templates/ingress-api.yaml
+++ b/waldur/templates/ingress-api.yaml
@@ -98,7 +98,7 @@ spec:
     {{ end }}
     {{ if .Values.ingress.tls.customMastermindSecretName }}
     secretName: {{ .Values.ingress.tls.customMastermindSecretName | quote }}
-    {{ else }}
+    {{ else if or (eq .Values.ingress.tls.source "secret") (eq .Values.ingress.tls.source "letsEncrypt") }}
     secretName: api-certificate
     {{ end }}
   {{ end }}
diff --git a/waldur/templates/ingress-homeport.yaml b/waldur/templates/ingress-homeport.yaml
index f1450952..3cdccf90 100755
--- a/waldur/templates/ingress-homeport.yaml
+++ b/waldur/templates/ingress-homeport.yaml
@@ -79,7 +79,7 @@ spec:
     {{ end }}
     {{ if .Values.ingress.tls.customHomeportSecretName }}
     secretName: {{ .Values.ingress.tls.customHomeportSecretName | quote }}
-    {{ else }}
+    {{ else if or (eq .Values.ingress.tls.source "secret") (eq .Values.ingress.tls.source "letsEncrypt") }}
     secretName: homeport-certificate
     {{ end }}
   {{ end }}
diff --git a/waldur/templates/ingress-rmq-ws.yaml b/waldur/templates/ingress-rmq-ws.yaml
index a522e0bf..c0cad1fc 100644
--- a/waldur/templates/ingress-rmq-ws.yaml
+++ b/waldur/templates/ingress-rmq-ws.yaml
@@ -43,7 +43,7 @@ spec:
     - {{ .Values.apiHostname }}
     {{ if .Values.ingress.tls.customMastermindSecretName }}
     secretName: {{ .Values.ingress.tls.customMastermindSecretName | quote }}
-    {{ else }}
+    {{ else if or (eq .Values.ingress.tls.source "secret") (eq .Values.ingress.tls.source "letsEncrypt") }}
     secretName: api-certificate
     {{ end }}
   {{ end }}
diff --git a/waldur/templates/ingress-uvk-everypay.yaml b/waldur/templates/ingress-uvk-everypay.yaml
index 40c73a5f..313504e3 100644
--- a/waldur/templates/ingress-uvk-everypay.yaml
+++ b/waldur/templates/ingress-uvk-everypay.yaml
@@ -36,5 +36,9 @@ spec:
   tls:
   - hosts:
     - {{ .Values.apiHostname }}
+    {{ if .Values.ingress.tls.customMastermindSecretName }}
+    secretName: {{ .Values.ingress.tls.customMastermindSecretName | quote }}
+    {{ else if or (eq .Values.ingress.tls.source "secret") (eq .Values.ingress.tls.source "letsEncrypt") }}
     secretName: api-certificate
+    {{ end }}
 {{ end }}