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

…nity
hpi-schul-cloud · Dec 1, 2023 · db40ff5 · db40ff5
1 parent 5baa633
commit db40ff5
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/ansible/roles/schulcloud-server-core/templates/amqp-files-deployment.yml.j2 b/ansible/roles/schulcloud-server-core/templates/amqp-files-deployment.yml.j2
@@ -61,7 +61,7 @@ spec:
       affinity:
         podAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
+          - weight: 9
             podAffinityTerm:
               labelSelector:
                 matchExpressions:
@@ -82,7 +82,7 @@ spec:
                   values:
                   - amqp-files
               topologyKey: "cloud.ionos.com/nodepool-name"
-          - weight: 10
+          - weight: 20
             podAffinityTerm:
               labelSelector:
                 matchExpressions:

diff --git a/ansible/roles/schulcloud-server-core/templates/api-files-deployment.yml.j2 b/ansible/roles/schulcloud-server-core/templates/api-files-deployment.yml.j2
@@ -87,7 +87,7 @@ spec:
       affinity:
         podAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
+          - weight: 9
             podAffinityTerm:
               labelSelector:
                 matchExpressions:
@@ -108,7 +108,7 @@ spec:
                   values:
                   - api-files
               topologyKey: "cloud.ionos.com/nodepool-name"
-          - weight: 10
+          - weight: 20
             podAffinityTerm:
               labelSelector:
                 matchExpressions:

diff --git a/ansible/roles/schulcloud-server-core/templates/api-fwu-deployment.yml.j2 b/ansible/roles/schulcloud-server-core/templates/api-fwu-deployment.yml.j2
@@ -87,7 +87,7 @@ spec:
       affinity:
         podAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
+          - weight: 9
             podAffinityTerm:
               labelSelector:
                 matchExpressions:
@@ -108,7 +108,7 @@ spec:
                   values:
                   - api-fwu
               topologyKey: "cloud.ionos.com/nodepool-name"
-          - weight: 10
+          - weight: 20
             podAffinityTerm:
               labelSelector:
                 matchExpressions:

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

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

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

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

diff --git a/ansible/roles/schulcloud-server-ldapsync/templates/api-ldap-worker-deployment.yml.j2 b/ansible/roles/schulcloud-server-ldapsync/templates/api-ldap-worker-deployment.yml.j2
@@ -85,7 +85,7 @@ spec:
       affinity:
         podAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
+          - weight: 9
             podAffinityTerm:
               labelSelector:
                 matchExpressions:
@@ -106,7 +106,7 @@ spec:
                   values:
                   - api-worker
               topologyKey: "cloud.ionos.com/nodepool-name"
-          - weight: 10
+          - weight: 20
             podAffinityTerm:
               labelSelector:
                 matchExpressions:

diff --git a/ansible/roles/schulcloud-server-tspsync/templates/api-tsp-sync-deployment.yml.j2 b/ansible/roles/schulcloud-server-tspsync/templates/api-tsp-sync-deployment.yml.j2
@@ -86,7 +86,7 @@ spec:
       affinity:
         podAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
+          - weight: 9
             podAffinityTerm:
               labelSelector:
                 matchExpressions:
@@ -107,7 +107,7 @@ spec:
                   values:
                   - api-tsp-sync
               topologyKey: "cloud.ionos.com/nodepool-name"
-          - weight: 10
+          - weight: 20
             podAffinityTerm:
               labelSelector:
                 matchExpressions: