chore: add podAntiAffinity for desktop and some providers. (labring#4617

) * chore: add podAntiAffinity for desktop and some providers. Signed-off-by: yy <[email protected]> * chore: add podAntiAffinity for controllers and providers. Signed-off-by: yy <[email protected]> --------- Signed-off-by: yy <[email protected]>
cuisongliu · Mar 22, 2024 · ac53c02 · ac53c02
1 parent c35ee00
commit ac53c02
Show file tree

Hide file tree

Showing 18 changed files with 217 additions and 1 deletion.
diff --git a/controllers/account/deploy/manifests/deploy.yaml.tmpl b/controllers/account/deploy/manifests/deploy.yaml.tmpl
@@ -1361,6 +1361,18 @@ spec:
         runAsNonRoot: true
       serviceAccountName: account-controller-manager
       terminationGracePeriodSeconds: 10
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: "control-plane"
+                  operator: In
+                  values:
+                  - controller-manager
+              topologyKey: "kubernetes.io/hostname"
       volumes:
       - name: cert
         secret:

diff --git a/controllers/admission/deploy/manifests/deploy.yaml.tmpl b/controllers/admission/deploy/manifests/deploy.yaml.tmpl
@@ -363,6 +363,18 @@ spec:
         runAsNonRoot: true
       serviceAccountName: admission-controller-manager
       terminationGracePeriodSeconds: 10
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: "control-plane"
+                  operator: In
+                  values:
+                  - controller-manager
+              topologyKey: "kubernetes.io/hostname"
       volumes:
       - name: cert
         secret:

diff --git a/controllers/app/deploy/manifests/deploy.yaml b/controllers/app/deploy/manifests/deploy.yaml
@@ -642,3 +642,15 @@ spec:
         runAsNonRoot: true
       serviceAccountName: app-controller-manager
       terminationGracePeriodSeconds: 10
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                labelSelector:
+                  matchExpressions:
+                    - key: "control-plane"
+                      operator: In
+                      values:
+                        - controller-manager
+                topologyKey: "kubernetes.io/hostname"
diff --git a/controllers/db/adminer/deploy/manifests/deploy.yaml.tmpl b/controllers/db/adminer/deploy/manifests/deploy.yaml.tmpl
@@ -428,3 +428,15 @@ spec:
         runAsNonRoot: true
       serviceAccountName: adminer-controller-manager
       terminationGracePeriodSeconds: 10
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: "control-plane"
+                  operator: In
+                  values:
+                  - controller-manager
+              topologyKey: "kubernetes.io/hostname"
diff --git a/controllers/objectstorage/deploy/manifests/deploy.yaml.tmpl b/controllers/objectstorage/deploy/manifests/deploy.yaml.tmpl
@@ -517,4 +517,16 @@ spec:
       securityContext:
         runAsNonRoot: true
       serviceAccountName: objectstorage-controller-manager
-      terminationGracePeriodSeconds: 10
+      terminationGracePeriodSeconds: 10
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: "control-plane"
+                  operator: In
+                  values:
+                  - controller-manager
+              topologyKey: "kubernetes.io/hostname"
diff --git a/controllers/terminal/deploy/manifests/deploy.yaml.tmpl b/controllers/terminal/deploy/manifests/deploy.yaml.tmpl
@@ -459,3 +459,15 @@ spec:
         runAsNonRoot: true
       serviceAccountName: terminal-controller-manager
       terminationGracePeriodSeconds: 10
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: "control-plane"
+                  operator: In
+                  values:
+                  - controller-manager
+              topologyKey: "kubernetes.io/hostname"
diff --git a/controllers/user/deploy/manifests/deploy.yaml.tmpl b/controllers/user/deploy/manifests/deploy.yaml.tmpl
@@ -603,6 +603,18 @@ spec:
         runAsNonRoot: true
       serviceAccountName: user-controller-manager
       terminationGracePeriodSeconds: 10
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: "control-plane"
+                  operator: In
+                  values:
+                  - controller-manager
+              topologyKey: "kubernetes.io/hostname"
       volumes:
       - name: cert
         secret:

diff --git a/frontend/desktop/deploy/manifests/deploy.yaml.tmpl b/frontend/desktop/deploy/manifests/deploy.yaml.tmpl
@@ -247,6 +247,18 @@ spec:
             requests:
               cpu: 100m
               memory: 128Mi
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: "app"
+                  operator: In
+                  values:
+                  - desktop-frontend
+              topologyKey: "kubernetes.io/hostname"
       volumes:
         - name: desktop-frontend-volume
           configMap:

diff --git a/frontend/providers/adminer/deploy/manifests/deploy.yaml b/frontend/providers/adminer/deploy/manifests/deploy.yaml
@@ -56,6 +56,18 @@ spec:
             - name: adminer-frontend-volume
               mountPath: /config.yaml
               subPath: config.yaml
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                labelSelector:
+                  matchExpressions:
+                    - key: "app"
+                      operator: In
+                      values:
+                        - adminer-frontend
+                topologyKey: "kubernetes.io/hostname"
       volumes:
         - name: adminer-frontend-volume
           configMap:

diff --git a/frontend/providers/applaunchpad/deploy/manifests/deploy.yaml.tmpl b/frontend/providers/applaunchpad/deploy/manifests/deploy.yaml.tmpl
@@ -76,6 +76,18 @@ spec:
             - mountPath: /app/data/form_slider_config.json
               name: applaunchpad-frontend-volume
               subPath: form_slider_config.json
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: "app"
+                  operator: In
+                  values:
+                  - applaunchpad-frontend
+              topologyKey: "kubernetes.io/hostname"
       volumes:
         - name: applaunchpad-frontend-volume
           configMap:

diff --git a/frontend/providers/costcenter/deploy/manifests/deploy.yaml.tmpl b/frontend/providers/costcenter/deploy/manifests/deploy.yaml.tmpl
@@ -61,6 +61,18 @@ spec:
             - name: costcenter-frontend-volume
               mountPath: /config.yaml
               subPath: config.yaml
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: "app"
+                  operator: In
+                  values:
+                  - costcenter-frontend
+              topologyKey: "kubernetes.io/hostname"
       volumes:
         - name: costcenter-frontend-volume
           configMap:

diff --git a/frontend/providers/cronjob/deploy/manifests/deploy.yaml.tmpl b/frontend/providers/cronjob/deploy/manifests/deploy.yaml.tmpl
@@ -62,6 +62,18 @@ spec:
             - name: cronjob-frontend-volume
               mountPath: /config.yaml
               subPath: config.yaml
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: "app"
+                  operator: In
+                  values:
+                  - cronjob-frontend
+              topologyKey: "kubernetes.io/hostname"
       volumes:
         - name: cronjob-frontend-volume
           configMap:

diff --git a/frontend/providers/dbprovider/deploy/manifests/deploy.yaml.tmpl b/frontend/providers/dbprovider/deploy/manifests/deploy.yaml.tmpl
@@ -79,6 +79,18 @@ spec:
             - name: dbprovider-frontend-volume
               mountPath: /config.yaml
               subPath: config.yaml
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: "app"
+                  operator: In
+                  values:
+                  - dbprovider-frontend
+              topologyKey: "kubernetes.io/hostname"
       volumes:
         - name: dbprovider-frontend-volume
           configMap:

diff --git a/frontend/providers/kubepanel/deploy/manifests/deploy.yaml.tmpl b/frontend/providers/kubepanel/deploy/manifests/deploy.yaml.tmpl
@@ -62,6 +62,18 @@ spec:
             - name: kubepanel-frontend-volume
               mountPath: /config.yaml
               subPath: config.yaml
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: "app"
+                  operator: In
+                  values:
+                  - kubepanel-frontend
+              topologyKey: "kubernetes.io/hostname"
       volumes:
         - name: kubepanel-frontend-volume
           configMap:

diff --git a/frontend/providers/license/deploy/manifests/deploy.yaml.tmpl b/frontend/providers/license/deploy/manifests/deploy.yaml.tmpl
@@ -87,6 +87,18 @@ spec:
             - name: license-frontend-volume
               mountPath: /config.yaml
               subPath: config.yaml
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: "app"
+                  operator: In
+                  values:
+                  - license-frontend
+              topologyKey: "kubernetes.io/hostname"
       volumes:
         - name: license-frontend-volume
           configMap:

diff --git a/frontend/providers/objectstorage/deploy/manifests/deploy.yaml.tmpl b/frontend/providers/objectstorage/deploy/manifests/deploy.yaml.tmpl
@@ -44,6 +44,18 @@ spec:
               memory: 128Mi
          imagePullPolicy: Always
          volumeMounts: []
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: "app"
+                  operator: In
+                  values:
+                  - object-storage-frontend
+              topologyKey: "kubernetes.io/hostname"
      volumes: []
 ---
 apiVersion: v1

diff --git a/frontend/providers/template/deploy/manifests/deploy.yaml.tmpl b/frontend/providers/template/deploy/manifests/deploy.yaml.tmpl
@@ -85,6 +85,18 @@ spec:
               subPath: config.json
             - name: template-data
               mountPath: /app/providers/template/templates
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: "app"
+                  operator: In
+                  values:
+                  - template-frontend
+              topologyKey: "kubernetes.io/hostname"
       volumes:
         - name: template-frontend-volume
           configMap:

diff --git a/frontend/providers/terminal/deploy/manifests/deploy.yaml.tmpl b/frontend/providers/terminal/deploy/manifests/deploy.yaml.tmpl
@@ -61,6 +61,18 @@ spec:
             - name: terminal-frontend-volume
               mountPath: /config.yaml
               subPath: config.yaml
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: "app"
+                  operator: In
+                  values:
+                  - terminal-frontend
+              topologyKey: "kubernetes.io/hostname"
       volumes:
         - name: terminal-frontend-volume
           configMap: