Merge pull request #75 from casavo/SRE-164-avoid-pod-of-the-same-serv…

…ice-stay-in-same-node chore(k8s): add topologySpreadConstraints
casavo · Feb 7, 2024 · b9a778b · b9a778b
2 parents 5f6d25f + 33cd9b3
commit b9a778b
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 4 deletions.
diff --git a/charts/be-multisvc/Chart.yaml b/charts/be-multisvc/Chart.yaml
@@ -3,7 +3,7 @@ type: application
 name: be-multisvc
 description: Generic multi service BE application
 
-version: 0.17.1
+version: 0.17.2
 kubeVersion: ">=1.23.0-0"
 
 home: https://github.com/Casavo/charts

diff --git a/charts/be-multisvc/templates/deployment.yaml b/charts/be-multisvc/templates/deployment.yaml
@@ -36,6 +36,15 @@ spec:
       securityContext:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.spreadContainersAccrossNodes }}
+      topologySpreadConstraints:
+        - maxSkew: 1
+          topologyKey: kubernetes.io/hostname
+          whenUnsatisfiable: DoNotSchedule
+          labelSelector:
+            matchLabels:
+              {{- include "app.selectorLabels" . | nindent 14 }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           {{- with .Values.command }}

diff --git a/charts/be-multisvc/values.yaml b/charts/be-multisvc/values.yaml
@@ -27,6 +27,8 @@ podDisruptionBudget: {}
 #  minAvailable: 1
 #  maxUnavailable: 1
 
+spreadContainersAccrossNodes: false
+
 ## See `kubectl explain deployment.spec.strategy` for more
 ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
 deploymentStrategy:

diff --git a/charts/be-web/Chart.yaml b/charts/be-web/Chart.yaml
@@ -3,7 +3,7 @@ type: application
 name: be-web
 description: Generic web BE application
 
-version: 0.20.1
+version: 0.20.2
 kubeVersion: ">=1.23.0-0"
 
 home: https://github.com/Casavo/charts

diff --git a/charts/be-web/templates/deployment.yaml b/charts/be-web/templates/deployment.yaml
@@ -39,6 +39,15 @@ spec:
       securityContext:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.spreadContainersAccrossNodes }}
+      topologySpreadConstraints:
+        - maxSkew: 1
+          topologyKey: kubernetes.io/hostname
+          whenUnsatisfiable: DoNotSchedule
+          labelSelector:
+            matchLabels:
+              {{- include "app.selectorLabels" . | nindent 14 }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           {{- with .Values.securityContext }}

diff --git a/charts/be-web/values.yaml b/charts/be-web/values.yaml
@@ -39,6 +39,8 @@ podDisruptionBudget: {}
 #  minAvailable: 1
 #  maxUnavailable: 1
 
+spreadContainersAccrossNodes: false
+
 ## See `kubectl explain deployment.spec.strategy` for more
 ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
 deploymentStrategy:

diff --git a/charts/fe-nextjs/Chart.yaml b/charts/fe-nextjs/Chart.yaml
@@ -3,7 +3,7 @@ type: application
 name: fe-nextjs
 description: Generic FE NextJS application
 
-version: 0.5.1
+version: 0.5.2
 kubeVersion: ">=1.23.0-0"
 
 home: https://github.com/Casavo/charts

diff --git a/charts/fe-nextjs/templates/deployment.yaml b/charts/fe-nextjs/templates/deployment.yaml
@@ -32,6 +32,15 @@ spec:
       securityContext:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.spreadContainersAccrossNodes }}
+      topologySpreadConstraints:
+        - maxSkew: 1
+          topologyKey: kubernetes.io/hostname
+          whenUnsatisfiable: DoNotSchedule
+          labelSelector:
+            matchLabels:
+              {{- include "app.selectorLabels" . | nindent 14 }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           {{- with .Values.securityContext }}

diff --git a/charts/fe-nextjs/values.yaml b/charts/fe-nextjs/values.yaml
@@ -27,6 +27,8 @@ podDisruptionBudget: {}
 #  minAvailable: 1
 #  maxUnavailable: 1
 
+spreadContainersAccrossNodes: false
+
 ## See `kubectl explain deployment.spec.strategy` for more
 ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
 deploymentStrategy:

diff --git a/charts/fe-static/Chart.yaml b/charts/fe-static/Chart.yaml
@@ -3,7 +3,7 @@ type: application
 name: fe-static
 description: Generic FE static application
 
-version: 0.4.1
+version: 0.4.2
 kubeVersion: ">=1.23.0-0"
 
 home: https://github.com/Casavo/charts

diff --git a/charts/fe-static/templates/deployment.yaml b/charts/fe-static/templates/deployment.yaml
@@ -31,6 +31,15 @@ spec:
       securityContext:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.spreadContainersAccrossNodes }}
+      topologySpreadConstraints:
+        - maxSkew: 1
+          topologyKey: kubernetes.io/hostname
+          whenUnsatisfiable: DoNotSchedule
+          labelSelector:
+            matchLabels:
+              {{- include "app.selectorLabels" . | nindent 14 }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           {{- with .Values.securityContext }}

diff --git a/charts/fe-static/values.yaml b/charts/fe-static/values.yaml
@@ -27,6 +27,8 @@ podDisruptionBudget: {}
 #  minAvailable: 1
 #  maxUnavailable: 1
 
+spreadContainersAccrossNodes: false
+
 ## See `kubectl explain deployment.spec.strategy` for more
 ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
 deploymentStrategy: