From 6c7cdedb2460b3fed1000b1c84e6a1fdffda4c5c Mon Sep 17 00:00:00 2001
From: mickkael <19755421+mickkael@users.noreply.github.com>
Date: Fri, 11 Nov 2022 02:11:25 +0800
Subject: [PATCH] Helm chart improved for ingress (#19826)

* ingressClassName

* ingress values must be optional
---
 chart/templates/ingress.yaml | 3 +++
 chart/values.yaml            | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml
index 811d98a2252..08663829735 100644
--- a/chart/templates/ingress.yaml
+++ b/chart/templates/ingress.yaml
@@ -19,6 +19,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+  {{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  {{- end }}
   {{- if .Values.ingress.tls }}
   tls:
     {{- range .Values.ingress.tls }}
diff --git a/chart/values.yaml b/chart/values.yaml
index 16f319fe0b5..c19ab9ed2fa 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -104,8 +104,8 @@ mastodon:
 ingress:
   enabled: true
   annotations:
-    kubernetes.io/ingress.class: nginx
-    kubernetes.io/tls-acme: "true"
+    #kubernetes.io/ingress.class: nginx
+    #kubernetes.io/tls-acme: "true"
     # cert-manager.io/cluster-issuer: "letsencrypt"
     #
     # ensure that NGINX's upload size matches Mastodon's
@@ -113,6 +113,8 @@ ingress:
     # nginx.ingress.kubernetes.io/proxy-body-size: 40m
     #   for the NGINX ingress controller:
     # nginx.org/client-max-body-size: 40m
+  # you can specify the ingressClassName if it differs from the default
+  ingressClassName:
   hosts:
     - host: mastodon.local
       paths: