BC-5423 - Make pod anti affinity rule configurable and optional

hpi-schul-cloud · Dec 4, 2023 · 74eca84 · 74eca84
1 parent b713131
commit 74eca84
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 10 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
@@ -73,6 +73,7 @@ spec:
               namespaceSelector: {}
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
+{% if ANIT_AFFINITY_NODEPOOL_ENABLE is defined and ANIT_AFFINITY_NODEPOOL_ENABLE|bool %}
           - weight: 10
             podAffinityTerm:
               labelSelector:
@@ -81,7 +82,8 @@ spec:
                   operator: In
                   values:
                   - amqp-files
-              topologyKey: "cloud.ionos.com/nodepool-name"
+              topologyKey: {{ ANIT_AFFINITY_NODEPOOL_TOPOLOGY_KEY }}
+{% endif %}
           - weight: 20
             podAffinityTerm:
               labelSelector:

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
@@ -99,6 +99,7 @@ spec:
               namespaceSelector: {}
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
+{% if ANIT_AFFINITY_NODEPOOL_ENABLE is defined and ANIT_AFFINITY_NODEPOOL_ENABLE|bool %}
           - weight: 10
             podAffinityTerm:
               labelSelector:
@@ -107,7 +108,8 @@ spec:
                   operator: In
                   values:
                   - api-files
-              topologyKey: "cloud.ionos.com/nodepool-name"
+              topologyKey: {{ ANIT_AFFINITY_NODEPOOL_TOPOLOGY_KEY }}
+{% endif %}
           - weight: 20
             podAffinityTerm:
               labelSelector:

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
@@ -99,6 +99,7 @@ spec:
               namespaceSelector: {}
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
+{% if ANIT_AFFINITY_NODEPOOL_ENABLE is defined and ANIT_AFFINITY_NODEPOOL_ENABLE|bool %}
           - weight: 10
             podAffinityTerm:
               labelSelector:
@@ -107,7 +108,8 @@ spec:
                   operator: In
                   values:
                   - api-fwu
-              topologyKey: "cloud.ionos.com/nodepool-name"
+              topologyKey: {{ ANIT_AFFINITY_NODEPOOL_TOPOLOGY_KEY }}
+{% endif %}
           - weight: 20
             podAffinityTerm:
               labelSelector:

diff --git a/ansible/roles/schulcloud-server-core/templates/deployment.yml.j2 b/ansible/roles/schulcloud-server-core/templates/deployment.yml.j2
@@ -101,6 +101,7 @@ spec:
               namespaceSelector: {}
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
+{% if ANIT_AFFINITY_NODEPOOL_ENABLE is defined and ANIT_AFFINITY_NODEPOOL_ENABLE|bool %}
           - weight: 10
             podAffinityTerm:
               labelSelector:
@@ -109,7 +110,8 @@ spec:
                   operator: In
                   values:
                   - api
-              topologyKey: "cloud.ionos.com/nodepool-name"
+              topologyKey: {{ ANIT_AFFINITY_NODEPOOL_TOPOLOGY_KEY }}
+{% endif %}
           - weight: 20
             podAffinityTerm:
               labelSelector:

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
@@ -73,6 +73,7 @@ spec:
               namespaceSelector: {}
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
+{% if ANIT_AFFINITY_NODEPOOL_ENABLE is defined and ANIT_AFFINITY_NODEPOOL_ENABLE|bool %}
           - weight: 10
             podAffinityTerm:
               labelSelector:
@@ -81,7 +82,8 @@ spec:
                   operator: In
                   values:
                   - preview-generator
-              topologyKey: "cloud.ionos.com/nodepool-name"
+              topologyKey: {{ ANIT_AFFINITY_NODEPOOL_TOPOLOGY_KEY }}
+{% endif %}
           - weight: 20
             podAffinityTerm:
               labelSelector:

diff --git a/ansible/roles/schulcloud-server-core/templates/tldraw-deployment.yml.j2 b/ansible/roles/schulcloud-server-core/templates/tldraw-deployment.yml.j2
@@ -80,6 +80,7 @@ spec:
               namespaceSelector: {}
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
+{% if ANIT_AFFINITY_NODEPOOL_ENABLE is defined and ANIT_AFFINITY_NODEPOOL_ENABLE|bool %}
           - weight: 10
             podAffinityTerm:
               labelSelector:
@@ -88,7 +89,8 @@ spec:
                   operator: In
                   values:
                   - tldraw-server
-              topologyKey: "cloud.ionos.com/nodepool-name"
+              topologyKey: {{ ANIT_AFFINITY_NODEPOOL_TOPOLOGY_KEY }}
+{% endif %}
           - weight: 20
             podAffinityTerm:
               labelSelector:

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
@@ -99,6 +99,7 @@ spec:
               namespaceSelector: {}
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
+{% if ANIT_AFFINITY_NODEPOOL_ENABLE is defined and ANIT_AFFINITY_NODEPOOL_ENABLE|bool %}
           - weight: 10
             podAffinityTerm:
               labelSelector:
@@ -107,7 +108,8 @@ spec:
                   operator: In
                   values:
                   - api-h5p
-              topologyKey: "cloud.ionos.com/nodepool-name"
+              topologyKey: {{ ANIT_AFFINITY_NODEPOOL_TOPOLOGY_KEY }}
+{% endif %}
           - weight: 20
             podAffinityTerm:
               labelSelector:

diff --git a/ansible/roles/schulcloud-server-init/templates/management-deployment.yml.j2 b/ansible/roles/schulcloud-server-init/templates/management-deployment.yml.j2
@@ -98,6 +98,7 @@ spec:
               namespaceSelector: {}
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
+{% if ANIT_AFFINITY_NODEPOOL_ENABLE is defined and ANIT_AFFINITY_NODEPOOL_ENABLE|bool %}
           - weight: 10
             podAffinityTerm:
               labelSelector:
@@ -106,7 +107,8 @@ spec:
                   operator: In
                   values:
                   - management-deployment
-              topologyKey: "cloud.ionos.com/nodepool-name"
+              topologyKey: {{ ANIT_AFFINITY_NODEPOOL_TOPOLOGY_KEY }}
+{% endif %}
           - weight: 20
             podAffinityTerm:
               labelSelector:

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
@@ -97,6 +97,7 @@ spec:
               namespaceSelector: {}
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
+{% if ANIT_AFFINITY_NODEPOOL_ENABLE is defined and ANIT_AFFINITY_NODEPOOL_ENABLE|bool %}
           - weight: 10
             podAffinityTerm:
               labelSelector:
@@ -105,7 +106,8 @@ spec:
                   operator: In
                   values:
                   - api-worker
-              topologyKey: "cloud.ionos.com/nodepool-name"
+              topologyKey: {{ ANIT_AFFINITY_NODEPOOL_TOPOLOGY_KEY }}
+{% endif %}
           - weight: 20
             podAffinityTerm:
               labelSelector:

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
@@ -98,6 +98,7 @@ spec:
               namespaceSelector: {}
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
+{% if ANIT_AFFINITY_NODEPOOL_ENABLE is defined and ANIT_AFFINITY_NODEPOOL_ENABLE|bool %}
           - weight: 10
             podAffinityTerm:
               labelSelector:
@@ -106,7 +107,8 @@ spec:
                   operator: In
                   values:
                   - api-tsp-sync
-              topologyKey: "cloud.ionos.com/nodepool-name"
+              topologyKey: {{ ANIT_AFFINITY_NODEPOOL_TOPOLOGY_KEY }}
+{% endif %}
           - weight: 20
             podAffinityTerm:
               labelSelector: