Skip to content

Commit 05887a6

Browse files
author
Lily Kuang
committed
Merge remote-tracking branch 'origin/master' into lily/add-react-diff-viewer-continued
2 parents 14d2328 + b132451 commit 05887a6

File tree

8 files changed

+113
-15
lines changed

8 files changed

+113
-15
lines changed

‎helm/superset/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ maintainers:
2929
- name: craig-rueda
3030
email: [email protected]
3131
url: https://github.com/craig-rueda
32-
version: 0.8.3
32+
version: 0.8.4
3333
dependencies:
3434
- name: postgresql
3535
version: 12.1.6

‎helm/superset/README.md‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ NOTE: This file is generated by helm-docs: https://github.com/norwoodj/helm-docs
2323

2424
# superset
2525

26-
![Version: 0.8.3](https://img.shields.io/badge/Version-0.8.3-informational?style=flat-square)
26+
![Version: 0.8.4](https://img.shields.io/badge/Version-0.8.4-informational?style=flat-square)
2727

2828
Apache Superset is a modern, enterprise-ready business intelligence web application
2929

@@ -107,6 +107,7 @@ helm install my-superset superset/superset
107107
| service.type | string | `"ClusterIP"` | |
108108
| serviceAccount.annotations | object | `{}` | |
109109
| serviceAccount.create | bool | `false` | Create custom service account for Superset. If create: true and name is not provided, `superset.fullname` will be used. |
110+
| supersetCeleryBeat.affinity | object | `{}` | Affinity to be added to supersetCeleryBeat deployment |
110111
| supersetCeleryBeat.command | list | a `celery beat` command | Command |
111112
| supersetCeleryBeat.containerSecurityContext | object | `{}` | |
112113
| supersetCeleryBeat.deploymentAnnotations | object | `{}` | Annotations to be added to supersetCeleryBeat deployment |
@@ -117,9 +118,11 @@ helm install my-superset superset/superset
117118
| supersetCeleryBeat.podLabels | object | `{}` | Labels to be added to supersetCeleryBeat pods |
118119
| supersetCeleryBeat.podSecurityContext | object | `{}` | |
119120
| supersetCeleryBeat.resources | object | `{}` | Resource settings for the CeleryBeat pods - these settings overwrite might existing values from the global resources object defined above. |
121+
| supersetCeleryBeat.topologySpreadConstraints | list | `[]` | TopologySpreadConstrains to be added to supersetCeleryBeat deployments |
122+
| supersetCeleryFlower.affinity | object | `{}` | Affinity to be added to supersetCeleryFlower deployment |
120123
| supersetCeleryFlower.command | list | a `celery flower` command | Command |
121124
| supersetCeleryFlower.containerSecurityContext | object | `{}` | |
122-
| supersetCeleryFlower.deploymentAnnotations | object | `{}` | Annotations to be added to supersetCeleryBeat deployment |
125+
| supersetCeleryFlower.deploymentAnnotations | object | `{}` | Annotations to be added to supersetCeleryFlower deployment |
123126
| supersetCeleryFlower.enabled | bool | `false` | Enables a Celery flower deployment (management UI to monitor celery jobs) WARNING: on superset 1.x, this requires a Superset image that has `flower<1.0.0` installed (which is NOT the case of the default images) flower>=1.0.0 requires Celery 5+ which Superset 1.5 does not support |
124127
| supersetCeleryFlower.initContainers | list | a container waiting for postgres and redis | List of init containers |
125128
| supersetCeleryFlower.livenessProbe.failureThreshold | int | `3` | |
@@ -129,8 +132,8 @@ helm install my-superset superset/superset
129132
| supersetCeleryFlower.livenessProbe.periodSeconds | int | `5` | |
130133
| supersetCeleryFlower.livenessProbe.successThreshold | int | `1` | |
131134
| supersetCeleryFlower.livenessProbe.timeoutSeconds | int | `1` | |
132-
| supersetCeleryFlower.podAnnotations | object | `{}` | Annotations to be added to supersetCeleryBeat pods |
133-
| supersetCeleryFlower.podLabels | object | `{}` | Labels to be added to supersetCeleryBeat pods |
135+
| supersetCeleryFlower.podAnnotations | object | `{}` | Annotations to be added to supersetCeleryFlower pods |
136+
| supersetCeleryFlower.podLabels | object | `{}` | Labels to be added to supersetCeleryFlower pods |
134137
| supersetCeleryFlower.podSecurityContext | object | `{}` | |
135138
| supersetCeleryFlower.readinessProbe.failureThreshold | int | `3` | |
136139
| supersetCeleryFlower.readinessProbe.httpGet.path | string | `"/api/workers"` | |
@@ -151,6 +154,8 @@ helm install my-superset superset/superset
151154
| supersetCeleryFlower.startupProbe.periodSeconds | int | `5` | |
152155
| supersetCeleryFlower.startupProbe.successThreshold | int | `1` | |
153156
| supersetCeleryFlower.startupProbe.timeoutSeconds | int | `1` | |
157+
| supersetCeleryFlower.topologySpreadConstraints | list | `[]` | TopologySpreadConstrains to be added to supersetCeleryFlower deployments |
158+
| supersetNode.affinity | object | `{}` | Affinity to be added to supersetNode deployment |
154159
| supersetNode.command | list | See `values.yaml` | Startup command |
155160
| supersetNode.connections.db_host | string | `"{{ template \"superset.fullname\" . }}-postgresql"` | |
156161
| supersetNode.connections.db_name | string | `"superset"` | |
@@ -192,6 +197,8 @@ helm install my-superset superset/superset
192197
| supersetNode.startupProbe.successThreshold | int | `1` | |
193198
| supersetNode.startupProbe.timeoutSeconds | int | `1` | |
194199
| supersetNode.strategy | object | `{}` | |
200+
| supersetNode.topologySpreadConstraints | list | `[]` | TopologySpreadConstrains to be added to supersetNode deployments |
201+
| supersetWebsockets.affinity | object | `{}` | Affinity to be added to supersetWebsockets deployment |
195202
| supersetWebsockets.command | list | `[]` | |
196203
| supersetWebsockets.config | object | see `values.yaml` | The config.json to pass to the server, see https://github.com/apache/superset/tree/master/superset-websocket Note that the configuration can also read from environment variables (which will have priority), see https://github.com/apache/superset/blob/master/superset-websocket/src/config.ts for a list of supported variables |
197204
| supersetWebsockets.containerSecurityContext | object | `{}` | |
@@ -232,6 +239,7 @@ helm install my-superset superset/superset
232239
| supersetWebsockets.startupProbe.successThreshold | int | `1` | |
233240
| supersetWebsockets.startupProbe.timeoutSeconds | int | `1` | |
234241
| supersetWebsockets.strategy | object | `{}` | |
242+
| supersetWebsockets.topologySpreadConstraints | list | `[]` | TopologySpreadConstrains to be added to supersetWebsockets deployments |
235243
| supersetWorker.command | list | a `celery worker` command | Worker startup command |
236244
| supersetWorker.containerSecurityContext | object | `{}` | |
237245
| supersetWorker.deploymentAnnotations | object | `{}` | Annotations to be added to supersetWorker deployment |
@@ -253,3 +261,4 @@ helm install my-superset superset/superset
253261
| supersetWorker.startupProbe | object | `{}` | No startup/readiness probes by default since we don't really care about its startup time (it doesn't serve traffic) |
254262
| supersetWorker.strategy | object | `{}` | |
255263
| tolerations | list | `[]` | |
264+
| topologySpreadConstraints | list | `[]` | TopologySpreadConstrains to be added to all deployments |

‎helm/superset/templates/deployment-beat.yaml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,23 @@ spec:
122122
nodeSelector:
123123
{{- toYaml . | nindent 8 }}
124124
{{- end }}
125-
{{- with .Values.affinity }}
125+
{{- if or .Values.affinity .Values.supersetCeleryBeat.affinity }}
126126
affinity:
127-
{{- toYaml . | nindent 8 }}
127+
{{- with .Values.affinity }}
128+
{{- toYaml . | nindent 8 }}
129+
{{- end }}
130+
{{- with .Values.supersetCeleryBeat.affinity }}
131+
{{- toYaml . | nindent 8 }}
132+
{{- end }}
133+
{{- end }}
134+
{{- if or .Values.topologySpreadConstraints .Values.supersetCeleryBeat.topologySpreadConstraints }}
135+
topologySpreadConstraints:
136+
{{- with .Values.topologySpreadConstraints }}
137+
{{- toYaml . | nindent 8 }}
138+
{{- end }}
139+
{{- with .Values.supersetCeleryBeat.topologySpreadConstraints }}
140+
{{- toYaml . | nindent 8 }}
141+
{{- end }}
128142
{{- end }}
129143
{{- with .Values.tolerations }}
130144
tolerations:

‎helm/superset/templates/deployment-flower.yaml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,23 @@ spec:
121121
nodeSelector:
122122
{{- toYaml . | nindent 8 }}
123123
{{- end }}
124-
{{- with .Values.affinity }}
124+
{{- if or .Values.affinity .Values.supersetCeleryFlower.affinity }}
125125
affinity:
126-
{{- toYaml . | nindent 8 }}
126+
{{- with .Values.affinity }}
127+
{{- toYaml . | nindent 8 }}
128+
{{- end }}
129+
{{- with .Values.supersetCeleryFlower.affinity }}
130+
{{- toYaml . | nindent 8 }}
131+
{{- end }}
132+
{{- end }}
133+
{{- if or .Values.topologySpreadConstraints .Values.supersetCeleryFlower.topologySpreadConstraints }}
134+
topologySpreadConstraints:
135+
{{- with .Values.topologySpreadConstraints }}
136+
{{- toYaml . | nindent 8 }}
137+
{{- end }}
138+
{{- with .Values.supersetCeleryFlower.topologySpreadConstraints }}
139+
{{- toYaml . | nindent 8 }}
140+
{{- end }}
127141
{{- end }}
128142
{{- with .Values.tolerations }}
129143
tolerations:

‎helm/superset/templates/deployment-worker.yaml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,23 @@ spec:
139139
nodeSelector:
140140
{{- toYaml . | nindent 8 }}
141141
{{- end }}
142-
{{- with .Values.affinity }}
142+
{{- if or .Values.affinity .Values.supersetWorker.affinity }}
143143
affinity:
144+
{{- with .Values.affinity }}
144145
{{- toYaml . | nindent 8 }}
146+
{{- end }}
147+
{{- with .Values.supersetWorker.affinity }}
148+
{{- toYaml . | nindent 8 }}
149+
{{- end }}
150+
{{- end }}
151+
{{- if or .Values.topologySpreadConstraints .Values.supersetWorker.topologySpreadConstraints }}
152+
topologySpreadConstraints:
153+
{{- with .Values.topologySpreadConstraints }}
154+
{{- toYaml . | nindent 8 }}
155+
{{- end }}
156+
{{- with .Values.supersetWorker.topologySpreadConstraints }}
157+
{{- toYaml . | nindent 8 }}
158+
{{- end }}
145159
{{- end }}
146160
{{- with .Values.tolerations }}
147161
tolerations:

‎helm/superset/templates/deployment-ws.yaml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,23 @@ spec:
120120
nodeSelector:
121121
{{- toYaml . | nindent 8 }}
122122
{{- end }}
123-
{{- with .Values.affinity }}
123+
{{- if or .Values.affinity .Values.supersetWebsockets.affinity }}
124124
affinity:
125+
{{- with .Values.affinity }}
125126
{{- toYaml . | nindent 8 }}
127+
{{- end }}
128+
{{- with .Values.supersetWebsockets.affinity }}
129+
{{- toYaml . | nindent 8 }}
130+
{{- end }}
131+
{{- end }}
132+
{{- if or .Values.topologySpreadConstraints .Values.supersetWebsockets.topologySpreadConstraints }}
133+
topologySpreadConstraints:
134+
{{- with .Values.topologySpreadConstraints }}
135+
{{- toYaml . | nindent 8 }}
136+
{{- end }}
137+
{{- with .Values.supersetWebsockets.topologySpreadConstraints }}
138+
{{- toYaml . | nindent 8 }}
139+
{{- end }}
126140
{{- end }}
127141
{{- with .Values.tolerations }}
128142
tolerations:

‎helm/superset/templates/deployment.yaml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,23 @@ spec:
150150
nodeSelector:
151151
{{- toYaml . | nindent 8 }}
152152
{{- end }}
153-
{{- with .Values.affinity }}
153+
{{- if or .Values.affinity .Values.supersetNode.affinity }}
154154
affinity:
155+
{{- with .Values.affinity }}
155156
{{- toYaml . | nindent 8 }}
157+
{{- end }}
158+
{{- with .Values.supersetNode.affinity }}
159+
{{- toYaml . | nindent 8 }}
160+
{{- end }}
161+
{{- end }}
162+
{{- if or .Values.topologySpreadConstraints .Values.supersetNode.topologySpreadConstraints }}
163+
topologySpreadConstraints:
164+
{{- with .Values.topologySpreadConstraints }}
165+
{{- toYaml . | nindent 8 }}
166+
{{- end }}
167+
{{- with .Values.supersetNode.topologySpreadConstraints }}
168+
{{- toYaml . | nindent 8 }}
169+
{{- end }}
156170
{{- end }}
157171
{{- with .Values.tolerations }}
158172
tolerations:

‎helm/superset/values.yaml‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,10 @@ supersetNode:
283283
deploymentAnnotations: {}
284284
# -- Labels to be added to supersetNode deployment
285285
deploymentLabels: {}
286+
# -- Affinity to be added to supersetNode deployment
287+
affinity: {}
288+
# -- TopologySpreadConstrains to be added to supersetNode deployments
289+
topologySpreadConstraints: []
286290
# -- Annotations to be added to supersetNode pods
287291
podAnnotations: {}
288292
# -- Labels to be added to supersetNode pods
@@ -426,6 +430,10 @@ supersetCeleryBeat:
426430
- dockerize -wait "tcp://$DB_HOST:$DB_PORT" -wait "tcp://$REDIS_HOST:$REDIS_PORT" -timeout 120s
427431
# -- Annotations to be added to supersetCeleryBeat deployment
428432
deploymentAnnotations: {}
433+
# -- Affinity to be added to supersetCeleryBeat deployment
434+
affinity: {}
435+
# -- TopologySpreadConstrains to be added to supersetCeleryBeat deployments
436+
topologySpreadConstraints: []
429437
# -- Annotations to be added to supersetCeleryBeat pods
430438
podAnnotations: {}
431439
# -- Labels to be added to supersetCeleryBeat pods
@@ -498,11 +506,15 @@ supersetCeleryFlower:
498506
- /bin/sh
499507
- -c
500508
- dockerize -wait "tcp://$DB_HOST:$DB_PORT" -wait "tcp://$REDIS_HOST:$REDIS_PORT" -timeout 120s
501-
# -- Annotations to be added to supersetCeleryBeat deployment
509+
# -- Annotations to be added to supersetCeleryFlower deployment
502510
deploymentAnnotations: {}
503-
# -- Annotations to be added to supersetCeleryBeat pods
511+
# -- Affinity to be added to supersetCeleryFlower deployment
512+
affinity: {}
513+
# -- TopologySpreadConstrains to be added to supersetCeleryFlower deployments
514+
topologySpreadConstraints: []
515+
# -- Annotations to be added to supersetCeleryFlower pods
504516
podAnnotations: {}
505-
# -- Labels to be added to supersetCeleryBeat pods
517+
# -- Labels to be added to supersetCeleryFlower pods
506518
podLabels: {}
507519
# -- Resource settings for the CeleryBeat pods - these settings overwrite might existing values from the global resources object defined above.
508520
resources:
@@ -558,6 +570,10 @@ supersetWebsockets:
558570
command: []
559571
resources: {}
560572
deploymentAnnotations: {}
573+
# -- Affinity to be added to supersetWebsockets deployment
574+
affinity: {}
575+
# -- TopologySpreadConstrains to be added to supersetWebsockets deployments
576+
topologySpreadConstraints: []
561577
podAnnotations: {}
562578
podLabels: {}
563579
strategy: {}
@@ -765,3 +781,6 @@ nodeSelector: {}
765781
tolerations: []
766782

767783
affinity: {}
784+
785+
# -- TopologySpreadConstrains to be added to all deployments
786+
topologySpreadConstraints: []

0 commit comments

Comments
 (0)