This is an automated email from the ASF dual-hosted git repository.
villebro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new f2e020e398 fix(helm): Set priorityClassName to pods (superset,
celeryBeat, celeryBeatFlower, celeryBeatWorker, celeryBeatWebsocket, jobs)
(#29091)
f2e020e398 is described below
commit f2e020e39837382a339c5f008abec53f584761df
Author: Sabyrzhan Tynybayev <[email protected]>
AuthorDate: Thu Jun 6 21:55:55 2024 +0300
fix(helm): Set priorityClassName to pods (superset, celeryBeat,
celeryBeatFlower, celeryBeatWorker, celeryBeatWebsocket, jobs) (#29091)
---
helm/superset/Chart.yaml | 2 +-
helm/superset/README.md | 8 +++++++-
helm/superset/templates/deployment-beat.yaml | 3 +++
helm/superset/templates/deployment-flower.yaml | 3 +++
helm/superset/templates/deployment-worker.yaml | 5 ++++-
helm/superset/templates/deployment-ws.yaml | 3 +++
helm/superset/templates/deployment.yaml | 5 ++++-
helm/superset/templates/init-job.yaml | 3 +++
helm/superset/values.yaml | 13 +++++++++++++
9 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml
index 89d052d9f6..4bc1493707 100644
--- a/helm/superset/Chart.yaml
+++ b/helm/superset/Chart.yaml
@@ -29,7 +29,7 @@ maintainers:
- name: craig-rueda
email: [email protected]
url: https://github.com/craig-rueda
-version: 0.12.11
+version: 0.12.12
dependencies:
- name: postgresql
version: 12.1.6
diff --git a/helm/superset/README.md b/helm/superset/README.md
index c29e37ca8b..52f0c286bf 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
-
+
Apache Superset is a modern, enterprise-ready business intelligence web
application
@@ -105,6 +105,7 @@ On helm this can be set on
`extraSecretEnv.SUPERSET_SECRET_KEY` or `configOverri
| init.loadExamples | bool | `false` | |
| init.podAnnotations | object | `{}` | |
| init.podSecurityContext | object | `{}` | |
+| init.priorityClassName | string | `nil` | Set priorityClassName for init job
pods |
| init.resources | object | `{}` | |
| init.tolerations | list | `[]` | |
| init.topologySpreadConstraints | list | `[]` | TopologySpreadConstrains to
be added to init job |
@@ -114,6 +115,7 @@ On helm this can be set on
`extraSecretEnv.SUPERSET_SECRET_KEY` or `configOverri
| nameOverride | string | `nil` | Provide a name to override the name of the
chart |
| nodeSelector | object | `{}` | |
| postgresql | object | see `values.yaml` | Configuration values for the
postgresql dependency. ref:
https://github.com/bitnami/charts/tree/main/bitnami/postgresql |
+| priorityClassName | string | `nil` | Set priorityClassName for superset pods
|
| redis | object | see `values.yaml` | Configuration values for the Redis
dependency. ref: https://github.com/bitnami/charts/blob/master/bitnami/redis
More documentation can be found here:
https://artifacthub.io/packages/helm/bitnami/redis |
| resources | object | `{}` | |
| 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 |
@@ -142,6 +144,7 @@ On helm this can be set on
`extraSecretEnv.SUPERSET_SECRET_KEY` or `configOverri
| supersetCeleryBeat.podDisruptionBudget.minAvailable | int | `1` | If set,
maxUnavailable must not be set - see
https://kubernetes.io/docs/tasks/run-application/configure-pdb/#specifying-a-poddisruptionbudget
|
| supersetCeleryBeat.podLabels | object | `{}` | Labels to be added to
supersetCeleryBeat pods |
| supersetCeleryBeat.podSecurityContext | object | `{}` | |
+| supersetCeleryBeat.priorityClassName | string | `nil` | Set
priorityClassName for CeleryBeat pods |
| supersetCeleryBeat.resources | object | `{}` | Resource settings for the
CeleryBeat pods - these settings overwrite might existing values from the
global resources object defined above. |
| supersetCeleryBeat.topologySpreadConstraints | list | `[]` |
TopologySpreadConstrains to be added to supersetCeleryBeat deployments |
| supersetCeleryFlower.affinity | object | `{}` | Affinity to be added to
supersetCeleryFlower deployment |
@@ -165,6 +168,7 @@ On helm this can be set on
`extraSecretEnv.SUPERSET_SECRET_KEY` or `configOverri
| supersetCeleryFlower.podDisruptionBudget.minAvailable | int | `1` | If set,
maxUnavailable must not be set - see
https://kubernetes.io/docs/tasks/run-application/configure-pdb/#specifying-a-poddisruptionbudget
|
| supersetCeleryFlower.podLabels | object | `{}` | Labels to be added to
supersetCeleryFlower pods |
| supersetCeleryFlower.podSecurityContext | object | `{}` | |
+| supersetCeleryFlower.priorityClassName | string | `nil` | Set
priorityClassName for supersetCeleryFlower pods |
| supersetCeleryFlower.readinessProbe.failureThreshold | int | `3` | |
| supersetCeleryFlower.readinessProbe.httpGet.path | string | `"/api/workers"`
| |
| supersetCeleryFlower.readinessProbe.httpGet.port | string | `"flower"` | |
@@ -271,6 +275,7 @@ On helm this can be set on
`extraSecretEnv.SUPERSET_SECRET_KEY` or `configOverri
| supersetWebsockets.podDisruptionBudget.minAvailable | int | `1` | If set,
maxUnavailable must not be set - see
https://kubernetes.io/docs/tasks/run-application/configure-pdb/#specifying-a-poddisruptionbudget
|
| supersetWebsockets.podLabels | object | `{}` | |
| supersetWebsockets.podSecurityContext | object | `{}` | |
+| supersetWebsockets.priorityClassName | string | `nil` | Set
priorityClassName for supersetWebsockets pods |
| supersetWebsockets.readinessProbe.failureThreshold | int | `3` | |
| supersetWebsockets.readinessProbe.httpGet.path | string | `"/health"` | |
| supersetWebsockets.readinessProbe.httpGet.port | string | `"ws"` | |
@@ -319,6 +324,7 @@ On helm this can be set on
`extraSecretEnv.SUPERSET_SECRET_KEY` or `configOverri
| supersetWorker.podDisruptionBudget.minAvailable | int | `1` | If set,
maxUnavailable must not be set - see
https://kubernetes.io/docs/tasks/run-application/configure-pdb/#specifying-a-poddisruptionbudget
|
| supersetWorker.podLabels | object | `{}` | Labels to be added to
supersetWorker pods |
| supersetWorker.podSecurityContext | object | `{}` | |
+| supersetWorker.priorityClassName | string | `nil` | Set priorityClassName
for supersetWorker pods |
| supersetWorker.readinessProbe | object | `{}` | No startup/readiness probes
by default since we don't really care about its startup time (it doesn't serve
traffic) |
| supersetWorker.replicas.enabled | bool | `true` | |
| supersetWorker.replicas.replicaCount | int | `1` | |
diff --git a/helm/superset/templates/deployment-beat.yaml
b/helm/superset/templates/deployment-beat.yaml
index c6e3d71dae..df2fb1d2e9 100644
--- a/helm/superset/templates/deployment-beat.yaml
+++ b/helm/superset/templates/deployment-beat.yaml
@@ -134,6 +134,9 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
+ {{- if .Values.supersetCeleryBeat.priorityClassName }}
+ priorityClassName: {{ .Values.supersetCeleryBeat.priorityClassName }}
+ {{- end }}
{{- if or .Values.topologySpreadConstraints
.Values.supersetCeleryBeat.topologySpreadConstraints }}
topologySpreadConstraints:
{{- with .Values.topologySpreadConstraints }}
diff --git a/helm/superset/templates/deployment-flower.yaml
b/helm/superset/templates/deployment-flower.yaml
index d00f6af7f5..c03c8a19f6 100644
--- a/helm/superset/templates/deployment-flower.yaml
+++ b/helm/superset/templates/deployment-flower.yaml
@@ -129,6 +129,9 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
+ {{- if .Values.supersetCeleryFlower.priorityClassName }}
+ priorityClassName: {{ .Values.supersetCeleryFlower.priorityClassName }}
+ {{- end }}
{{- if or .Values.topologySpreadConstraints
.Values.supersetCeleryFlower.topologySpreadConstraints }}
topologySpreadConstraints:
{{- with .Values.topologySpreadConstraints }}
diff --git a/helm/superset/templates/deployment-worker.yaml
b/helm/superset/templates/deployment-worker.yaml
index ddd9420ae6..214f9215f7 100644
--- a/helm/superset/templates/deployment-worker.yaml
+++ b/helm/superset/templates/deployment-worker.yaml
@@ -34,7 +34,7 @@ metadata:
annotations: {{- toYaml .Values.supersetWorker.deploymentAnnotations |
nindent 4 }}
{{- end }}
spec:
- {{- if not .Values.supersetWorker.autoscaling.enabled and
.Values.supersetWorker.replicas.enabled }}
+ {{- if and (not .Values.supersetWorker.autoscaling.enabled)
.Values.supersetWorker.replicas.enabled }}
replicas: {{ .Values.supersetWorker.replicas.replicaCount }}
{{- end }}
selector:
@@ -149,6 +149,9 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
+ {{- if .Values.supersetWorker.priorityClassName }}
+ priorityClassName: {{ .Values.supersetWorker.priorityClassName }}
+ {{- end }}
{{- if or .Values.topologySpreadConstraints
.Values.supersetWorker.topologySpreadConstraints }}
topologySpreadConstraints:
{{- with .Values.topologySpreadConstraints }}
diff --git a/helm/superset/templates/deployment-ws.yaml
b/helm/superset/templates/deployment-ws.yaml
index 2556d8e775..f9ac663be9 100644
--- a/helm/superset/templates/deployment-ws.yaml
+++ b/helm/superset/templates/deployment-ws.yaml
@@ -128,6 +128,9 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
+ {{- if .Values.supersetWebsockets.priorityClassName }}
+ priorityClassName: {{ .Values.supersetWebsockets.priorityClassName }}
+ {{- end }}
{{- if or .Values.topologySpreadConstraints
.Values.supersetWebsockets.topologySpreadConstraints }}
topologySpreadConstraints:
{{- with .Values.topologySpreadConstraints }}
diff --git a/helm/superset/templates/deployment.yaml
b/helm/superset/templates/deployment.yaml
index 4bf762b8f5..60eddc4165 100644
--- a/helm/superset/templates/deployment.yaml
+++ b/helm/superset/templates/deployment.yaml
@@ -34,7 +34,7 @@ metadata:
annotations: {{- toYaml .Values.supersetNode.deploymentAnnotations | nindent
4 }}
{{- end }}
spec:
- {{- if not .Values.supersetNode.autoscaling.enabled and
.Values.supersetNode.replicas.enabled }}
+ {{- if and (not .Values.supersetNode.autoscaling.enabled)
.Values.supersetNode.replicas.enabled }}
replicas: {{ .Values.supersetNode.replicas.replicaCount }}
{{- end }}
{{- if .Values.supersetNode.strategy }}
@@ -159,6 +159,9 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
+ {{- if .Values.priorityClassName }}
+ priorityClassName: {{ .Values.priorityClassName }}
+ {{- end }}
{{- if or .Values.topologySpreadConstraints
.Values.supersetNode.topologySpreadConstraints }}
topologySpreadConstraints:
{{- with .Values.topologySpreadConstraints }}
diff --git a/helm/superset/templates/init-job.yaml
b/helm/superset/templates/init-job.yaml
index 43839c0d95..ecc51490ef 100644
--- a/helm/superset/templates/init-job.yaml
+++ b/helm/superset/templates/init-job.yaml
@@ -98,6 +98,9 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
+ {{- if .Values.init.priorityClassName }}
+ priorityClassName: {{ .Values.init.priorityClassName }}
+ {{- end }}
{{- if or .Values.topologySpreadConstraints
.Values.init.topologySpreadConstraints }}
topologySpreadConstraints:
{{- with .Values.topologySpreadConstraints }}
diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml
index 9dd3a93752..09a3e4d25e 100644
--- a/helm/superset/values.yaml
+++ b/helm/superset/values.yaml
@@ -450,6 +450,8 @@ supersetWorker:
startupProbe: {}
# -- No startup/readiness probes by default since we don't really care about
its startup time (it doesn't serve traffic)
readinessProbe: {}
+ # -- Set priorityClassName for supersetWorker pods
+ priorityClassName: ~
# Superset beat configuration (to trigger scheduled jobs like reports)
supersetCeleryBeat:
@@ -506,6 +508,8 @@ supersetCeleryBeat:
# memory: 128Mi
podSecurityContext: {}
containerSecurityContext: {}
+ # -- Set priorityClassName for CeleryBeat pods
+ priorityClassName: ~
supersetCeleryFlower:
# -- Enables a Celery flower deployment (management UI to monitor celery
jobs)
@@ -597,6 +601,8 @@ supersetCeleryFlower:
# memory: 128Mi
podSecurityContext: {}
containerSecurityContext: {}
+ # -- Set priorityClassName for supersetCeleryFlower pods
+ priorityClassName: ~
supersetWebsockets:
# -- This is only required if you intend to use `GLOBAL_ASYNC_QUERIES` in
`ws` mode
@@ -690,6 +696,8 @@ supersetWebsockets:
failureThreshold: 3
periodSeconds: 5
successThreshold: 1
+ # -- Set priorityClassName for supersetWebsockets pods
+ priorityClassName: ~
init:
# Configure resources
@@ -774,6 +782,8 @@ init:
affinity: {}
# -- TopologySpreadConstrains to be added to init job
topologySpreadConstraints: []
+ # -- Set priorityClassName for init job pods
+ priorityClassName: ~
# -- Configuration values for the postgresql dependency.
# ref: https://github.com/bitnami/charts/tree/main/bitnami/postgresql
@@ -878,3 +888,6 @@ affinity: {}
# -- TopologySpreadConstrains to be added to all deployments
topologySpreadConstraints: []
+
+# -- Set priorityClassName for superset pods
+priorityClassName: ~