From ccd62aca21be53595d398b1ef69bdf3f3bdb8679 Mon Sep 17 00:00:00 2001
From: SyeKlu <sk@teuto.net>
Date: Thu, 16 May 2024 15:15:32 +0200
Subject: [PATCH] fix(ckan): change ingress tls template (#968)

---
 .github/CODEOWNERS                 | 2 +-
 charts/ckan/Chart.yaml             | 6 ++++++
 charts/ckan/templates/ingress.yaml | 2 --
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 40ac27ca3..ab5254cb2 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,6 +1,6 @@
 * @teutonet/k8s
 /charts/base-cluster/ @cwrau @marvinWolff @tasches  @teutonet-bot
-/charts/ckan/ @syeklu  @teutonet-bot
+/charts/ckan/ @syeklu @cwrau @marvinWolff @tasches @teutonet-bot
 /charts/common/ @cwrau @marvinWolff @tasches  @teutonet-bot
 /charts/stellio-context-broker/ @cwrau @ocaner-biz  @teutonet-bot
 /charts/t8s-cluster/ @cwrau @marvinWolff @tasches  @teutonet-bot
diff --git a/charts/ckan/Chart.yaml b/charts/ckan/Chart.yaml
index 9458b8ea3..1743fc1fe 100644
--- a/charts/ckan/Chart.yaml
+++ b/charts/ckan/Chart.yaml
@@ -6,6 +6,12 @@ appVersion: 2.11.0
 maintainers:
   - name: syeklu
     email: sk@teuto.net
+  - name: cwrau
+    email: cwr@teuto.net
+  - name: marvinWolff
+    email: mw@teuto.net
+  - name: tasches
+    email: st@teuto.net
 description: A Helm chart for Kubernetes
 dependencies:
   - name: common
diff --git a/charts/ckan/templates/ingress.yaml b/charts/ckan/templates/ingress.yaml
index bede0bc02..46403db25 100644
--- a/charts/ckan/templates/ingress.yaml
+++ b/charts/ckan/templates/ingress.yaml
@@ -31,7 +31,6 @@ spec:
     {{- end }}
   {{- if .Values.ckan.ingress.tls }}
   tls:
-  {{- if and .Values.ckan.ingress.tls (or .Values.ckan.ingress.existingSecret (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ckan.ingress.annotations )) .Values.ckan.ingress.selfSigned) }}
     - hosts:
         - {{ tpl .Values.ckan.ingress.hostname . | quote }}
       {{- if .Values.ckan.ingress.existingSecret }}
@@ -39,6 +38,5 @@ spec:
       {{- else }}
       secretName: {{ printf "%s-tls" (tpl .Values.ckan.ingress.hostname .) | trunc 63 | trimSuffix "-" }}
       {{- end }}
-    {{- end }}
   {{- end }}
 {{- end }}