Merge pull request #74 from vector-im/bbz/fix-haproxy-antiAffinity

Fix HAProxy antiAffinity topologyKey to be host rather than zone and add web anti-affinity
element-hq · Jun 29, 2023 · b6d4a0d · b6d4a0d
2 parents c6c440f + 98fb82b
commit b6d4a0d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/templates/haproxy-statefulset.yaml b/templates/haproxy-statefulset.yaml
@@ -37,7 +37,7 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchLabels: {{ include "jitsi.haproxy.selectorLabels" $ | nindent 16 }}
-            topologyKey: topology.kubernetes.io/zone
+            topologyKey: kubernetes.io/hostname
     {{- if $.Values.haproxy.imagePullSecrets }}
       imagePullSecrets:
       {{- range $secretName := $.Values.haproxy.imagePullSecrets }}

diff --git a/templates/web-deployment.yaml b/templates/web-deployment.yaml
@@ -43,6 +43,14 @@ spec:
       {{- range $secretName := $.Values.web.imagePullSecrets }}
       - name: {{ $secretName }}
       {{- end }}
+    {{- end }}
+    {{- if gt ($.Values.web.replicas | int) 1 }}
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchLabels: {{ include "jitsi.webShard.selectorLabels" (merge (dict "RelativeScope" .) $) | nindent 16 }}
+            topologyKey: kubernetes.io/hostname
     {{- end }}
       containers:
       - env: