From 0fa421271e874e456ae71f7aca4c71130176332d Mon Sep 17 00:00:00 2001
From: Dimitri <36767102+dim-ops@users.noreply.github.com>
Date: Fri, 24 Mar 2023 18:26:08 +0100
Subject: [PATCH] feat(helm): add nodeselector and tolerations to init job
 (#23416)

Co-authored-by: Dimitri GRISARD <dgrisard-externe@bedrockstreaming.com>
---
 helm/superset/Chart.yaml              |  2 +-
 helm/superset/README.md               |  5 ++++-
 helm/superset/templates/init-job.yaml | 22 ++++++++++++++++++++++
 helm/superset/values.yaml             |  6 ++++++
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml
index 40512d0e9..cfcc43dcb 100644
--- a/helm/superset/Chart.yaml
+++ b/helm/superset/Chart.yaml
@@ -29,7 +29,7 @@ maintainers:
   - name: craig-rueda
     email: craig@craigrueda.com
     url: https://github.com/craig-rueda
-version: 0.8.9
+version: 0.8.10
 dependencies:
   - name: postgresql
     version: 12.1.6
diff --git a/helm/superset/README.md b/helm/superset/README.md
index 85f72a86e..9392d1fd2 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
 
-![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
 
@@ -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` |  |
@@ -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"` |  |
diff --git a/helm/superset/templates/init-job.yaml b/helm/superset/templates/init-job.yaml
index 1ffbf1cd3..266c22a63 100644
--- a/helm/superset/templates/init-job.yaml
+++ b/helm/superset/templates/init-job.yaml
@@ -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 }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+        {{- with .Values.init.topologySpreadConstraints }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- end }}
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml
index 5a3103a41..8e611e76e 100644
--- a/helm/superset/values.yaml
+++ b/helm/superset/values.yaml
@@ -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