From 73e88e7d7dcb1b6275a38e951c6e3d5ff02eb38a Mon Sep 17 00:00:00 2001
From: Filipe Santos <fsantos@gitlab.com>
Date: Mon, 9 Jan 2023 17:30:54 +1300
Subject: [PATCH] Add support for topologySpreadConstraints

Changelog: added
---
 charts/gitlab/charts/geo-logcursor/templates/deployment.yaml  | 4 ++++
 charts/gitlab/charts/geo-logcursor/values.yaml                | 2 ++
 charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml  | 4 ++++
 charts/gitlab/charts/gitaly/values.yaml                       | 2 ++
 .../gitlab/charts/gitlab-exporter/templates/deployment.yaml   | 4 ++++
 charts/gitlab/charts/gitlab-exporter/values.yaml              | 2 ++
 charts/gitlab/charts/gitlab-pages/templates/deployment.yaml   | 4 ++++
 charts/gitlab/charts/gitlab-pages/values.yaml                 | 2 ++
 charts/gitlab/charts/gitlab-shell/templates/deployment.yaml   | 4 ++++
 charts/gitlab/charts/gitlab-shell/values.yaml                 | 2 ++
 charts/gitlab/charts/kas/templates/deployment.yaml            | 4 ++++
 charts/gitlab/charts/kas/values.yaml                          | 2 ++
 charts/gitlab/charts/mailroom/templates/deployment.yaml       | 4 ++++
 charts/gitlab/charts/mailroom/values.yaml                     | 2 ++
 charts/gitlab/charts/praefect/templates/statefulset.yaml      | 4 ++++
 charts/gitlab/charts/praefect/values.yaml                     | 2 ++
 charts/gitlab/charts/sidekiq/templates/deployment.yaml        | 4 ++++
 charts/gitlab/charts/sidekiq/values.yaml                      | 2 ++
 charts/gitlab/charts/spamcheck/templates/deployment.yaml      | 4 ++++
 charts/gitlab/charts/spamcheck/values.yaml                    | 2 ++
 charts/gitlab/charts/toolbox/templates/deployment.yaml        | 4 ++++
 charts/gitlab/charts/toolbox/values.yaml                      | 2 ++
 charts/gitlab/charts/webservice/templates/deployment.yaml     | 4 ++++
 charts/gitlab/charts/webservice/values.yaml                   | 2 ++
 24 files changed, 72 insertions(+)

diff --git a/charts/gitlab/charts/geo-logcursor/templates/deployment.yaml b/charts/gitlab/charts/geo-logcursor/templates/deployment.yaml
index 58c45960ac..9e28115710 100644
--- a/charts/gitlab/charts/geo-logcursor/templates/deployment.yaml
+++ b/charts/gitlab/charts/geo-logcursor/templates/deployment.yaml
@@ -59,6 +59,10 @@ spec:
                 matchLabels:
                   {{- include "gitlab.selectorLabels" . | nindent 18 }}
       {{- end }}
+      {{- if .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml .Values.topologySpreadConstraints | nindent 8 }}
+      {{- end }}
       {{- if or .Values.serviceAccount.enabled .Values.global.serviceAccount.enabled }}
       serviceAccountName: {{ include "gitlab.serviceAccount.name" . }}
       {{- end }}
diff --git a/charts/gitlab/charts/geo-logcursor/values.yaml b/charts/gitlab/charts/geo-logcursor/values.yaml
index 0a84adcd78..c19d89ad85 100644
--- a/charts/gitlab/charts/geo-logcursor/values.yaml
+++ b/charts/gitlab/charts/geo-logcursor/values.yaml
@@ -90,6 +90,8 @@ affinity:
   podAntiAffinity:
     topologyKey:
 
+topologySpreadConstraints: []
+
 podLabels: {}
 common:
   labels: {}
diff --git a/charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml b/charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml
index 87ef513ae7..14bc75f57d 100644
--- a/charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml
+++ b/charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml
@@ -115,6 +115,10 @@ spec:
                   storage: {{ .storage.name }}
                   {{- end }}
       {{- end }}
+      {{- if .Values.topologySpreadConstraints }}
+      topologySpreadConstraints: 
+        {{- toYaml .Values.topologySpreadConstraints | nindent 8 }}
+      {{- end }}
       {{- if or .Values.serviceAccount.enabled .Values.global.serviceAccount.enabled }}
       serviceAccountName: {{ include "gitlab.serviceAccount.name" . }}
       {{- end }}
diff --git a/charts/gitlab/charts/gitaly/values.yaml b/charts/gitlab/charts/gitaly/values.yaml
index c60bd62efa..c3b7415505 100644
--- a/charts/gitlab/charts/gitaly/values.yaml
+++ b/charts/gitlab/charts/gitaly/values.yaml
@@ -170,6 +170,8 @@ affinity:
   podAntiAffinity:
     topologyKey:
 
+topologySpreadConstraints: []
+
 ## Enable the Gitaly pack-objects cache
 ## ref: https://docs.gitlab.com/ee/administration/gitaly/configure_gitaly.html#pack-objects-cache
 packObjectsCache: {}
diff --git a/charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml b/charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml
index 144ed4c8ba..5d5e72c371 100644
--- a/charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml
+++ b/charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml
@@ -67,6 +67,10 @@ spec:
                 matchLabels:
                   {{- include "gitlab.selectorLabels" . | nindent 18 }}
       {{- end }}
+      {{- if .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml .Values.topologySpreadConstraints | nindent 8 }}
+      {{- end }}
       {{- if or .Values.serviceAccount.enabled .Values.global.serviceAccount.enabled }}
       serviceAccountName: {{ include "gitlab.serviceAccount.name" . }}
       {{- end }}
diff --git a/charts/gitlab/charts/gitlab-exporter/values.yaml b/charts/gitlab/charts/gitlab-exporter/values.yaml
index d81e44d84b..e0a43d2a81 100644
--- a/charts/gitlab/charts/gitlab-exporter/values.yaml
+++ b/charts/gitlab/charts/gitlab-exporter/values.yaml
@@ -94,3 +94,5 @@ deployment:
 affinity:
   podAntiAffinity:
     topologyKey:
+
+topologySpreadConstraints: []
diff --git a/charts/gitlab/charts/gitlab-pages/templates/deployment.yaml b/charts/gitlab/charts/gitlab-pages/templates/deployment.yaml
index 600d14166c..ee79107573 100644
--- a/charts/gitlab/charts/gitlab-pages/templates/deployment.yaml
+++ b/charts/gitlab/charts/gitlab-pages/templates/deployment.yaml
@@ -74,6 +74,10 @@ spec:
                 matchLabels:
                   {{- include "gitlab.selectorLabels" . | nindent 18 }}
       {{- end }}
+      {{- if .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml .Values.topologySpreadConstraints | nindent 8 }}
+      {{- end }}
       {{- if or .Values.serviceAccount.enabled $.Values.global.serviceAccount.enabled }}
       serviceAccountName: {{ include "gitlab.serviceAccount.name" . }}
       {{- end }}
diff --git a/charts/gitlab/charts/gitlab-pages/values.yaml b/charts/gitlab/charts/gitlab-pages/values.yaml
index 538132f8d0..0d2aa7b93c 100644
--- a/charts/gitlab/charts/gitlab-pages/values.yaml
+++ b/charts/gitlab/charts/gitlab-pages/values.yaml
@@ -203,3 +203,5 @@ workhorse: {}
 affinity:
   podAntiAffinity:
     topologyKey:
+
+topologySpreadConstraints: []
diff --git a/charts/gitlab/charts/gitlab-shell/templates/deployment.yaml b/charts/gitlab/charts/gitlab-shell/templates/deployment.yaml
index 588511b191..786264e9a1 100644
--- a/charts/gitlab/charts/gitlab-shell/templates/deployment.yaml
+++ b/charts/gitlab/charts/gitlab-shell/templates/deployment.yaml
@@ -95,6 +95,10 @@ spec:
                 matchLabels:
                   {{- include "gitlab.selectorLabels" . | nindent 18 }}
       {{- end }}
+      {{- if .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml .Values.topologySpreadConstraints | nindent 8 }}
+      {{- end }}
       {{- if or .Values.serviceAccount.enabled .Values.global.serviceAccount.enabled }}
       serviceAccountName: {{ include "gitlab.serviceAccount.name" . }}
       {{- end }}
diff --git a/charts/gitlab/charts/gitlab-shell/values.yaml b/charts/gitlab/charts/gitlab-shell/values.yaml
index f7cb9ce346..638a5e8c8c 100644
--- a/charts/gitlab/charts/gitlab-shell/values.yaml
+++ b/charts/gitlab/charts/gitlab-shell/values.yaml
@@ -153,3 +153,5 @@ sshDaemon: openssh
 affinity:
   podAntiAffinity:
     topologyKey:
+
+topologySpreadConstraints: []
diff --git a/charts/gitlab/charts/kas/templates/deployment.yaml b/charts/gitlab/charts/kas/templates/deployment.yaml
index f7a3932fe6..aa6583ba69 100644
--- a/charts/gitlab/charts/kas/templates/deployment.yaml
+++ b/charts/gitlab/charts/kas/templates/deployment.yaml
@@ -69,6 +69,10 @@ spec:
                 matchLabels:
                   {{- include "gitlab.selectorLabels" . | nindent 18 }}
       {{- end }}
+      {{- if .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml .Values.topologySpreadConstraints | nindent 8 }}
+      {{- end }}
       securityContext:
         runAsUser: {{ .Values.securityContext.runAsUser }}
         runAsGroup: {{ .Values.securityContext.runAsGroup }}
diff --git a/charts/gitlab/charts/kas/values.yaml b/charts/gitlab/charts/kas/values.yaml
index 3f59c62b71..2ece84190f 100644
--- a/charts/gitlab/charts/kas/values.yaml
+++ b/charts/gitlab/charts/kas/values.yaml
@@ -132,5 +132,7 @@ affinity:
   podAntiAffinity:
     topologyKey:
 
+topologySpreadConstraints: []
+
 # Priority class assigned to pods
 priorityClassName: ""
diff --git a/charts/gitlab/charts/mailroom/templates/deployment.yaml b/charts/gitlab/charts/mailroom/templates/deployment.yaml
index 1e952a3c7f..1147212760 100644
--- a/charts/gitlab/charts/mailroom/templates/deployment.yaml
+++ b/charts/gitlab/charts/mailroom/templates/deployment.yaml
@@ -55,6 +55,10 @@ spec:
                 matchLabels:
                   {{- include "gitlab.selectorLabels" . | nindent 18 }}
       {{- end }}
+      {{- if .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml .Values.topologySpreadConstraints | nindent 8 }}
+      {{- end }}
       {{- if or .Values.serviceAccount.enabled .Values.global.serviceAccount.enabled }}
       serviceAccountName: {{ include "gitlab.serviceAccount.name" . }}
       {{- end }}
diff --git a/charts/gitlab/charts/mailroom/values.yaml b/charts/gitlab/charts/mailroom/values.yaml
index cb5805acc7..d0d11f94ac 100644
--- a/charts/gitlab/charts/mailroom/values.yaml
+++ b/charts/gitlab/charts/mailroom/values.yaml
@@ -173,5 +173,7 @@ affinity:
   podAntiAffinity:
     topologyKey:
 
+topologySpreadConstraints: []
+
 # Priority class assigned to pods
 priorityClassName: ""
diff --git a/charts/gitlab/charts/praefect/templates/statefulset.yaml b/charts/gitlab/charts/praefect/templates/statefulset.yaml
index f9f87ac422..55b2cf7d02 100644
--- a/charts/gitlab/charts/praefect/templates/statefulset.yaml
+++ b/charts/gitlab/charts/praefect/templates/statefulset.yaml
@@ -57,6 +57,10 @@ spec:
                 matchLabels:
                   {{- include "gitlab.selectorLabels" . | nindent 18 }}
       {{- end }}
+      {{- if .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml .Values.topologySpreadConstraints | nindent 8 }}
+      {{- end }}
       {{- include "gitlab.nodeSelector" . | nindent 6 }}
       {{- if .Values.tolerations }}
       tolerations:
diff --git a/charts/gitlab/charts/praefect/values.yaml b/charts/gitlab/charts/praefect/values.yaml
index 9c13611244..2921e7f766 100644
--- a/charts/gitlab/charts/praefect/values.yaml
+++ b/charts/gitlab/charts/praefect/values.yaml
@@ -75,3 +75,5 @@ statefulset:
 affinity:
   podAntiAffinity:
     topologyKey:
+
+topologySpreadConstraints: []
diff --git a/charts/gitlab/charts/sidekiq/templates/deployment.yaml b/charts/gitlab/charts/sidekiq/templates/deployment.yaml
index fa185d3790..345bc9a364 100644
--- a/charts/gitlab/charts/sidekiq/templates/deployment.yaml
+++ b/charts/gitlab/charts/sidekiq/templates/deployment.yaml
@@ -105,6 +105,10 @@ spec:
                 matchLabels:
                   {{- include "gitlab.selectorLabels" $ | nindent 18 }}
       {{- end }}
+      {{- if $.Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml $.Values.topologySpreadConstraints | nindent 8 }}
+      {{- end }}
       {{- if or $.Values.serviceAccount.enabled $.Values.global.serviceAccount.enabled }}
       serviceAccountName: {{ include "gitlab.serviceAccount.name" $ }}
       {{- end }}
diff --git a/charts/gitlab/charts/sidekiq/values.yaml b/charts/gitlab/charts/sidekiq/values.yaml
index 76e6060a39..a1c60aa462 100644
--- a/charts/gitlab/charts/sidekiq/values.yaml
+++ b/charts/gitlab/charts/sidekiq/values.yaml
@@ -341,3 +341,5 @@ priorityClassName: ""
 affinity:
   podAntiAffinity:
     topologyKey:
+
+topologySpreadConstraints: []
diff --git a/charts/gitlab/charts/spamcheck/templates/deployment.yaml b/charts/gitlab/charts/spamcheck/templates/deployment.yaml
index a3022f99a0..baab9e1fdb 100644
--- a/charts/gitlab/charts/spamcheck/templates/deployment.yaml
+++ b/charts/gitlab/charts/spamcheck/templates/deployment.yaml
@@ -62,6 +62,10 @@ spec:
                 matchLabels:
                   {{- include "gitlab.selectorLabels" . | nindent 18 }}
       {{- end }}
+      {{- if .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml .Values.topologySpreadConstraints | nindent 8 }}
+      {{- end }}
       {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6 }}
       {{- include "gitlab.priorityClassName" . | nindent 6 }}
       initContainers:
diff --git a/charts/gitlab/charts/spamcheck/values.yaml b/charts/gitlab/charts/spamcheck/values.yaml
index 94076eaa65..3e57e51c44 100644
--- a/charts/gitlab/charts/spamcheck/values.yaml
+++ b/charts/gitlab/charts/spamcheck/values.yaml
@@ -100,4 +100,6 @@ affinity:
   podAntiAffinity:
     topologyKey:
 
+topologySpreadConstraints: []
+
 storageUrl: https://storage.googleapis.com/glsec-spamcheck-ml-artifacts/spam-classifier/0.4.2/model/issues/tflite/model.tflite
diff --git a/charts/gitlab/charts/toolbox/templates/deployment.yaml b/charts/gitlab/charts/toolbox/templates/deployment.yaml
index b247cc4062..b5b5f11c15 100644
--- a/charts/gitlab/charts/toolbox/templates/deployment.yaml
+++ b/charts/gitlab/charts/toolbox/templates/deployment.yaml
@@ -94,6 +94,10 @@ spec:
                   release: {{ .Release.Name }}
       {{- end }}
       {{- end }}
+      {{- if .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml .Values.topologySpreadConstraints | nindent 8 }}
+      {{- end }}
       containers:
         {{- include "gitlab.extraContainers" . | nindent 8 }}
         - name: {{ .Chart.Name }}
diff --git a/charts/gitlab/charts/toolbox/values.yaml b/charts/gitlab/charts/toolbox/values.yaml
index 4b245ec4e3..0e2eb70dd5 100644
--- a/charts/gitlab/charts/toolbox/values.yaml
+++ b/charts/gitlab/charts/toolbox/values.yaml
@@ -25,6 +25,8 @@ affinity:
   podAntiAffinity:
     topologyKey:
 
+topologySpreadConstraints: []
+
 common:
   labels: {}
 
diff --git a/charts/gitlab/charts/webservice/templates/deployment.yaml b/charts/gitlab/charts/webservice/templates/deployment.yaml
index 505739e6cc..22e0dfe4f4 100644
--- a/charts/gitlab/charts/webservice/templates/deployment.yaml
+++ b/charts/gitlab/charts/webservice/templates/deployment.yaml
@@ -102,6 +102,10 @@ spec:
                   {{- include "gitlab.selectorLabels" $ | nindent 18 }}
                   {{- include "webservice.labels" . | nindent 18}}
       {{- end }}
+      {{- if $.Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml $.Values.topologySpreadConstraints | nindent 8 }}
+      {{- end }}
       {{- if or $.Values.serviceAccount.enabled $.Values.global.serviceAccount.enabled }}
       serviceAccountName: {{ include "gitlab.serviceAccount.name" $ }}
       {{- end }}
diff --git a/charts/gitlab/charts/webservice/values.yaml b/charts/gitlab/charts/webservice/values.yaml
index 9d3e4c4437..5392d93f2b 100644
--- a/charts/gitlab/charts/webservice/values.yaml
+++ b/charts/gitlab/charts/webservice/values.yaml
@@ -452,3 +452,5 @@ deployments: {}
 affinity:
   podAntiAffinity:
     topologyKey:
+
+topologySpreadConstraints: []
-- 
GitLab