From 319b8a4af60f4e4d7be8d8247f1f25654bb89fac Mon Sep 17 00:00:00 2001
From: Sebastian Plattner <plattner@puzzle.ch>
Date: Tue, 24 Oct 2023 10:21:47 +0200
Subject: [PATCH] Use ingressClassName instead on annotation

---
 helm-chart/templates/acend-ingres.yaml | 29 +++-----------------------
 helm-chart/values.yaml                 |  2 +-
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/helm-chart/templates/acend-ingres.yaml b/helm-chart/templates/acend-ingres.yaml
index 85ee048d..aa281eb4 100644
--- a/helm-chart/templates/acend-ingres.yaml
+++ b/helm-chart/templates/acend-ingres.yaml
@@ -15,6 +15,7 @@ metadata:
     cert-manager.io/cluster-issuer: acend-letsencrypt
   {{- end }}
 spec:
+  ingressClassName: {{ .Values.ingress.ingressClass }}
   rules:
   - host: acend.ch
     http:
@@ -43,6 +44,7 @@ metadata:
     kubernetes.io/tls-acme: "true"
     cert-manager.io/cluster-issuer: acend-letsencrypt
   {{- end }}
+ingressClassName: {{ .Values.ingress.ingressClass }}
 spec:
   rules:
   - host: www.acend.ch
@@ -59,32 +61,6 @@ spec:
   - hosts:
     - www.acend.ch
     secretName: www-acend-ch
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  name: {{ $fullName }}-puzzle
-  labels:
-    {{- include "acend-website-chart.labels" . | nindent 4 }}
-spec:
-  rules:
-  - host: acend-website.k8s.puzzle.ch
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: {{ $fullName }}
-            port:
-              number: {{ $svcPort }}
-  tls:
-  - hosts:
-    - acend-website.k8s.puzzle.ch
 {{ else }}
 ---
 apiVersion: networking.k8s.io/v1
@@ -100,6 +76,7 @@ metadata:
     nginx.ingress.kubernetes.io/auth-secret: staging-basic-auth
   {{- end }}
 spec:
+  ingressClassName: {{ .Values.ingress.ingressClass }}
   rules:
   - host: website-{{ .Release.Name }}.test.acend.ch
     http:
diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
index 173e0f86..85a6b1e9 100644
--- a/helm-chart/values.yaml
+++ b/helm-chart/values.yaml
@@ -11,8 +11,8 @@ image:
   tag: ""
 
 ingress:
+  ingressClass: nginx
   annotations:
-    kubernetes.io/ingress.class: nginx-public
     nginx.ingress.kubernetes.io/configuration-snippet: |
       more_set_headers "Strict-Transport-Security: max-age=31536000; includeSubDomains";
       more_set_headers "Content-Security-Policy: default-src 'self' https://*.acend.ch";