From 708be3e38920d31f0aa5ef862759fcff6e38b923 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Fri, 29 Sep 2023 00:15:42 +0200
Subject: [PATCH] feat(nginx): Switch from podAntiAffinity to
topologySpreadConstraints
---
infrastructure/nginx-system/release.yaml | 39 +++++++++++++-----------
1 file changed, 21 insertions(+), 18 deletions(-)
diff --git a/infrastructure/nginx-system/release.yaml b/infrastructure/nginx-system/release.yaml
index 172c36bd6..f1110c7ce 100644
--- a/infrastructure/nginx-system/release.yaml
+++ b/infrastructure/nginx-system/release.yaml
@@ -31,25 +31,28 @@ metadata:
data:
values.yaml: |
controller:
+ topologySpreadConstraints:
+ - labelSelector:
+ matchLabels:
+ app.kubernetes.io/name: '{{ include "ingress-nginx.name" . }}'
+ app.kubernetes.io/instance: '{{ .Release.Name }}'
+ app.kubernetes.io/component: controller
+ topologyKey: topology.kubernetes.io/zone
+ maxSkew: 1
+ whenUnsatisfiable: ScheduleAnyway
+ matchLabelKeys:
+ - pod-template-hash
+ - labelSelector:
+ matchLabels:
+ app.kubernetes.io/name: '{{ include "ingress-nginx.name" . }}'
+ app.kubernetes.io/instance: '{{ .Release.Name }}'
+ app.kubernetes.io/component: controller
+ topologyKey: kubernetes.io/hostname
+ maxSkew: 1
+ whenUnsatisfiable: DoNotSchedule
+ matchLabelKeys:
+ - pod-template-hash
affinity:
- # Force spread across nodes
- podAntiAffinity:
- requiredDuringSchedulingIgnoredDuringExecution:
- - labelSelector:
- matchExpressions:
- - key: app.kubernetes.io/name
- operator: In
- values:
- - ingress-nginx
- - key: app.kubernetes.io/instance
- operator: In
- values:
- - nginx-ingress
- - key: app.kubernetes.io/component
- operator: In
- values:
- - controller
- topologyKey: "kubernetes.io/hostname"
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 5
--
GitLab