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): add nodeselector and tolerations to init job #23416

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.9
version: 0.8.10
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.9](https://img.shields.io/badge/Version-0.8.9-informational?style=flat-square)
![Version: 0.8.10](https://img.shields.io/badge/Version-0.8.10-informational?style=flat-square)

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

Expand Down Expand Up @@ -84,6 +84,7 @@ helm install my-superset superset/superset
| init.adminUser.lastname | string | `"Admin"` | |
| init.adminUser.password | string | `"admin"` | |
| init.adminUser.username | string | `"admin"` | |
| init.affinity | object | `{}` | |
| init.command | list | a `superset_init.sh` command | Command |
| init.containerSecurityContext | object | `{}` | |
| init.createAdmin | bool | `true` | |
Expand All @@ -94,6 +95,8 @@ helm install my-superset superset/superset
| init.podAnnotations | object | `{}` | |
| init.podSecurityContext | object | `{}` | |
| init.resources | object | `{}` | |
| init.tolerations | list | `[]` | |
| init.topologySpreadConstraints | list | `[]` | TopologySpreadConstrains to be added to init job |
| initImage.pullPolicy | string | `"IfNotPresent"` | |
| initImage.repository | string | `"jwilder/dockerize"` | |
| initImage.tag | string | `"latest"` | |
Expand Down
22 changes: 22 additions & 0 deletions helm/superset/templates/init-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,28 @@ spec:
command: {{ tpl (toJson .Values.init.command) . }}
resources:
{{- toYaml .Values.init.resources | nindent 10 }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if or .Values.affinity .Values.init.affinity }}
affinity:
{{- with .Values.affinity }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.init.affinity }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
{{- if or .Values.topologySpreadConstraints .Values.init.topologySpreadConstraints }}
topologySpreadConstraints:
{{- with .Values.topologySpreadConstraints }}
dim-ops marked this conversation as resolved.
Show resolved Hide resolved
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.init.topologySpreadConstraints }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
Expand Down
6 changes: 6 additions & 0 deletions helm/superset/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,12 @@ init:
podAnnotations: {}
podSecurityContext: {}
containerSecurityContext: {}
## Tolerations to be added to init job pods
tolerations: []
## Affinity to be added to init job pods
affinity: {}
# -- TopologySpreadConstrains to be added to init job
topologySpreadConstraints: []

# -- Configuration values for the postgresql dependency.
# ref: https://github.com/kubernetes/charts/blob/master/stable/postgresql/README.md
Expand Down