feat(helm): allow removal of Node & Worker replicas for custom HPA so…

…lutions (#28762)
apache · Jun 5, 2024 · d303852 · d303852
1 parent a9cebe8
commit d303852
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/helm/superset/README.md b/helm/superset/README.md
@@ -233,7 +233,8 @@ On helm this can be set on `extraSecretEnv.SUPERSET_SECRET_KEY` or `configOverri
 | supersetNode.readinessProbe.periodSeconds | int | `15` |  |
 | supersetNode.readinessProbe.successThreshold | int | `1` |  |
 | supersetNode.readinessProbe.timeoutSeconds | int | `1` |  |
-| supersetNode.replicaCount | int | `1` |  |
+| supersetNode.replicas.enabled | bool | `true` |  |
+| supersetNode.replicas.replicaCount | int | `1` |  |
 | supersetNode.resources | object | `{}` | Resource settings for the supersetNode pods - these settings overwrite might existing values from the global resources object defined above. |
 | supersetNode.startupProbe.failureThreshold | int | `60` |  |
 | supersetNode.startupProbe.httpGet.path | string | `"/health"` |  |
@@ -319,7 +320,8 @@ On helm this can be set on `extraSecretEnv.SUPERSET_SECRET_KEY` or `configOverri
 | supersetWorker.podLabels | object | `{}` | Labels to be added to supersetWorker pods |
 | supersetWorker.podSecurityContext | object | `{}` |  |
 | 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.replicaCount | int | `1` |  |
+| supersetWorker.replicas.enabled | bool | `true` |  |
+| supersetWorker.replicas.replicaCount | int | `1` |  |
 | supersetWorker.resources | object | `{}` | Resource settings for the supersetWorker pods - these settings overwrite might existing values from the global resources object defined above. |
 | supersetWorker.startupProbe | object | `{}` | No startup/readiness probes by default since we don't really care about its startup time (it doesn't serve traffic) |
 | supersetWorker.strategy | object | `{}` |  |

diff --git a/helm/superset/templates/deployment-worker.yaml b/helm/superset/templates/deployment-worker.yaml
@@ -34,8 +34,8 @@ metadata:
   annotations: {{- toYaml .Values.supersetWorker.deploymentAnnotations | nindent 4 }}
   {{- end }}
 spec:
-  {{- if not .Values.supersetWorker.autoscaling.enabled }}
-  replicas: {{ .Values.supersetWorker.replicaCount }}
+  {{- if not .Values.supersetWorker.autoscaling.enabled and .Values.supersetWorker.replicas.enabled }}
+  replicas: {{ .Values.supersetWorker.replicas.replicaCount }}
   {{- end }}
   selector:
     matchLabels:

diff --git a/helm/superset/templates/deployment.yaml b/helm/superset/templates/deployment.yaml
@@ -34,8 +34,8 @@ metadata:
   annotations: {{- toYaml .Values.supersetNode.deploymentAnnotations | nindent 4 }}
   {{- end }}
 spec:
-  {{- if not .Values.supersetNode.autoscaling.enabled }}
-  replicas: {{ .Values.supersetNode.replicaCount }}
+  {{- if not .Values.supersetNode.autoscaling.enabled and .Values.supersetNode.replicas.enabled }}
+  replicas: {{ .Values.supersetNode.replicas.replicaCount }}
   {{- end }}
   {{- if .Values.supersetNode.strategy }}
   strategy: {{- toYaml .Values.supersetNode.strategy | nindent 4 }}

diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml
@@ -247,7 +247,9 @@ hostAliases: []
 
 # Superset node configuration
 supersetNode:
-  replicaCount: 1
+  replicas:
+    enabled: true
+    replicaCount: 1
   autoscaling:
     enabled: false
     minReplicas: 1
@@ -364,7 +366,9 @@ supersetNode:
 
 # Superset Celery worker configuration
 supersetWorker:
-  replicaCount: 1
+  replicas:
+    enabled: true
+    replicaCount: 1
   autoscaling:
     enabled: false
     minReplicas: 1