[stable/airflow] Allowing for specifying a NodePort number for Flower (…

…helm#23244) Signed-off-by: Alex Begg <[email protected]> Signed-off-by: Miguel Mingorance <[email protected]>
mmingorance-dh · Aug 28, 2020 · a4683cc · a4683cc
1 parent c5a0f62
commit a4683cc
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
diff --git 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.2.0
+version: 7.3.0
 appVersion: 1.10.10
 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
@@ -39,6 +39,7 @@ kubectl exec \
 > NOTE: for chart version numbers, see [Chart.yaml](Chart.yaml) or [helm hub](https://hub.helm.sh/charts/stable/airflow).
 
 For steps you must take when upgrading this chart, please review:
+* [v7.2.X → v7.3.0](UPGRADE.md#v72x--v730)
 * [v7.1.X → v7.2.0](UPGRADE.md#v71x--v720)
 * [v7.0.X → v7.1.0](UPGRADE.md#v70x--v710)
 * [v6.X.X → v7.0.0](UPGRADE.md#v6xx--v700)

diff --git a/stable/airflow/UPGRADE.md b/stable/airflow/UPGRADE.md
@@ -1,5 +1,15 @@
 # Upgrading Steps
 
+## `v7.2.X` → `v7.3.0`
+
+__The following IMPROVEMENTS have been made:__
+
+* Added an ability to specify a specific port for Flower when using NodePort service type with the value `flower.service.nodePort.http`
+
+__The following values have been ADDED:__
+
+* `flower.service.nodePort.http`
+
 ## `v7.1.X` → `v7.2.0`
 
 __The following IMPROVEMENTS have been made:__

diff --git a/stable/airflow/templates/service-flower.yaml b/stable/airflow/templates/service-flower.yaml
@@ -23,6 +23,9 @@ spec:
     - name: flower
       protocol: TCP
       port: {{ .Values.flower.service.externalPort }}
+      {{- if and (eq .Values.flower.service.type "NodePort") (.Values.flower.service.nodePort.http) }}
+      nodePort: {{ .Values.flower.service.nodePort.http }}
+      {{- end }}
       targetPort: 5555
   {{- if eq .Values.flower.service.type "LoadBalancer" }}
   {{- if .Values.flower.service.loadBalancerIP }}

diff --git a/stable/airflow/templates/service-web.yaml b/stable/airflow/templates/service-web.yaml
@@ -27,11 +27,9 @@ spec:
     - name: web
       protocol: TCP
       port: {{ .Values.web.service.externalPort | default 8080 }}
-      {{- if eq .Values.web.service.type "NodePort" }}
-      {{- if .Values.web.service.nodePort.http }}
+      {{- if and (eq .Values.web.service.type "NodePort") (.Values.web.service.nodePort.http) }}
       nodePort: {{ .Values.web.service.nodePort.http }}
       {{- end }}
-      {{- end }}
       targetPort: 8080
   {{- if eq .Values.web.service.type "LoadBalancer" }}
   {{- if .Values.web.service.loadBalancerIP }}

diff --git a/stable/airflow/values.yaml b/stable/airflow/values.yaml
@@ -637,6 +637,8 @@ flower:
     externalPort: 5555
     loadBalancerIP: ""
     loadBalancerSourceRanges: []
+    nodePort:
+      http: ""
 
   ## the number of seconds to wait (in bash) before starting the flower container
   ##