Add control-plane NoSchedule tolerations on calico deployments

kubernetes-sigs · Feb 16, 2022 · 695963c · 695963c
1 parent 83575bd
commit 695963c
Show file tree

Hide file tree

Showing 18 changed files with 69 additions and 1 deletion.
diff --git a/templates/addons/calico-ipv6.yaml b/templates/addons/calico-ipv6.yaml
@@ -3702,6 +3702,8 @@ spec:
         operator: Exists
       - effect: NoSchedule
         key: node-role.kubernetes.io/master
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/control-plane
 ---
 apiVersion: apps/v1
 kind: Deployment

diff --git a/templates/addons/calico-ipv6/kustomization.yaml b/templates/addons/calico-ipv6/kustomization.yaml
@@ -12,3 +12,8 @@ patches:
     name: calico-node
     namespace: kube-system
   path: patches/calico-node.yaml
+- path: patches/control-plane-tolerations.yaml
+  target:
+    kind: Deployment
+    name: calico-kube-controllers
+    namespace: kube-system
diff --git a/templates/addons/calico-ipv6/patches/control-plane-tolerations.yaml b/templates/addons/calico-ipv6/patches/control-plane-tolerations.yaml
@@ -0,0 +1,15 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: calico-kube-controllers
+  namespace: kube-system
+spec:
+  template:
+    spec:
+      tolerations:
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/master
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/control-plane
diff --git a/templates/addons/calico.yaml b/templates/addons/calico.yaml
@@ -3716,6 +3716,8 @@ spec:
         operator: Exists
       - effect: NoSchedule
         key: node-role.kubernetes.io/master
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/control-plane
 ---
 apiVersion: policy/v1beta1
 kind: PodDisruptionBudget

diff --git a/templates/addons/calico/kustomization.yaml b/templates/addons/calico/kustomization.yaml
@@ -13,4 +13,9 @@ patches:
     kind: DaemonSet
     name: calico-node
     namespace: kube-system
-  path: patches/remove-aws-reference.yaml
+  path: patches/remove-aws-reference.yaml
+- path: patches/control-plane-tolerations.yaml
+  target:
+    kind: Deployment
+    name: calico-kube-controllers
+    namespace: kube-system
diff --git a/templates/addons/calico/patches/control-plane-tolerations.yaml b/templates/addons/calico/patches/control-plane-tolerations.yaml
@@ -0,0 +1,15 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: calico-kube-controllers
+  namespace: kube-system
+spec:
+  template:
+    spec:
+      tolerations:
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/master
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/control-plane
diff --git a/templates/test/ci/cluster-template-prow-ci-version-windows-containerd-2022.yaml b/templates/test/ci/cluster-template-prow-ci-version-windows-containerd-2022.yaml
@@ -4309,6 +4309,8 @@ data:
             operator: Exists
           - effect: NoSchedule
             key: node-role.kubernetes.io/master
+          - effect: NoSchedule
+            key: node-role.kubernetes.io/control-plane
     ---
     apiVersion: policy/v1beta1
     kind: PodDisruptionBudget

diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml
@@ -4309,6 +4309,8 @@ data:
             operator: Exists
           - effect: NoSchedule
             key: node-role.kubernetes.io/master
+          - effect: NoSchedule
+            key: node-role.kubernetes.io/control-plane
     ---
     apiVersion: policy/v1beta1
     kind: PodDisruptionBudget

diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml
@@ -3989,6 +3989,8 @@ data:
             operator: Exists
           - effect: NoSchedule
             key: node-role.kubernetes.io/master
+          - effect: NoSchedule
+            key: node-role.kubernetes.io/control-plane
     ---
     apiVersion: policy/v1beta1
     kind: PodDisruptionBudget

diff --git a/templates/test/ci/cluster-template-prow-external-cloud-provider.yaml b/templates/test/ci/cluster-template-prow-external-cloud-provider.yaml
@@ -4303,6 +4303,8 @@ data:
             operator: Exists
           - effect: NoSchedule
             key: node-role.kubernetes.io/master
+          - effect: NoSchedule
+            key: node-role.kubernetes.io/control-plane
     ---
     apiVersion: policy/v1beta1
     kind: PodDisruptionBudget

diff --git a/templates/test/ci/cluster-template-prow-ipv6.yaml b/templates/test/ci/cluster-template-prow-ipv6.yaml
@@ -4005,6 +4005,8 @@ data:
             operator: Exists
           - effect: NoSchedule
             key: node-role.kubernetes.io/master
+          - effect: NoSchedule
+            key: node-role.kubernetes.io/control-plane
     ---
     apiVersion: apps/v1
     kind: Deployment

diff --git a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
@@ -4257,6 +4257,8 @@ data:
             operator: Exists
           - effect: NoSchedule
             key: node-role.kubernetes.io/master
+          - effect: NoSchedule
+            key: node-role.kubernetes.io/control-plane
     ---
     apiVersion: policy/v1beta1
     kind: PodDisruptionBudget

diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml
@@ -4070,6 +4070,8 @@ data:
             operator: Exists
           - effect: NoSchedule
             key: node-role.kubernetes.io/master
+          - effect: NoSchedule
+            key: node-role.kubernetes.io/control-plane
     ---
     apiVersion: policy/v1beta1
     kind: PodDisruptionBudget

diff --git a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml
@@ -7898,6 +7898,8 @@ data:
             operator: Exists
           - effect: NoSchedule
             key: node-role.kubernetes.io/master
+          - effect: NoSchedule
+            key: node-role.kubernetes.io/control-plane
     ---
     apiVersion: policy/v1beta1
     kind: PodDisruptionBudget

diff --git a/templates/test/ci/cluster-template-prow-private.yaml b/templates/test/ci/cluster-template-prow-private.yaml
@@ -3998,6 +3998,8 @@ data:
             operator: Exists
           - effect: NoSchedule
             key: node-role.kubernetes.io/master
+          - effect: NoSchedule
+            key: node-role.kubernetes.io/control-plane
     ---
     apiVersion: policy/v1beta1
     kind: PodDisruptionBudget

diff --git a/templates/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml
@@ -4109,6 +4109,8 @@ data:
             operator: Exists
           - effect: NoSchedule
             key: node-role.kubernetes.io/master
+          - effect: NoSchedule
+            key: node-role.kubernetes.io/control-plane
     ---
     apiVersion: policy/v1beta1
     kind: PodDisruptionBudget

diff --git a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml
@@ -4160,6 +4160,8 @@ data:
             operator: Exists
           - effect: NoSchedule
             key: node-role.kubernetes.io/master
+          - effect: NoSchedule
+            key: node-role.kubernetes.io/control-plane
     ---
     apiVersion: policy/v1beta1
     kind: PodDisruptionBudget

diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml
@@ -4198,6 +4198,8 @@ data:
             operator: Exists
           - effect: NoSchedule
             key: node-role.kubernetes.io/master
+          - effect: NoSchedule
+            key: node-role.kubernetes.io/control-plane
     ---
     apiVersion: policy/v1beta1
     kind: PodDisruptionBudget