feat(helm): allow persisting nodePort for services (apache#22713)

Signed-off-by: DASTC\gupta_rajan <rajan.gupta@stengg.com> Co-authored-by: DASTC\gupta_rajan <rajan.gupta@stengg.com>
preset-io · Feb 14, 2023 · a307223 · a307223
1 parent 65fffe9
commit a307223
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml
@@ -29,7 +29,7 @@ maintainers:
   - name: craig-rueda
     email: craig@craigrueda.com
     url: https://github.com/craig-rueda
-version: 0.8.5
+version: 0.8.6
 dependencies:
   - name: postgresql
     version: 12.1.6

diff --git a/helm/superset/README.md b/helm/superset/README.md
@@ -23,7 +23,7 @@ NOTE: This file is generated by helm-docs: https://github.com/norwoodj/helm-docs
 
 # superset
 
-![Version: 0.8.5](https://img.shields.io/badge/Version-0.8.5-informational?style=flat-square)
+![Version: 0.8.6](https://img.shields.io/badge/Version-0.8.6-informational?style=flat-square)
 
 Apache Superset is a modern, enterprise-ready business intelligence web application
 
@@ -103,6 +103,7 @@ helm install my-superset superset/superset
 | runAsUser | int | `0` | User ID directive. This user must have enough permissions to run the bootstrap script Running containers as root is not recommended in production. Change this to another UID - e.g. 1000 to be more secure |
 | service.annotations | object | `{}` |  |
 | service.loadBalancerIP | string | `nil` |  |
+| service.nodePort.http | int | `"nil"` |  |
 | service.port | int | `8088` |  |
 | service.type | string | `"ClusterIP"` |  |
 | serviceAccount.annotations | object | `{}` |  |
@@ -145,6 +146,7 @@ helm install my-superset superset/superset
 | supersetCeleryFlower.replicaCount | int | `1` |  |
 | supersetCeleryFlower.resources | object | `{}` | Resource settings for the CeleryBeat pods - these settings overwrite might existing values from the global resources object defined above. |
 | supersetCeleryFlower.service.annotations | object | `{}` |  |
+| supersetCeleryFlower.service.nodePort.http | int | `"nil"` |  |
 | supersetCeleryFlower.service.port | int | `5555` |  |
 | supersetCeleryFlower.service.type | string | `"ClusterIP"` |  |
 | supersetCeleryFlower.startupProbe.failureThreshold | int | `60` |  |
@@ -229,6 +231,7 @@ helm install my-superset superset/superset
 | supersetWebsockets.replicaCount | int | `1` |  |
 | supersetWebsockets.resources | object | `{}` |  |
 | supersetWebsockets.service.annotations | object | `{}` |  |
+| supersetWebsockets.service.nodePort.http | int | `"nil"` |  |
 | supersetWebsockets.service.port | int | `8080` |  |
 | supersetWebsockets.service.type | string | `"ClusterIP"` |  |
 | supersetWebsockets.startupProbe.failureThreshold | int | `60` |  |

diff --git a/helm/superset/templates/service.yaml b/helm/superset/templates/service.yaml
@@ -35,6 +35,9 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
+      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePort.http)) }}
+      nodePort: {{ .Values.service.nodePort.http }}
+      {{- end }}
   selector:
     app: {{ template "superset.name" . }}
     release: {{ .Release.Name }}
@@ -64,6 +67,9 @@ spec:
       targetPort: flower
       protocol: TCP
       name: flower
+      {{- if and (or (eq .Values.supersetCeleryFlower.service.type "NodePort") (eq .Values.supersetCeleryFlower.service.type "LoadBalancer")) (not (empty .Values.supersetCeleryFlower.service.nodePort.http)) }}
+      nodePort: {{ .Values.supersetCeleryFlower.service.nodePort.http }}
+      {{- end }}
   selector:
     app: {{ template "superset.name" . }}-flower
     release: {{ .Release.Name }}
@@ -94,6 +100,9 @@ spec:
       targetPort: ws
       protocol: TCP
       name: ws
+      {{- if and (or (eq .Values.supersetWebsockets.service.type "NodePort") (eq .Values.supersetWebsockets.service.type "LoadBalancer")) (not (empty .Values.supersetWebsockets.service.nodePort.http)) }}
+      nodePort: {{ .Values.supersetWebsockets.service.nodePort.http }}
+      {{- end }}
   selector:
     app: "{{ template "superset.name" . }}-ws"
     release: {{ .Release.Name }}

diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml
@@ -200,6 +200,9 @@ service:
     {}
     # cloud.google.com/load-balancer-type: "Internal"
   loadBalancerIP: null
+  nodePort:
+    # -- (int)
+    http: nil
 
 ingress:
   enabled: false
@@ -466,6 +469,9 @@ supersetCeleryFlower:
     type: ClusterIP
     annotations: {}
     port: 5555
+    nodePort:
+      # -- (int)
+      http: nil
   startupProbe:
     httpGet:
       path: /api/workers
@@ -567,6 +573,9 @@ supersetWebsockets:
     type: ClusterIP
     annotations: {}
     port: 8080
+    nodePort:
+      # -- (int)
+      http: nil
   command: []
   resources: {}
   deploymentAnnotations: {}