Skip to content

Commit d21e716

Browse files
added init containers configuration
1 parent 287e86e commit d21e716

File tree

8 files changed

+38
-3
lines changed

8 files changed

+38
-3
lines changed

charts/redash/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v1
22
name: redash
3-
version: 3.1.0-alpha4
3+
version: 3.1.0-alpha5
44
appVersion: 24.04.0-dev-b8671264667.25
55
description: Redash is an open source tool built for teams to query, visualize and collaborate.
66
keywords:

charts/redash/README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This chart bootstraps a [Redash](https://github.com/getredash/redash) deployment
88

99
This is a contributed project developed by volunteers and not officially supported by Redash.
1010

11-
Current chart version is `3.1.0-alpha4`
11+
Current chart version is `3.1.0-alpha5`
1212

1313
* <https://github.com/getredash/redash>
1414

@@ -96,7 +96,9 @@ The following table lists the configurable parameters of the Redash chart and th
9696
| ingress.ingressClassName | string | `""` | Sets the ingress controller class name to use. |
9797
| ingress.pathType | string | `"Prefix"` | How ingress paths should be treated. |
9898
| ingress.tls | list | `[]` | Ingress TLS configuration |
99+
| initContainers | list | `[]` | Redash global init containers |
99100
| migrations.affinity | object | `{}` | Affinity for scheduled worker pod assignment [ref](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity) |
101+
| migrations.initContainers | list | `[]` | migrations init container configuration |
100102
| migrations.nodeSelector | object | `{}` | Node labels for scheduled worker pod assignment [ref](https://kubernetes.io/docs/user-guide/node-selection/) |
101103
| migrations.podAnnotations | object | `{}` | Annotations for scheduled worker pod assignment [ref](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) |
102104
| migrations.podSecurityContext | object | `{}` | Security contexts for scheduled worker pod assignment [ref](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) |
@@ -203,6 +205,7 @@ The following table lists the configurable parameters of the Redash chart and th
203205
| redis.master.service.ports.redis | int | `6379` | |
204206
| scheduler.affinity | object | `{}` | Affinity for scheduler pod assignment [ref](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity) |
205207
| scheduler.env | object | `{}` | Redash scheduler specific environment variables. |
208+
| scheduler.initContainers | list | `[]` | Redash scheduler init containers configuration. |
206209
| scheduler.livenessProbe | object | `{}` | Liveness probe for scheduler to ensure workers are running fine |
207210
| scheduler.nodeSelector | object | `{}` | Node labels for scheduler pod assignment [ref](https://kubernetes.io/docs/user-guide/node-selection/) |
208211
| scheduler.podAnnotations | object | `{}` | Annotations for scheduler pod assignment [ref](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) |
@@ -216,6 +219,7 @@ The following table lists the configurable parameters of the Redash chart and th
216219
| server.affinity | object | `{}` | Affinity for server pod assignment [ref](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity) |
217220
| server.env | object | `{}` | Redash server specific environment variables Don't use this for variables that are in the configuration above, however. |
218221
| server.httpPort | int | `5000` | Server container port (only useful if you are using a customized image) |
222+
| server.initContainers | list | `[]` | Server init containers configuration |
219223
| server.livenessProbe | object | `{"failureThreshold":10,"initialDelaySeconds":90,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":1}` | Server liveness probe configuration |
220224
| server.nodeSelector | object | `{}` | Node labels for server pod assignment [ref](https://kubernetes.io/docs/user-guide/node-selection/) |
221225
| server.podAnnotations | object | `{}` | Annotations for server pod assignment [ref](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) |
@@ -239,6 +243,7 @@ The following table lists the configurable parameters of the Redash chart and th
239243
| volumeMounts | list | `[]` | Redash global volume mounts configuration - applied to all containers |
240244
| volumes | list | `[]` | Redash global volumes configuration - applied to all containers |
241245
| worker.affinity | object | `{}` | Default affinity for worker pod assignment [ref](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity) |
246+
| worker.initContainers | list | `[]` | Worker default init containers configuration |
242247
| worker.livenessProbe | object | `{}` | Default worker's liveness probe to ensure workers are running fine |
243248
| worker.nodeSelector | object | `{}` | Default node labels for worker pod assignment [ref](https://kubernetes.io/docs/user-guide/node-selection/) |
244249
| worker.podAnnotations | object | `{}` | Default annotations for worker pod assignment [ref](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) |

charts/redash/templates/_helpers.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ Shared environment block used across each component.
128128
value: {{ .Values.redis.database | quote }}
129129
{{ end -}}
130130
{{ range $key, $value := .Values.env -}}
131-
- name: {{ $key | quote }}
131+
- name: {{ $key }}
132132
value: {{ $value | quote }}
133133
{{ end -}}
134134
## Start primary Redash configuration

charts/redash/templates/hook-migrations-job.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ spec:
2626
serviceAccountName: {{ include "redash.serviceAccountName" . }}
2727
restartPolicy: Never
2828
securityContext: {{ toYaml .Values.migrations.podSecurityContext | nindent 8 }}
29+
{{- $initContainers := concat .Values.initContainers .Values.migrations.initContainers }}
30+
{{- with $initContainers }}
31+
initContainers: {{ toYaml . | nindent 8 }}
32+
{{- end }}
2933
containers:
3034
- name: {{ include "redash.name" . }}-server
3135
securityContext: {{ toYaml .Values.migrations.securityContext | nindent 10 }}

charts/redash/templates/scheduler-deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ spec:
3030
{{ end -}}
3131
serviceAccountName: {{ include "redash.serviceAccountName" . }}
3232
securityContext: {{ toYaml .Values.scheduler.podSecurityContext | nindent 8 }}
33+
{{- $initContainers := concat .Values.initContainers .Values.scheduler.initContainers }}
34+
{{- with $initContainers }}
35+
initContainers: {{ toYaml . | nindent 8 }}
36+
{{- end }}
3337
containers:
3438
{{- with .Values.scheduler.extraContainers -}}
3539
{{ toYaml . | nindent 8 }}

charts/redash/templates/server-deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ spec:
2828
{{ end -}}
2929
serviceAccountName: {{ include "redash.serviceAccountName" . }}
3030
securityContext: {{ toYaml .Values.server.podSecurityContext | nindent 8 }}
31+
{{- $initContainers := concat .Values.initContainers .Values.server.initContainers }}
32+
{{- with $initContainers }}
33+
initContainers: {{ toYaml . | nindent 8 }}
34+
{{- end }}
3135
containers:
3236
{{- with .Values.server.extraContainers -}}
3337
{{- toYaml . | nindent 8 }}

charts/redash/templates/worker-deployment.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ spec:
2626
{{- end -}}
2727
serviceAccountName: {{ include "redash.serviceAccountName" $context }}
2828
securityContext: {{ toYaml $workerConfig.podSecurityContext | nindent 8 }}
29+
{{- with concat $.Values.initContainers $workerConfig.initContainers }}
30+
initContainers: {{ toYaml . | nindent 8 }}
31+
{{- end }}
2932
containers:
3033
{{- with $workerConfig.extraContainers -}}
3134
{{- toYaml . | nindent 8 }}

charts/redash/values.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ env:
2020
PYTHONUNBUFFERED: 0
2121
REDASH_PRODUCTION: "true"
2222

23+
# initContainers -- Redash global init containers
24+
initContainers: []
25+
2326
# volumes -- Redash global volumes configuration - applied to all containers
2427
volumes: []
2528

@@ -287,6 +290,9 @@ server:
287290
# server.httpPort -- Server container port (only useful if you are using a customized image)
288291
httpPort: 5000
289292

293+
# server.initContainers -- Server init containers configuration
294+
initContainers: []
295+
290296
# server.env -- Redash server specific environment variables
291297
# Don't use this for variables that are in the configuration above, however.
292298
env: {}
@@ -404,6 +410,9 @@ worker:
404410
# worker.replicaCount -- Default number of worker pods to run
405411
replicaCount: 1
406412

413+
# worker.initContainers -- Worker default init containers configuration
414+
initContainers: []
415+
407416
# worker.resources -- Worker default resource requests and limits [ref](http://kubernetes.io/docs/user-guide/compute-resources/)
408417
resources:
409418
# limits:
@@ -453,6 +462,9 @@ scheduler:
453462
# scheduler.env -- Redash scheduler specific environment variables.
454463
env: {}
455464

465+
# scheduler.initContainers -- Redash scheduler init containers configuration.
466+
initContainers: []
467+
456468
# scheduler.resources -- scheduler resource requests and limits [ref](http://kubernetes.io/docs/user-guide/compute-resources/)
457469
resources:
458470
# limits:
@@ -502,6 +514,9 @@ migrations:
502514
# migrations.volumes -- volumes that will be mounted to migrations pods only
503515
volumes: []
504516

517+
# migrations.initContainers -- migrations init container configuration
518+
initContainers: []
519+
505520
# migrations.volumeMounts -- volume mounts for migrations pods
506521
volumeMounts: []
507522

0 commit comments

Comments
 (0)