From c7ea3fc2a449a1e9fa0d734192534bb62a343b42 Mon Sep 17 00:00:00 2001
From: Cory Murphy <cory@coryamurphy.com>
Date: Wed, 14 Oct 2020 21:57:52 -0400
Subject: [PATCH] [stable/airflow] provide additional labels configuration
 (#23867)

Signed-off-by: Cory Murphy <public@coryamurphy.com>
---
 stable/airflow/Chart.yaml                     |  2 +-
 stable/airflow/README.md                      |  1 +
 stable/airflow/UPGRADE.md                     |  8 ++++++
 .../templates/flower/flower-ingress.yaml      | 15 ++++++++++
 .../webserver/webserver-ingress.yaml          |  3 ++
 stable/airflow/values.yaml                    | 28 +++++++++++++++++++
 6 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/stable/airflow/Chart.yaml b/stable/airflow/Chart.yaml
index 00bef63e60..95df2da9dc 100644
--- a/stable/airflow/Chart.yaml
+++ b/stable/airflow/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Airflow is a platform to programmatically author, schedule and monitor workflows
 name: airflow
-version: 7.11.4
+version: 7.12.0
 appVersion: 1.10.12
 icon: https://airflow.apache.org/_images/pin_large.png
 home: https://airflow.apache.org/
diff --git a/stable/airflow/README.md b/stable/airflow/README.md
index 52a9fde847..1a873d6e04 100644
--- a/stable/airflow/README.md
+++ b/stable/airflow/README.md
@@ -52,6 +52,7 @@ kubectl exec \
 
 Chart version numbers: [Chart.yaml](Chart.yaml) or [Helm Hub](https://hub.helm.sh/charts/stable/airflow)
 
+- [v7.11.X → v7.12.0](UPGRADE.md#v711x--v7120)
 - [v7.10.X → v7.11.0](UPGRADE.md#v710x--v7110)
 - [v7.9.X → v7.10.0](UPGRADE.md#v79x--v7100)
 - [v7.8.X → v7.9.0](UPGRADE.md#v78x--v790)
diff --git a/stable/airflow/UPGRADE.md b/stable/airflow/UPGRADE.md
index f8e0776788..1a118ac455 100644
--- a/stable/airflow/UPGRADE.md
+++ b/stable/airflow/UPGRADE.md
@@ -1,5 +1,13 @@
 # Upgrading Steps
 
+## `v7.11.X` → `v7.12.0`
+
+__The following values have been ADDED:__
+* `ingress.web.labels`
+* `ingress.flower.labels`
+* `ingress.flower.precedingPaths`
+* `ingress.flower.succeedingPaths`
+
 ## `v7.10.X` → `v7.11.0`
 
 __The following IMPROVEMENTS have been made:__
diff --git a/stable/airflow/templates/flower/flower-ingress.yaml b/stable/airflow/templates/flower/flower-ingress.yaml
index 679a52fe16..d11018d713 100644
--- a/stable/airflow/templates/flower/flower-ingress.yaml
+++ b/stable/airflow/templates/flower/flower-ingress.yaml
@@ -13,6 +13,9 @@ metadata:
     chart: {{ include "airflow.labels.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+    {{- if .Values.ingress.flower.labels }}
+    {{- toYaml .Values.ingress.flower.labels | nindent 4 }}
+    {{- end }}
 spec:
   {{- if .Values.ingress.flower.tls.enabled }}
   tls:
@@ -23,9 +26,21 @@ spec:
   rules:
     - http:
         paths:
+          {{- range .Values.ingress.flower.precedingPaths }}
+          - path: {{ .path }}
+            backend:
+              serviceName: {{ .serviceName }}
+              servicePort: {{ .servicePort }}
+          {{- end }}
           - path: {{ .Values.ingress.flower.path }}
             backend:
               serviceName: {{ include "airflow.fullname" . }}-flower
               servicePort: flower
+          {{- range .Values.ingress.flower.succeedingPaths }}
+          - path: {{ .path }}
+            backend:
+              serviceName: {{ .serviceName }}
+              servicePort: {{ .servicePort }}
+          {{- end }}
       host: {{ .Values.ingress.flower.host }}
 {{- end }}
diff --git a/stable/airflow/templates/webserver/webserver-ingress.yaml b/stable/airflow/templates/webserver/webserver-ingress.yaml
index d1a7c7ef81..b0c2e8622f 100644
--- a/stable/airflow/templates/webserver/webserver-ingress.yaml
+++ b/stable/airflow/templates/webserver/webserver-ingress.yaml
@@ -13,6 +13,9 @@ metadata:
     chart: {{ include "airflow.labels.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+    {{- if .Values.ingress.web.labels }}
+    {{- toYaml .Values.ingress.web.labels | nindent 4 }}
+    {{- end }}
 spec:
   {{- if .Values.ingress.web.tls.enabled }}
   tls:
diff --git a/stable/airflow/values.yaml b/stable/airflow/values.yaml
index 0d2f033047..2f1794e438 100644
--- a/stable/airflow/values.yaml
+++ b/stable/airflow/values.yaml
@@ -1077,6 +1077,10 @@ ingress:
     ##
     annotations: {}
 
+    ## additional labels for the web Ingress
+    ##
+    labels: {}
+
     ## the path for the web Ingress
     ##
     ## WARNING:
@@ -1144,6 +1148,10 @@ ingress:
     ##
     annotations: {}
 
+    ## additional labels for the flower Ingress
+    ##
+    labels: {}
+
     ## the path for the flower Ingress
     ##
     ## WARNING:
@@ -1185,6 +1193,26 @@ ingress:
       ##
       secretName: ""
 
+    ## http paths to add to the flower Ingress before the default path
+    ##
+    ## EXAMPLE:
+    ##   precedingPaths:
+    ##     - path: "/*"
+    ##       serviceName: "ssl-redirect"
+    ##       servicePort: "use-annotation"
+    ##
+    precedingPaths: []
+
+    ## http paths to add to the flower Ingress after the default path
+    ##
+    ## EXAMPLE:
+    ##   succeedingPaths:
+    ##     - path: "/extra-service"
+    ##       serviceName: "extra-service"
+    ##       servicePort: "use-annotation"
+    ##
+    succeedingPaths: []
+
 ###################################
 # Kubernetes - RBAC
 ###################################