From 0e3db717194e3e73e3fb5182fd7684558fbe6679 Mon Sep 17 00:00:00 2001
From: Rajan Gupta <rajan0493@gmail.com>
Date: Fri, 13 Jan 2023 10:11:01 +0800
Subject: [PATCH 01/11] feat(helm): allow persisting nodePort for services

---
 helm/superset/Chart.yaml             |  2 +-
 helm/superset/README.md              |  3 +++
 helm/superset/templates/service.yaml | 15 +++++++++++++++
 helm/superset/values.yaml            |  6 ++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml
index 6321e075a3651..63816fbc7a2e2 100644
--- 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.2
+version: 0.8.3
 dependencies:
   - name: postgresql
     version: 12.1.6
diff --git a/helm/superset/README.md b/helm/superset/README.md
index 03d3c1f326382..92c81afaee97e 100644
--- a/helm/superset/README.md
+++ b/helm/superset/README.md
@@ -105,6 +105,7 @@ helm install my-superset superset/superset
 | service.loadBalancerIP | string | `nil` |  |
 | service.port | int | `8088` |  |
 | service.type | string | `"ClusterIP"` |  |
+| service.nodePorts.http | int | `""` |  |
 | serviceAccount.annotations | object | `{}` |  |
 | serviceAccount.create | bool | `false` | Create custom service account for Superset. If create: true and name is not provided, `superset.fullname` will be used. |
 | supersetCeleryBeat.command | list | a `celery beat` command | Command |
@@ -144,6 +145,7 @@ helm install my-superset superset/superset
 | supersetCeleryFlower.service.annotations | object | `{}` |  |
 | supersetCeleryFlower.service.port | int | `5555` |  |
 | supersetCeleryFlower.service.type | string | `"ClusterIP"` |  |
+| supersetCeleryFlowerservice.nodePorts.http | int | `""` |  |
 | supersetCeleryFlower.startupProbe.failureThreshold | int | `60` |  |
 | supersetCeleryFlower.startupProbe.httpGet.path | string | `"/api/workers"` |  |
 | supersetCeleryFlower.startupProbe.httpGet.port | string | `"flower"` |  |
@@ -224,6 +226,7 @@ helm install my-superset superset/superset
 | supersetWebsockets.service.annotations | object | `{}` |  |
 | supersetWebsockets.service.port | int | `8080` |  |
 | supersetWebsockets.service.type | string | `"ClusterIP"` |  |
+| supersetWebsockets.nodePorts.http | int | `""` |  |
 | supersetWebsockets.startupProbe.failureThreshold | int | `60` |  |
 | supersetWebsockets.startupProbe.httpGet.path | string | `"/health"` |  |
 | supersetWebsockets.startupProbe.httpGet.port | string | `"ws"` |  |
diff --git a/helm/superset/templates/service.yaml b/helm/superset/templates/service.yaml
index 6ac950d1da6b2..aa3a049683663 100644
--- a/helm/superset/templates/service.yaml
+++ b/helm/superset/templates/service.yaml
@@ -35,6 +35,11 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
+      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.http)) }}
+      nodePort: {{ .Values.service.nodePorts.http }}
+      {{- else if eq .Values.service.type "ClusterIP" }}
+      nodePort: null
+      {{- end }}
   selector:
     app: {{ template "superset.name" . }}
     release: {{ .Release.Name }}
@@ -64,6 +69,11 @@ 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.nodePorts.http)) }}
+      nodePort: {{ .Values.supersetCeleryFlower.service.nodePorts.http }}
+      {{- else if eq .Values.supersetCeleryFlower.service.type "ClusterIP" }}
+      nodePort: null
+      {{- end }}
   selector:
     app: {{ template "superset.name" . }}-flower
     release: {{ .Release.Name }}
@@ -94,6 +104,11 @@ 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.nodePorts.http)) }}
+      nodePort: {{ .Values.supersetWebsockets.service.nodePorts.http }}
+      {{- else if eq .Values.supersetWebsockets.service.type "ClusterIP" }}
+      nodePort: null
+      {{- end }}
   selector:
     app: "{{ template "superset.name" . }}-ws"
     release: {{ .Release.Name }}
diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml
index 143d6c13f18e9..fb9b3b0741c7d 100644
--- a/helm/superset/values.yaml
+++ b/helm/superset/values.yaml
@@ -200,6 +200,8 @@ service:
     {}
     # cloud.google.com/load-balancer-type: "Internal"
   loadBalancerIP: null
+  nodePorts:
+    http: ""
 
 ingress:
   enabled: false
@@ -458,6 +460,8 @@ supersetCeleryFlower:
     type: ClusterIP
     annotations: {}
     port: 5555
+    nodePorts:
+      http: ""
   startupProbe:
     httpGet:
       path: /api/workers
@@ -555,6 +559,8 @@ supersetWebsockets:
     type: ClusterIP
     annotations: {}
     port: 8080
+    nodePorts:
+      http: ""
   command: []
   resources: {}
   deploymentAnnotations: {}

From 547ea19c9f31d9067c93df7f2dd0a13fa02f0acd Mon Sep 17 00:00:00 2001
From: Rajan Gupta <rajan0493@gmail.com>
Date: Sun, 15 Jan 2023 13:19:40 +0800
Subject: [PATCH 02/11] feat(helm): address review comments

---
 helm/superset/README.md              | 10 ++++++----
 helm/superset/templates/service.yaml | 18 ++++++------------
 helm/superset/values.yaml            |  6 +++---
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/helm/superset/README.md b/helm/superset/README.md
index 92c81afaee97e..27a22b5d4a2f8 100644
--- a/helm/superset/README.md
+++ b/helm/superset/README.md
@@ -23,7 +23,9 @@ NOTE: This file is generated by helm-docs: https://github.com/norwoodj/helm-docs
 
 # superset
 
-![Version: 0.8.2](https://img.shields.io/badge/Version-0.8.2-informational?style=flat-square)
+
+
+![Version: 0.8.3](https://img.shields.io/badge/Version-0.8.3-informational?style=flat-square) 
 
 Apache Superset is a modern, enterprise-ready business intelligence web application
 
@@ -103,9 +105,9 @@ 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 | string | `""` |  |
 | service.port | int | `8088` |  |
 | service.type | string | `"ClusterIP"` |  |
-| service.nodePorts.http | int | `""` |  |
 | serviceAccount.annotations | object | `{}` |  |
 | serviceAccount.create | bool | `false` | Create custom service account for Superset. If create: true and name is not provided, `superset.fullname` will be used. |
 | supersetCeleryBeat.command | list | a `celery beat` command | Command |
@@ -143,9 +145,9 @@ 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 | string | `""` |  |
 | supersetCeleryFlower.service.port | int | `5555` |  |
 | supersetCeleryFlower.service.type | string | `"ClusterIP"` |  |
-| supersetCeleryFlowerservice.nodePorts.http | int | `""` |  |
 | supersetCeleryFlower.startupProbe.failureThreshold | int | `60` |  |
 | supersetCeleryFlower.startupProbe.httpGet.path | string | `"/api/workers"` |  |
 | supersetCeleryFlower.startupProbe.httpGet.port | string | `"flower"` |  |
@@ -224,9 +226,9 @@ helm install my-superset superset/superset
 | supersetWebsockets.replicaCount | int | `1` |  |
 | supersetWebsockets.resources | object | `{}` |  |
 | supersetWebsockets.service.annotations | object | `{}` |  |
+| supersetWebsockets.service.nodePort.http | string | `""` |  |
 | supersetWebsockets.service.port | int | `8080` |  |
 | supersetWebsockets.service.type | string | `"ClusterIP"` |  |
-| supersetWebsockets.nodePorts.http | int | `""` |  |
 | supersetWebsockets.startupProbe.failureThreshold | int | `60` |  |
 | supersetWebsockets.startupProbe.httpGet.path | string | `"/health"` |  |
 | supersetWebsockets.startupProbe.httpGet.port | string | `"ws"` |  |
diff --git a/helm/superset/templates/service.yaml b/helm/superset/templates/service.yaml
index aa3a049683663..97db594a23958 100644
--- a/helm/superset/templates/service.yaml
+++ b/helm/superset/templates/service.yaml
@@ -35,10 +35,8 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
-      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.http)) }}
-      nodePort: {{ .Values.service.nodePorts.http }}
-      {{- else if eq .Values.service.type "ClusterIP" }}
-      nodePort: null
+      {{- 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" . }}
@@ -69,10 +67,8 @@ 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.nodePorts.http)) }}
-      nodePort: {{ .Values.supersetCeleryFlower.service.nodePorts.http }}
-      {{- else if eq .Values.supersetCeleryFlower.service.type "ClusterIP" }}
-      nodePort: null
+      {{- 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
@@ -104,10 +100,8 @@ 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.nodePorts.http)) }}
-      nodePort: {{ .Values.supersetWebsockets.service.nodePorts.http }}
-      {{- else if eq .Values.supersetWebsockets.service.type "ClusterIP" }}
-      nodePort: null
+      {{- 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"
diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml
index fb9b3b0741c7d..a715e911addc0 100644
--- a/helm/superset/values.yaml
+++ b/helm/superset/values.yaml
@@ -200,7 +200,7 @@ service:
     {}
     # cloud.google.com/load-balancer-type: "Internal"
   loadBalancerIP: null
-  nodePorts:
+  nodePort:
     http: ""
 
 ingress:
@@ -460,7 +460,7 @@ supersetCeleryFlower:
     type: ClusterIP
     annotations: {}
     port: 5555
-    nodePorts:
+    nodePort:
       http: ""
   startupProbe:
     httpGet:
@@ -559,7 +559,7 @@ supersetWebsockets:
     type: ClusterIP
     annotations: {}
     port: 8080
-    nodePorts:
+    nodePort:
       http: ""
   command: []
   resources: {}

From b2cd21aaa3b3091d4b81c61c606f8e90732fec2f Mon Sep 17 00:00:00 2001
From: Rajan Gupta <rajan0493@gmail.com>
Date: Sun, 15 Jan 2023 13:22:06 +0800
Subject: [PATCH 03/11] feat(helm): address review comments

---
 helm/superset/Chart.yaml | 2 +-
 helm/superset/README.md  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml
index 63816fbc7a2e2..2de0f2636b269 100644
--- 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.3
+version: 0.8.4
 dependencies:
   - name: postgresql
     version: 12.1.6
diff --git a/helm/superset/README.md b/helm/superset/README.md
index 27a22b5d4a2f8..e12139622cadf 100644
--- a/helm/superset/README.md
+++ b/helm/superset/README.md
@@ -25,7 +25,7 @@ NOTE: This file is generated by helm-docs: https://github.com/norwoodj/helm-docs
 
 
 
-![Version: 0.8.3](https://img.shields.io/badge/Version-0.8.3-informational?style=flat-square) 
+![Version: 0.8.4](https://img.shields.io/badge/Version-0.8.4-informational?style=flat-square) 
 
 Apache Superset is a modern, enterprise-ready business intelligence web application
 

From 36fcdfb4a5a558c7abddf6f44a373a503e2657ca Mon Sep 17 00:00:00 2001
From: Rajan Gupta <rajan0493@gmail.com>
Date: Wed, 18 Jan 2023 14:51:43 +0800
Subject: [PATCH 04/11] address review comments

---
 helm/superset/README.md   | 6 +++---
 helm/superset/values.yaml | 9 ++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/helm/superset/README.md b/helm/superset/README.md
index e12139622cadf..e9179a32bc062 100644
--- a/helm/superset/README.md
+++ b/helm/superset/README.md
@@ -105,7 +105,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 | string | `""` |  |
+| service.nodePort.http | int | `nil` |  |
 | service.port | int | `8088` |  |
 | service.type | string | `"ClusterIP"` |  |
 | serviceAccount.annotations | object | `{}` |  |
@@ -145,7 +145,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 | string | `""` |  |
+| supersetCeleryFlower.service.nodePort.http | int | `nil` |  |
 | supersetCeleryFlower.service.port | int | `5555` |  |
 | supersetCeleryFlower.service.type | string | `"ClusterIP"` |  |
 | supersetCeleryFlower.startupProbe.failureThreshold | int | `60` |  |
@@ -226,7 +226,7 @@ helm install my-superset superset/superset
 | supersetWebsockets.replicaCount | int | `1` |  |
 | supersetWebsockets.resources | object | `{}` |  |
 | supersetWebsockets.service.annotations | object | `{}` |  |
-| supersetWebsockets.service.nodePort.http | string | `""` |  |
+| 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/values.yaml b/helm/superset/values.yaml
index a715e911addc0..0964cfb100621 100644
--- a/helm/superset/values.yaml
+++ b/helm/superset/values.yaml
@@ -201,7 +201,8 @@ service:
     # cloud.google.com/load-balancer-type: "Internal"
   loadBalancerIP: null
   nodePort:
-    http: ""
+    # -- (int)
+    http: null
 
 ingress:
   enabled: false
@@ -461,7 +462,8 @@ supersetCeleryFlower:
     annotations: {}
     port: 5555
     nodePort:
-      http: ""
+      # -- (int)
+      http: nil
   startupProbe:
     httpGet:
       path: /api/workers
@@ -560,7 +562,8 @@ supersetWebsockets:
     annotations: {}
     port: 8080
     nodePort:
-      http: ""
+      # -- (int)
+      http: nil
   command: []
   resources: {}
   deploymentAnnotations: {}

From 8ef9ac86e46234b27938e6941fac5b488757d66b Mon Sep 17 00:00:00 2001
From: Rajan Gupta <rajan0493@gmail.com>
Date: Wed, 18 Jan 2023 14:56:38 +0800
Subject: [PATCH 05/11] address review comments

---
 helm/superset/README.md              | 2 +-
 helm/superset/templates/service.yaml | 6 +++---
 helm/superset/values.yaml            | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/helm/superset/README.md b/helm/superset/README.md
index e9179a32bc062..c8d8c29ccfbd3 100644
--- a/helm/superset/README.md
+++ b/helm/superset/README.md
@@ -226,7 +226,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.nodePort.http | string | `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
index 97db594a23958..ee32b04cf2666 100644
--- a/helm/superset/templates/service.yaml
+++ b/helm/superset/templates/service.yaml
@@ -35,7 +35,7 @@ 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)) }}
+      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (nil .Values.service.nodePort.http)) }}
       nodePort: {{ .Values.service.nodePort.http }}
       {{- end }}
   selector:
@@ -67,7 +67,7 @@ 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)) }}
+      {{- if and (or (eq .Values.supersetCeleryFlower.service.type "NodePort") (eq .Values.supersetCeleryFlower.service.type "LoadBalancer")) (not (nil .Values.supersetCeleryFlower.service.nodePort.http)) }}
       nodePort: {{ .Values.supersetCeleryFlower.service.nodePort.http }}
       {{- end }}
   selector:
@@ -100,7 +100,7 @@ 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)) }}
+      {{- if and (or (eq .Values.supersetWebsockets.service.type "NodePort") (eq .Values.supersetWebsockets.service.type "LoadBalancer")) (not (nil .Values.supersetWebsockets.service.nodePort.http)) }}
       nodePort: {{ .Values.supersetWebsockets.service.nodePort.http }}
       {{- end }}
   selector:
diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml
index 0964cfb100621..b683cd9fb1461 100644
--- a/helm/superset/values.yaml
+++ b/helm/superset/values.yaml
@@ -201,7 +201,7 @@ service:
     # cloud.google.com/load-balancer-type: "Internal"
   loadBalancerIP: null
   nodePort:
-    # -- (int)
+    # @default -- nil (int)
     http: null
 
 ingress:
@@ -462,7 +462,7 @@ supersetCeleryFlower:
     annotations: {}
     port: 5555
     nodePort:
-      # -- (int)
+      # @default -- nil (int)
       http: nil
   startupProbe:
     httpGet:
@@ -562,7 +562,7 @@ supersetWebsockets:
     annotations: {}
     port: 8080
     nodePort:
-      # -- (int)
+      # @default -- nil (int)
       http: nil
   command: []
   resources: {}

From 3ec3618504ca5067e5f400609517130d28e1b7e7 Mon Sep 17 00:00:00 2001
From: Rajan Gupta <rajan0493@gmail.com>
Date: Wed, 18 Jan 2023 14:59:06 +0800
Subject: [PATCH 06/11] address review comments

---
 helm/superset/README.md   | 6 +++---
 helm/superset/values.yaml | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/helm/superset/README.md b/helm/superset/README.md
index c8d8c29ccfbd3..5efd40641ad78 100644
--- a/helm/superset/README.md
+++ b/helm/superset/README.md
@@ -105,7 +105,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.nodePort.http | int | `"nil"` |  |
 | service.port | int | `8088` |  |
 | service.type | string | `"ClusterIP"` |  |
 | serviceAccount.annotations | object | `{}` |  |
@@ -145,7 +145,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.nodePort.http | int | `"nil"` |  |
 | supersetCeleryFlower.service.port | int | `5555` |  |
 | supersetCeleryFlower.service.type | string | `"ClusterIP"` |  |
 | supersetCeleryFlower.startupProbe.failureThreshold | int | `60` |  |
@@ -226,7 +226,7 @@ helm install my-superset superset/superset
 | supersetWebsockets.replicaCount | int | `1` |  |
 | supersetWebsockets.resources | object | `{}` |  |
 | supersetWebsockets.service.annotations | object | `{}` |  |
-| supersetWebsockets.service.nodePort.http | string | `nil` |  |
+| 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/values.yaml b/helm/superset/values.yaml
index b683cd9fb1461..941be5b7d2e42 100644
--- a/helm/superset/values.yaml
+++ b/helm/superset/values.yaml
@@ -201,8 +201,8 @@ service:
     # cloud.google.com/load-balancer-type: "Internal"
   loadBalancerIP: null
   nodePort:
-    # @default -- nil (int)
-    http: null
+    # -- (int)
+    http: nil
 
 ingress:
   enabled: false
@@ -462,7 +462,7 @@ supersetCeleryFlower:
     annotations: {}
     port: 5555
     nodePort:
-      # @default -- nil (int)
+      # -- (int)
       http: nil
   startupProbe:
     httpGet:
@@ -562,7 +562,7 @@ supersetWebsockets:
     annotations: {}
     port: 8080
     nodePort:
-      # @default -- nil (int)
+      # -- (int)
       http: nil
   command: []
   resources: {}

From 474e2f0aa81faf251461d0a9d7f12020cf9caebf Mon Sep 17 00:00:00 2001
From: Rajan Gupta <rajan0493@gmail.com>
Date: Wed, 18 Jan 2023 15:03:50 +0800
Subject: [PATCH 07/11] address review comments

---
 helm/superset/templates/service.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/helm/superset/templates/service.yaml b/helm/superset/templates/service.yaml
index ee32b04cf2666..97db594a23958 100644
--- a/helm/superset/templates/service.yaml
+++ b/helm/superset/templates/service.yaml
@@ -35,7 +35,7 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
-      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (nil .Values.service.nodePort.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:
@@ -67,7 +67,7 @@ spec:
       targetPort: flower
       protocol: TCP
       name: flower
-      {{- if and (or (eq .Values.supersetCeleryFlower.service.type "NodePort") (eq .Values.supersetCeleryFlower.service.type "LoadBalancer")) (not (nil .Values.supersetCeleryFlower.service.nodePort.http)) }}
+      {{- 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:
@@ -100,7 +100,7 @@ spec:
       targetPort: ws
       protocol: TCP
       name: ws
-      {{- if and (or (eq .Values.supersetWebsockets.service.type "NodePort") (eq .Values.supersetWebsockets.service.type "LoadBalancer")) (not (nil .Values.supersetWebsockets.service.nodePort.http)) }}
+      {{- 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:

From c42c5a2c43e7f5b29a10133a300cbeb9d304057a Mon Sep 17 00:00:00 2001
From: Rajan Gupta <rajan0493@gmail.com>
Date: Mon, 30 Jan 2023 13:27:02 +0800
Subject: [PATCH 08/11] resolve merge conflicts

---
 helm/superset/Chart.yaml | 2 +-
 helm/superset/README.md  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml
index 2de0f2636b269..235b2e6b53d4a 100644
--- 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.4
+version: 0.8.5
 dependencies:
   - name: postgresql
     version: 12.1.6
diff --git a/helm/superset/README.md b/helm/superset/README.md
index 2f19840b29060..068c67b0aa250 100644
--- a/helm/superset/README.md
+++ b/helm/superset/README.md
@@ -23,7 +23,9 @@ NOTE: This file is generated by helm-docs: https://github.com/norwoodj/helm-docs
 
 # superset
 
-![Version: 0.8.4](https://img.shields.io/badge/Version-0.8.4-informational?style=flat-square)
+
+
+![Version: 0.8.5](https://img.shields.io/badge/Version-0.8.5-informational?style=flat-square) 
 
 Apache Superset is a modern, enterprise-ready business intelligence web application
 

From f2eeebe9361d4100f05f9c1ea723b8a61e5e7e09 Mon Sep 17 00:00:00 2001
From: Rajan Gupta <rajan0493@gmail.com>
Date: Mon, 6 Feb 2023 09:51:30 +0800
Subject: [PATCH 09/11] Bump to 0.8.6

---
 helm/superset/Chart.yaml | 2 +-
 helm/superset/README.md  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml
index 0525fc627eb0c..7a3f2b1f83e83 100644
--- 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
index b6e0f3b3ccfce..50b40fa3c9723 100644
--- a/helm/superset/README.md
+++ b/helm/superset/README.md
@@ -23,7 +23,9 @@ 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
 

From 241d3c9b580f2ac17bd41db325a6cf312d97ed53 Mon Sep 17 00:00:00 2001
From: "DASTC\\gupta_rajan" <rajan.gupta@stengg.com>
Date: Mon, 13 Feb 2023 13:45:51 +0800
Subject: [PATCH 10/11] Remove extra lines from README

Signed-off-by: DASTC\gupta_rajan <rajan.gupta@stengg.com>
---
 helm/superset/README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/helm/superset/README.md b/helm/superset/README.md
index 50b40fa3c9723..61963454bdfd3 100644
--- a/helm/superset/README.md
+++ b/helm/superset/README.md
@@ -23,8 +23,6 @@ NOTE: This file is generated by helm-docs: https://github.com/norwoodj/helm-docs
 
 # superset
 
-
-
 ![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

From afa2e8983b846bda4f310eadfa69f2506e570c96 Mon Sep 17 00:00:00 2001
From: Rajan Gupta <rajan0493@gmail.com>
Date: Mon, 13 Feb 2023 16:01:53 +0800
Subject: [PATCH 11/11] Remove whitespace

---
 helm/superset/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm/superset/README.md b/helm/superset/README.md
index 61963454bdfd3..5d56ead1be13f 100644
--- 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.6](https://img.shields.io/badge/Version-0.8.6-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