fix(installer): add pod affinity (#2175)

Co-authored-by: root <[email protected]>
tkestack · Nov 15, 2022 · 8812b3c · 8812b3c
1 parent 7b9e7b0
commit 8812b3c
Show file tree

Hide file tree

Showing 15 changed files with 165 additions and 0 deletions.
diff --git a/...tke-installer/app/installer/manifests/charts/tke-platform/templates/tke-platform-api.yaml b/...tke-installer/app/installer/manifests/charts/tke-platform/templates/tke-platform-api.yaml
@@ -57,6 +57,17 @@ spec:
             - matchExpressions:
               - key: node-role.kubernetes.io/master
                 operator: Exists
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - tke-platform-api
+              topologyKey: kubernetes.io/hostname
+            weight: 1
       containers:
         - name: tke-platform-api
           image: {{ .Values.api.image }}

diff --git a/...taller/app/installer/manifests/charts/tke-platform/templates/tke-platform-controller.yaml b/...taller/app/installer/manifests/charts/tke-platform/templates/tke-platform-controller.yaml
@@ -26,6 +26,17 @@ spec:
             - matchExpressions:
               - key: node-role.kubernetes.io/master
                 operator: Exists
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - tke-platform-controller
+              topologyKey: kubernetes.io/hostname
+            weight: 1
       initContainers:
         - command:
             - sh

diff --git a/cmd/tke-installer/app/installer/manifests/tke-application-api/tke-application-api.yaml b/cmd/tke-installer/app/installer/manifests/tke-application-api/tke-application-api.yaml
@@ -42,6 +42,17 @@ spec:
             - matchExpressions:
               - key: node-role.kubernetes.io/master
                 operator: Exists
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - tke-application-api
+              topologyKey: kubernetes.io/hostname
+            weight: 1
       containers:
         - name: tke-application-api
           image: {{ .Image }}

diff --git a/...taller/app/installer/manifests/tke-application-controller/tke-application-controller.yaml b/...taller/app/installer/manifests/tke-application-controller/tke-application-controller.yaml
@@ -26,6 +26,17 @@ spec:
             - matchExpressions:
               - key: node-role.kubernetes.io/master
                 operator: Exists
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - tke-application-controller
+              topologyKey: kubernetes.io/hostname
+            weight: 1
       containers:
         - name: tke-application-controller
           image: {{ .Image }}

diff --git a/cmd/tke-installer/app/installer/manifests/tke-audit-api/tke-audit-api.yaml b/cmd/tke-installer/app/installer/manifests/tke-audit-api/tke-audit-api.yaml
@@ -42,6 +42,17 @@ spec:
             - matchExpressions:
               - key: node-role.kubernetes.io/master
                 operator: Exists
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - tke-audit-api
+              topologyKey: kubernetes.io/hostname
+            weight: 1
       containers:
         - name: tke-audit-api
           image: {{ .Image }}

diff --git a/cmd/tke-installer/app/installer/manifests/tke-business-api/tke-business-api.yaml b/cmd/tke-installer/app/installer/manifests/tke-business-api/tke-business-api.yaml
@@ -42,6 +42,17 @@ spec:
             - matchExpressions:
               - key: node-role.kubernetes.io/master
                 operator: Exists
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - tke-business-api
+              topologyKey: kubernetes.io/hostname
+            weight: 1
       containers:
         - name: tke-business-api
           image: {{ .Image }}

diff --git a/...ke-installer/app/installer/manifests/tke-business-controller/tke-business-controller.yaml b/...ke-installer/app/installer/manifests/tke-business-controller/tke-business-controller.yaml
@@ -26,6 +26,17 @@ spec:
             - matchExpressions:
               - key: node-role.kubernetes.io/master
                 operator: Exists
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - tke-business-controller
+              topologyKey: kubernetes.io/hostname
+            weight: 1
       containers:
         - name: tke-business-controller
           image: {{ .Image }}

diff --git a/cmd/tke-installer/app/installer/manifests/tke-logagent-api/tke-logagent-api.yaml b/cmd/tke-installer/app/installer/manifests/tke-logagent-api/tke-logagent-api.yaml
@@ -42,6 +42,17 @@ spec:
             - matchExpressions:
               - key: node-role.kubernetes.io/master
                 operator: Exists
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - tke-logagent-api
+              topologyKey: kubernetes.io/hostname
+            weight: 1
       containers:
         - name: tke-logagent-api
           image: {{ .Image }}

diff --git a/...ke-installer/app/installer/manifests/tke-logagent-controller/tke-logagent-controller.yaml b/...ke-installer/app/installer/manifests/tke-logagent-controller/tke-logagent-controller.yaml
@@ -26,6 +26,17 @@ spec:
             - matchExpressions:
               - key: node-role.kubernetes.io/master
                 operator: Exists
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - tke-logagent-controller
+              topologyKey: kubernetes.io/hostname
+            weight: 1
       containers:
         - name: tke-logagent-controller
           image: {{ .Image }}

diff --git a/cmd/tke-installer/app/installer/manifests/tke-mesh-api/tke-mesh-api.yaml b/cmd/tke-installer/app/installer/manifests/tke-mesh-api/tke-mesh-api.yaml
@@ -42,6 +42,17 @@ spec:
             - matchExpressions:
               - key: node-role.kubernetes.io/master
                 operator: Exists
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - tke-mesh-api
+              topologyKey: kubernetes.io/hostname
+            weight: 1
       containers:
         - name: tke-mesh-api
           image: {{ .Image }}

diff --git a/cmd/tke-installer/app/installer/manifests/tke-mesh-controller/tke-mesh-controller.yaml b/cmd/tke-installer/app/installer/manifests/tke-mesh-controller/tke-mesh-controller.yaml
@@ -29,6 +29,17 @@ spec:
             - matchExpressions:
               - key: node-role.kubernetes.io/master
                 operator: Exists
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - tke-mesh-controller
+              topologyKey: kubernetes.io/hostname
+            weight: 1
       containers:
         - name: tke-mesh-controller
           image: {{ .Image }}

diff --git a/cmd/tke-installer/app/installer/manifests/tke-monitor-api/tke-monitor-api.yaml b/cmd/tke-installer/app/installer/manifests/tke-monitor-api/tke-monitor-api.yaml
@@ -42,6 +42,17 @@ spec:
             - matchExpressions:
               - key: node-role.kubernetes.io/master
                 operator: Exists
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - tke-monitor-api
+              topologyKey: kubernetes.io/hostname
+            weight: 1
       containers:
         - name: tke-monitor-api
           image: {{ .Image }}

diff --git a/cmd/tke-installer/app/installer/manifests/tke-monitor-controller/tke-monitor-controller.yaml b/cmd/tke-installer/app/installer/manifests/tke-monitor-controller/tke-monitor-controller.yaml
@@ -29,6 +29,17 @@ spec:
             - matchExpressions:
               - key: node-role.kubernetes.io/master
                 operator: Exists
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - tke-monitor-controller
+              topologyKey: kubernetes.io/hostname
+            weight: 1
       containers:
         - name: tke-monitor-controller
           image: {{ .Image }}

diff --git a/cmd/tke-installer/app/installer/manifests/tke-notify-api/tke-notify-api.yaml b/cmd/tke-installer/app/installer/manifests/tke-notify-api/tke-notify-api.yaml
@@ -42,6 +42,17 @@ spec:
             - matchExpressions:
               - key: node-role.kubernetes.io/master
                 operator: Exists
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - tke-notify-api
+              topologyKey: kubernetes.io/hostname
+            weight: 1
       containers:
         - name: tke-notify-api
           image: {{ .Image }}

diff --git a/cmd/tke-installer/app/installer/manifests/tke-notify-controller/tke-notify-controller.yaml b/cmd/tke-installer/app/installer/manifests/tke-notify-controller/tke-notify-controller.yaml
@@ -26,6 +26,17 @@ spec:
             - matchExpressions:
               - key: node-role.kubernetes.io/master
                 operator: Exists
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - tke-notify-controller
+              topologyKey: kubernetes.io/hostname
+            weight: 1
       containers:
         - name: tke-notify-controller
           image: {{ .Image }}