diff --git a/templates/addons/calico-ipv6.yaml b/templates/addons/calico-ipv6.yaml index 7ec661bd1d6..c837749a508 100644 --- 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 index fb2bffe1a4b..75be48cb50c 100644 --- 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 new file mode 100644 index 00000000000..5e063f523d7 --- /dev/null +++ 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 index b8eadb334fc..6d4c2a54795 100644 --- 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 index 521dab8f192..97255278e00 100644 --- 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 \ No newline at end of file + 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 new file mode 100644 index 00000000000..5e063f523d7 --- /dev/null +++ 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 index b4fa1dd8506..59ce7755285 100644 --- 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 index 0011f4d3b6e..f21734ccb40 100644 --- 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 index 380b1c5d996..24687b1c69c 100644 --- 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 index 2946a37b2a1..13df798180e 100644 --- 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 index 9af5ec8be1b..581557f683d 100644 --- 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 index 1b8ae77c960..a6695b3f8f7 100644 --- 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 index 148c58ec921..1e61bc5944c 100644 --- 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 index 4aa3a01f1ff..c3674839a8c 100644 --- 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 index 73b95db9884..48739ec9f14 100644 --- 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 index ba46076dd73..dfa04d49b65 100644 --- 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 index eabf85dc7e4..0ca26cdb7fe 100644 --- 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 index c0afe7129bb..91a165d35ed 100644 --- 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