BC-5423 - Adjusted weighting for pod Inter-pod affinity and anti-affi…

…nity
hpi-schul-cloud · Nov 30, 2023 · 8b27d63 · 8b27d63
1 parent fd1984f
commit 8b27d63
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 15 deletions.
diff --git a/ansible/roles/clamav/templates/deployment.yml.j2 b/ansible/roles/clamav/templates/deployment.yml.j2
@@ -49,7 +49,7 @@ spec:
       affinity:
         podAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
+          - weight: 9
             podAffinityTerm:
               labelSelector:
                 matchExpressions:
@@ -70,7 +70,7 @@ spec:
                   values:
                   - clamav
               topologyKey: "cloud.ionos.com/nodepool-name"
-          - weight: 10
+          - weight: 20
             podAffinityTerm:
               labelSelector:
                 matchExpressions:

diff --git a/ansible/roles/dof_etherpad/templates/deployment.yml.j2 b/ansible/roles/dof_etherpad/templates/deployment.yml.j2
@@ -77,7 +77,7 @@ spec:
       affinity:
         podAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
+          - weight: 9
             podAffinityTerm:
               labelSelector:
                 matchExpressions:
@@ -98,7 +98,7 @@ spec:
                   values:
                   - etherpad
               topologyKey: "cloud.ionos.com/nodepool-name"
-          - weight: 10
+          - weight: 20
             podAffinityTerm:
               labelSelector:
                 matchExpressions:

diff --git a/ansible/roles/dof_etherpad_nginx/templates/deployment.yml.j2 b/ansible/roles/dof_etherpad_nginx/templates/deployment.yml.j2
@@ -80,7 +80,7 @@ spec:
       affinity:
         podAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
+          - weight: 9
             podAffinityTerm:
               labelSelector:
                 matchExpressions:
@@ -101,7 +101,7 @@ spec:
                   values:
                   - etherpad-nginx
               topologyKey: "cloud.ionos.com/nodepool-name"
-          - weight: 10
+          - weight: 20
             podAffinityTerm:
               labelSelector:
                 matchExpressions:

diff --git a/ansible/roles/dof_redis/templates/deployment.yml.j2 b/ansible/roles/dof_redis/templates/deployment.yml.j2
@@ -61,7 +61,7 @@ spec:
       affinity:
         podAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
+          - weight: 9
             podAffinityTerm:
               labelSelector:
                 matchExpressions:
@@ -82,7 +82,7 @@ spec:
                   values:
                   - redis
               topologyKey: "cloud.ionos.com/nodepool-name"
-          - weight: 10
+          - weight: 20
             podAffinityTerm:
               labelSelector:
                 matchExpressions:

diff --git a/ansible/roles/erwin-idm/templates/deployment.yml.j2 b/ansible/roles/erwin-idm/templates/deployment.yml.j2
@@ -88,7 +88,7 @@ spec:
       affinity:
         podAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
+          - weight: 9
             podAffinityTerm:
               labelSelector:
                 matchExpressions:
@@ -109,7 +109,7 @@ spec:
                   values:
                   - erwinidm
               topologyKey: "cloud.ionos.com/nodepool-name"
-          - weight: 10
+          - weight: 20
             podAffinityTerm:
               labelSelector:
                 matchExpressions:

diff --git a/ansible/roles/hydra/templates/deployment.yml.j2 b/ansible/roles/hydra/templates/deployment.yml.j2
@@ -71,7 +71,7 @@ spec:
       affinity:
         podAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
+          - weight: 9
             podAffinityTerm:
               labelSelector:
                 matchExpressions:
@@ -92,7 +92,7 @@ spec:
                   values:
                   - hydra
               topologyKey: "cloud.ionos.com/nodepool-name"
-          - weight: 10
+          - weight: 20
             podAffinityTerm:
               labelSelector:
                 matchExpressions:

diff --git a/ansible/roles/rocketchat/templates/deployment.yml.j2 b/ansible/roles/rocketchat/templates/deployment.yml.j2
@@ -82,7 +82,7 @@ spec:
       affinity:
         podAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
+          - weight: 9
             podAffinityTerm:
               labelSelector:
                 matchExpressions:
@@ -103,7 +103,7 @@ spec:
                   values:
                   - rocketchat
               topologyKey: "cloud.ionos.com/nodepool-name"
-          - weight: 10
+          - weight: 20
             podAffinityTerm:
               labelSelector:
                 matchExpressions:

diff --git a/ansible/roles/storage/templates/deployment.yml.j2 b/ansible/roles/storage/templates/deployment.yml.j2
@@ -69,7 +69,7 @@ spec:
       affinity:
         podAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
+          - weight: 9
             podAffinityTerm:
               labelSelector:
                 matchExpressions:
@@ -79,3 +79,23 @@ spec:
                   - schulcloud-verbund
               topologyKey: "kubernetes.io/hostname"
               namespaceSelector: {}
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 10
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app.kubernetes.io/name
+                  operator: In
+                  values:
+                  - minio
+              topologyKey: "cloud.ionos.com/nodepool-name"
+          - weight: 20
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app.kubernetes.io/name
+                  operator: In
+                  values:
+                  - minio
+              topologyKey: "topology.kubernetes.io/zone"