diff --git a/docs/metallb.md b/docs/metallb.md
index 94b81fa2750cf6672d4c0f90769e9563b6c5deae..00f52b61942217625df7ec65db7e50f6b34bcf7f 100644
--- a/docs/metallb.md
+++ b/docs/metallb.md
@@ -29,10 +29,6 @@ metallb_config:
nodeselector:
kubernetes.io/os: linux
tolerations:
- - key: "node-role.kubernetes.io/master"
- operator: "Equal"
- value: ""
- effect: "NoSchedule"
- key: "node-role.kubernetes.io/control-plane"
operator: "Equal"
value: ""
diff --git a/inventory/sample/group_vars/k8s_cluster/addons.yml b/inventory/sample/group_vars/k8s_cluster/addons.yml
index 8882b5212fd57e240afa962dba7e2b46d2ecbae3..f8a4c2ddab88358e3acf9a91899c441de5463062 100644
--- a/inventory/sample/group_vars/k8s_cluster/addons.yml
+++ b/inventory/sample/group_vars/k8s_cluster/addons.yml
@@ -103,10 +103,6 @@ ingress_publish_status_address: ""
# ingress_nginx_nodeselector:
# kubernetes.io/os: "linux"
# ingress_nginx_tolerations:
-# - key: "node-role.kubernetes.io/master"
-# operator: "Equal"
-# value: ""
-# effect: "NoSchedule"
# - key: "node-role.kubernetes.io/control-plane"
# operator: "Equal"
# value: ""
@@ -140,8 +136,6 @@ ingress_alb_enabled: false
cert_manager_enabled: false
# cert_manager_namespace: "cert-manager"
# cert_manager_tolerations:
-# - key: node-role.kubernetes.io/master
-# effect: NoSchedule
# - key: node-role.kubernetes.io/control-plane
# effect: NoSchedule
# cert_manager_affinity:
@@ -185,10 +179,6 @@ metallb_speaker_enabled: "{{ metallb_enabled }}"
# nodeselector:
# kubernetes.io/os: "linux"
# tollerations:
-# - key: "node-role.kubernetes.io/master"
-# operator: "Equal"
-# value: ""
-# effect: "NoSchedule"
# - key: "node-role.kubernetes.io/control-plane"
# operator: "Equal"
# value: ""
@@ -197,10 +187,6 @@ metallb_speaker_enabled: "{{ metallb_enabled }}"
# nodeselector:
# kubernetes.io/os: "linux"
# tolerations:
-# - key: "node-role.kubernetes.io/master"
-# operator: "Equal"
-# value: ""
-# effect: "NoSchedule"
# - key: "node-role.kubernetes.io/control-plane"
# operator: "Equal"
# value: ""
diff --git a/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
index 6cb760434386cfeb5232110c33da0ed296920ee1..d2123937f6530e16e60902170d5ab073eb150c56 100644
--- a/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
@@ -32,8 +32,6 @@ spec:
priorityClassName: system-cluster-critical
serviceAccountName: coredns
tolerations:
- - key: node-role.kubernetes.io/master
- effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
{% if dns_extra_tolerations is defined %}
diff --git a/roles/kubernetes-apps/ansible/templates/dashboard.yml.j2 b/roles/kubernetes-apps/ansible/templates/dashboard.yml.j2
index b0c3419269f3b320f7d23d1f3549ece25a24c8bb..7d2872535a2d49497d38d3a78794a25091549c3c 100644
--- a/roles/kubernetes-apps/ansible/templates/dashboard.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/dashboard.yml.j2
@@ -225,8 +225,6 @@ spec:
serviceAccountName: kubernetes-dashboard
{% if dashboard_master_toleration %}
tolerations:
- - key: node-role.kubernetes.io/master
- effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
{% endif %}
@@ -332,8 +330,6 @@ spec:
emptyDir: {}
{% if dashboard_master_toleration %}
tolerations:
- - key: node-role.kubernetes.io/master
- effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
{% endif %}
diff --git a/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2 b/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
index c085405342f44d2b8dd46346233dabf11e96c876..c10ebf97f4dd989653f2a3f83c00382f4d037804 100644
--- a/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
@@ -42,8 +42,6 @@ spec:
nodeSelector:
kubernetes.io/os: linux
tolerations:
- - effect: NoSchedule
- key: node-role.kubernetes.io/master
- effect: NoSchedule
key: node-role.kubernetes.io/control-plane
{% if dns_autoscaler_extra_tolerations is defined %}
diff --git a/roles/kubernetes-apps/cloud_controller/oci/templates/oci-cloud-provider.yml.j2 b/roles/kubernetes-apps/cloud_controller/oci/templates/oci-cloud-provider.yml.j2
index 6b45d818c8354de3539d27f637db0fe83cf4716a..e1fc11d21a1d53eb13343930d6e981daaa48eacd 100644
--- a/roles/kubernetes-apps/cloud_controller/oci/templates/oci-cloud-provider.yml.j2
+++ b/roles/kubernetes-apps/cloud_controller/oci/templates/oci-cloud-provider.yml.j2
@@ -41,9 +41,6 @@ spec:
- key: node.cloudprovider.kubernetes.io/uninitialized
value: "true"
effect: NoSchedule
- - key: node-role.kubernetes.io/master
- operator: Exists
- effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
diff --git a/roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-controller.yml.j2 b/roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-controller.yml.j2
index 36d38acaa006b168f26198739b30b4f90a163894..13e9b023ead4b15a0bdf74f48d209806340ca30e 100644
--- a/roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-controller.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-controller.yml.j2
@@ -20,8 +20,6 @@ spec:
kubernetes.io/os: linux
priorityClassName: system-cluster-critical
tolerations:
- - key: "node-role.kubernetes.io/master"
- effect: "NoSchedule"
- key: "node-role.kubernetes.io/control-plane"
effect: "NoSchedule"
{% if azure_csi_controller_affinity %}
diff --git a/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-controller-deployment.yml.j2 b/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-controller-deployment.yml.j2
index dd009d8f74a55635a26d7823bd289dda83782288..93ad8b847a71cdf6baeda34461202e2322703276 100644
--- a/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-controller-deployment.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-controller-deployment.yml.j2
@@ -34,9 +34,6 @@ spec:
nodeSelector:
node-role.kubernetes.io/control-plane: ""
tolerations:
- - operator: "Exists"
- key: node-role.kubernetes.io/master
- effect: NoSchedule
- operator: "Exists"
key: node-role.kubernetes.io/control-plane
effect: NoSchedule
diff --git a/roles/kubernetes-apps/external_cloud_controller/hcloud/templates/external-hcloud-cloud-controller-manager-ds-with-networks.yml.j2 b/roles/kubernetes-apps/external_cloud_controller/hcloud/templates/external-hcloud-cloud-controller-manager-ds-with-networks.yml.j2
index ec64d9a3079d0f165bb23c1b121d0e2b173d58a0..8279a44c5de44f6b47e7aa51dbb98dba0e8471a6 100644
--- a/roles/kubernetes-apps/external_cloud_controller/hcloud/templates/external-hcloud-cloud-controller-manager-ds-with-networks.yml.j2
+++ b/roles/kubernetes-apps/external_cloud_controller/hcloud/templates/external-hcloud-cloud-controller-manager-ds-with-networks.yml.j2
@@ -25,9 +25,6 @@ spec:
effect: "NoSchedule"
- key: "CriticalAddonsOnly"
operator: "Exists"
- - key: "node-role.kubernetes.io/master"
- effect: NoSchedule
- operator: Exists
- key: "node-role.kubernetes.io/control-plane"
effect: NoSchedule
operator: Exists
diff --git a/roles/kubernetes-apps/external_cloud_controller/hcloud/templates/external-hcloud-cloud-controller-manager-ds.yml.j2 b/roles/kubernetes-apps/external_cloud_controller/hcloud/templates/external-hcloud-cloud-controller-manager-ds.yml.j2
index a581781fbc8ceb61913c23e2dba8e73ee7379fbc..64422101c28b8c187ffed08e16a215387bc82fe7 100644
--- a/roles/kubernetes-apps/external_cloud_controller/hcloud/templates/external-hcloud-cloud-controller-manager-ds.yml.j2
+++ b/roles/kubernetes-apps/external_cloud_controller/hcloud/templates/external-hcloud-cloud-controller-manager-ds.yml.j2
@@ -27,8 +27,6 @@ spec:
effect: "NoSchedule"
- key: "CriticalAddonsOnly"
operator: "Exists"
- - key: "node-role.kubernetes.io/master"
- effect: NoSchedule
- key: "node-role.kubernetes.io/control-plane"
effect: NoSchedule
- key: "node.kubernetes.io/not-ready"
diff --git a/roles/kubernetes-apps/external_cloud_controller/huaweicloud/templates/external-huawei-cloud-controller-manager-ds.yml.j2 b/roles/kubernetes-apps/external_cloud_controller/huaweicloud/templates/external-huawei-cloud-controller-manager-ds.yml.j2
index 5e4b424f521740b938f606134e4849b8d6dab5d1..b9b2ec35458631975dbd6922cf325572a5dfaaac 100644
--- a/roles/kubernetes-apps/external_cloud_controller/huaweicloud/templates/external-huawei-cloud-controller-manager-ds.yml.j2
+++ b/roles/kubernetes-apps/external_cloud_controller/huaweicloud/templates/external-huawei-cloud-controller-manager-ds.yml.j2
@@ -35,8 +35,6 @@ spec:
- key: node.cloudprovider.kubernetes.io/uninitialized
value: "true"
effect: NoSchedule
- - key: node-role.kubernetes.io/master
- effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
serviceAccountName: cloud-controller-manager
diff --git a/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-controller-manager-ds.yml.j2 b/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-controller-manager-ds.yml.j2
index 565875dfff9f87f635ea7622d22082b3136c2de9..1c1eda8c556f600f50baa16b25e1b5d63f3b66b7 100644
--- a/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-controller-manager-ds.yml.j2
+++ b/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-controller-manager-ds.yml.j2
@@ -31,8 +31,6 @@ spec:
- key: node.cloudprovider.kubernetes.io/uninitialized
value: "true"
effect: NoSchedule
- - key: node-role.kubernetes.io/master
- effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
serviceAccountName: cloud-controller-manager
diff --git a/roles/kubernetes-apps/external_cloud_controller/vsphere/templates/external-vsphere-cloud-controller-manager-ds.yml.j2 b/roles/kubernetes-apps/external_cloud_controller/vsphere/templates/external-vsphere-cloud-controller-manager-ds.yml.j2
index 5f1068d81359d762b6ade7c217cc730c7c59482c..05e4ac300da081d30f94818a025d5a3ac24f5026 100644
--- a/roles/kubernetes-apps/external_cloud_controller/vsphere/templates/external-vsphere-cloud-controller-manager-ds.yml.j2
+++ b/roles/kubernetes-apps/external_cloud_controller/vsphere/templates/external-vsphere-cloud-controller-manager-ds.yml.j2
@@ -31,8 +31,6 @@ spec:
- key: node.cloudprovider.kubernetes.io/uninitialized
value: "true"
effect: NoSchedule
- - key: node-role.kubernetes.io/master
- effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
serviceAccountName: cloud-controller-manager
diff --git a/roles/kubernetes-apps/metallb/defaults/main.yml b/roles/kubernetes-apps/metallb/defaults/main.yml
index e9012dc1043ec5664d7fbe700617049313ac590f..22e2935b25f5a5f6601f0e9da6463516dda02573 100644
--- a/roles/kubernetes-apps/metallb/defaults/main.yml
+++ b/roles/kubernetes-apps/metallb/defaults/main.yml
@@ -9,9 +9,6 @@ metallb_speaker_nodeselector:
metallb_controller_nodeselector:
kubernetes.io/os: "linux"
metallb_speaker_tolerations:
- - effect: NoSchedule
- key: node-role.kubernetes.io/master
- operator: Exists
- effect: NoSchedule
key: node-role.kubernetes.io/control-plane
operator: Exists
diff --git a/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2 b/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
index 9bee26bc675bd50884851347fa4ef6a8da3be145..5dc4a376887b1cb180767dc5f3b129a25218f878 100644
--- a/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
+++ b/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
@@ -89,8 +89,6 @@ spec:
{% if not masters_are_not_tainted or metrics_server_extra_tolerations is defined %}
tolerations:
{% if not masters_are_not_tainted %}
- - key: node-role.kubernetes.io/master
- effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
{% endif %}
diff --git a/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2 b/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2
index f89e4d6acc91c59b65c290ab1538c9f158a1bada..490111c701e7bb129762792dcb723b3b2ed674da 100644
--- a/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2
+++ b/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2
@@ -28,8 +28,6 @@ spec:
tolerations:
- key: CriticalAddonsOnly
operator: Exists
- - key: node-role.kubernetes.io/master
- effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
{% if policy_controller_extra_tolerations is defined %}
diff --git a/roles/kubernetes/control-plane/tasks/kubeadm-setup.yml b/roles/kubernetes/control-plane/tasks/kubeadm-setup.yml
index 93a8fda6667e466c3ab456134a5dbf661fa06928..57baf411a30eb1f763d94309d4450ed64456dbe9 100644
--- a/roles/kubernetes/control-plane/tasks/kubeadm-setup.yml
+++ b/roles/kubernetes/control-plane/tasks/kubeadm-setup.yml
@@ -243,7 +243,6 @@
command: "{{ kubectl }} taint node {{ inventory_hostname }} {{ item }}"
delegate_to: "{{ first_kube_control_plane }}"
with_items:
- - "node-role.kubernetes.io/master:NoSchedule-"
- "node-role.kubernetes.io/control-plane:NoSchedule-"
when: inventory_hostname in groups['kube_node']
failed_when: false
diff --git a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2 b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2
index 64105719bf26c7ffe1150dd0bb9d67f7d344b7b4..bc3b8601eba41507db410cf9eeb01680dabc0eca 100644
--- a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2
+++ b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2
@@ -18,8 +18,6 @@ nodeRegistration:
{% endif %}
{% if inventory_hostname in groups['kube_control_plane'] and inventory_hostname not in groups['kube_node'] %}
taints:
- - effect: NoSchedule
- key: node-role.kubernetes.io/master
- effect: NoSchedule
key: node-role.kubernetes.io/control-plane
{% else %}
diff --git a/roles/kubernetes/control-plane/templates/kubeadm-controlplane.v1beta3.yaml.j2 b/roles/kubernetes/control-plane/templates/kubeadm-controlplane.v1beta3.yaml.j2
index fc696ae3eebc1c0625d9799753288fbb5a4276a4..c950d00b391fd3ca541dff9ddb7e53593b1fbb3f 100644
--- a/roles/kubernetes/control-plane/templates/kubeadm-controlplane.v1beta3.yaml.j2
+++ b/roles/kubernetes/control-plane/templates/kubeadm-controlplane.v1beta3.yaml.j2
@@ -21,8 +21,6 @@ nodeRegistration:
criSocket: {{ cri_socket }}
{% if inventory_hostname in groups['kube_control_plane'] and inventory_hostname not in groups['kube_node'] %}
taints:
- - effect: NoSchedule
- key: node-role.kubernetes.io/master
- effect: NoSchedule
key: node-role.kubernetes.io/control-plane
{% else %}
diff --git a/roles/network_plugin/calico/templates/calico-apiserver.yml.j2 b/roles/network_plugin/calico/templates/calico-apiserver.yml.j2
index 24293442eeada3dbd5c1437ed9313d17e13b16ef..78356194537d47f87f694cfb72273be526b4251b 100644
--- a/roles/network_plugin/calico/templates/calico-apiserver.yml.j2
+++ b/roles/network_plugin/calico/templates/calico-apiserver.yml.j2
@@ -92,8 +92,6 @@ spec:
serviceAccount: calico-apiserver
serviceAccountName: calico-apiserver
tolerations:
- - effect: NoSchedule
- key: node-role.kubernetes.io/master
- effect: NoSchedule
key: node-role.kubernetes.io/control-plane
volumes:
diff --git a/roles/network_plugin/calico/templates/calico-typha.yml.j2 b/roles/network_plugin/calico/templates/calico-typha.yml.j2
index 22d2f2cac53bb80f10d7f898efd98fcd74fffb32..2c6d5108bac5b1e9b55ba97416c4011baef1c600 100644
--- a/roles/network_plugin/calico/templates/calico-typha.yml.j2
+++ b/roles/network_plugin/calico/templates/calico-typha.yml.j2
@@ -61,9 +61,6 @@ spec:
kubernetes.io/os: linux
hostNetwork: true
tolerations:
- - key: node-role.kubernetes.io/master
- operator: Exists
- effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule