From 06b4d8e7f59221a84d38a91cd97c6c87cff2c3a5 Mon Sep 17 00:00:00 2001
From: fkoetzner <florian.koetzner@baeckerai.de>
Date: Wed, 23 Feb 2022 09:10:15 +0100
Subject: [PATCH] feat: add ingressClassName to web/flower ingress

Signed-off-by: fkoetzner <florian.koetzner@baeckerai.de>
---
 charts/airflow/README.md                             | 12 +++++++-----
 .../templates/flower/flower-ingress-v1beta1.yaml     |  3 +++
 charts/airflow/templates/flower/flower-ingress.yaml  |  3 +++
 .../webserver/webserver-ingress-v1beta1.yaml         |  3 +++
 .../templates/webserver/webserver-ingress.yaml       |  3 +++
 charts/airflow/values.yaml                           | 10 ++++++++++
 6 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/charts/airflow/README.md b/charts/airflow/README.md
index b749cf6b..be3ff571 100644
--- a/charts/airflow/README.md
+++ b/charts/airflow/README.md
@@ -1235,7 +1235,7 @@ Consider the situation where you already have something hosted at the root of yo
 - http://example.com/airflow/
 - http://example.com/airflow/flower
 
-In this example, would set these values:
+In this example, you would set these values, assuming you have an Ingress Controller with an IngressClass named "nginx" deployed:
 ```yaml
 airflow:
   config: 
@@ -1250,17 +1250,19 @@ ingress:
   
   ## airflow webserver ingress configs
   web:
-    annotations:
-      kubernetes.io/ingress.class: nginx
+    annotations: {}
     host: "example.com"
     path: "/airflow"
+    ## WARNING: requires Kubernetes 1.18 or later, use "kubernetes.io/ingress.class" annotation for older versions
+    ingressClassName: "nginx"
     
   ## flower ingress configs
   flower:
-    annotations:
-      kubernetes.io/ingress.class: nginx
+    annotations: {}
     host: "example.com"
     path: "/airflow/flower"
+    ## WARNING: requires Kubernetes 1.18 or later, use "kubernetes.io/ingress.class" annotation for older versions
+    ingressClassName: "nginx"
 ```
 
 We expose the `ingress.web.precedingPaths` and `ingress.web.succeedingPaths` values, which are __before__ and __after__ the default path respectively.
diff --git a/charts/airflow/templates/flower/flower-ingress-v1beta1.yaml b/charts/airflow/templates/flower/flower-ingress-v1beta1.yaml
index 11d483d6..2b85b268 100644
--- a/charts/airflow/templates/flower/flower-ingress-v1beta1.yaml
+++ b/charts/airflow/templates/flower/flower-ingress-v1beta1.yaml
@@ -25,6 +25,9 @@ spec:
       secretName: {{ .Values.ingress.flower.tls.secretName }}
       {{- end }}
   {{- end }}
+  {{- if .Values.ingress.flower.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.flower.ingressClassName }}
+  {{- end }}  
   rules:
     - host: {{ .Values.ingress.flower.host }}
       http:
diff --git a/charts/airflow/templates/flower/flower-ingress.yaml b/charts/airflow/templates/flower/flower-ingress.yaml
index 73fab1c3..9e1ed0d2 100644
--- a/charts/airflow/templates/flower/flower-ingress.yaml
+++ b/charts/airflow/templates/flower/flower-ingress.yaml
@@ -25,6 +25,9 @@ spec:
       secretName: {{ .Values.ingress.flower.tls.secretName }}
       {{- end }}
   {{- end }}
+  {{- if .Values.ingress.flower.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.flower.ingressClassName }}
+  {{- end }}
   rules:
     - host: {{ .Values.ingress.flower.host }}
       http:
diff --git a/charts/airflow/templates/webserver/webserver-ingress-v1beta1.yaml b/charts/airflow/templates/webserver/webserver-ingress-v1beta1.yaml
index de81e5b4..a5f76169 100644
--- a/charts/airflow/templates/webserver/webserver-ingress-v1beta1.yaml
+++ b/charts/airflow/templates/webserver/webserver-ingress-v1beta1.yaml
@@ -25,6 +25,9 @@ spec:
       secretName: {{ .Values.ingress.web.tls.secretName }}
       {{- end }}
   {{- end }}
+  {{- if .Values.ingress.web.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.web.ingressClassName }}
+  {{- end }}  
   rules:
     - host: {{ .Values.ingress.web.host }}
       http:
diff --git a/charts/airflow/templates/webserver/webserver-ingress.yaml b/charts/airflow/templates/webserver/webserver-ingress.yaml
index 7196ff2f..66ac94e8 100644
--- a/charts/airflow/templates/webserver/webserver-ingress.yaml
+++ b/charts/airflow/templates/webserver/webserver-ingress.yaml
@@ -25,6 +25,9 @@ spec:
       secretName: {{ .Values.ingress.web.tls.secretName }}
       {{- end }}
   {{- end }}
+  {{- if .Values.ingress.web.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.web.ingressClassName }}
+  {{- end }}
   rules:
     - host: {{ .Values.ingress.web.host }}
       http:
diff --git a/charts/airflow/values.yaml b/charts/airflow/values.yaml
index ee21df30..0296c1e4 100644
--- a/charts/airflow/values.yaml
+++ b/charts/airflow/values.yaml
@@ -1203,6 +1203,11 @@ ingress:
     ##
     host: ""
 
+    ## the Ingress Class for the web Ingress
+    ## - [WARNING] requires Kubernetes 1.18 or later, use "kubernetes.io/ingress.class" annotation for older versions
+    ##
+    ingressClassName: ""
+
     ## configs for web Ingress TLS
     ##
     tls:
@@ -1258,6 +1263,11 @@ ingress:
     ##
     host: ""
 
+    ## the Ingress Class for the flower Ingress
+    ## - [WARNING] requires Kubernetes 1.18 or later, use "kubernetes.io/ingress.class" annotation for older versions
+    ##
+    ingressClassName: ""
+
     ## configs for flower Ingress TLS
     ##
     tls: