Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 20 commits into from
Feb 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion helm/superset/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ maintainers:
- name: craig-rueda
email: [email protected]
url: https://github.com/craig-rueda
version: 0.8.5
version: 0.8.6
dependencies:
- name: postgresql
version: 12.1.6
Expand Down
5 changes: 4 additions & 1 deletion helm/superset/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 | `{}` | |
Expand Down Expand Up @@ -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` | |
Expand Down Expand Up @@ -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` | |
Expand Down
9 changes: 9 additions & 0 deletions helm/superset/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
9 changes: 9 additions & 0 deletions helm/superset/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,9 @@ service:
{}
# cloud.google.com/load-balancer-type: "Internal"
loadBalancerIP: null
nodePort:
# -- (int)
http: nil

ingress:
enabled: false
Expand Down Expand Up @@ -466,6 +469,9 @@ supersetCeleryFlower:
type: ClusterIP
annotations: {}
port: 5555
nodePort:
# -- (int)
http: nil
startupProbe:
httpGet:
path: /api/workers
Expand Down Expand Up @@ -567,6 +573,9 @@ supersetWebsockets:
type: ClusterIP
annotations: {}
port: 8080
nodePort:
# -- (int)
http: nil
command: []
resources: {}
deploymentAnnotations: {}
Expand Down