From 228efcba0e943e8dbac06244e9b2334a1ea52019 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Unai=20Arr=C3=ADen?= Date: Tue, 17 Oct 2023 21:39:40 +0200 Subject: [PATCH] =?UTF-8?q?Migrate=20node-role.kubernetes.io/master=20to?= =?UTF-8?q?=20node-role.kubernetes.io/con=E2=80=A6=20(#10464)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Migrate node-role.kubernetes.io/master to node-role.kubernetes.io/control-plane * Migrate node-role.kubernetes.io/master to node-role.kubernetes.io/control-plane * Migrate node-role.kubernetes.io/master to node-role.kubernetes.io/control-plane --- docs/metallb.md | 4 ---- inventory/sample/group_vars/k8s_cluster/addons.yml | 14 -------------- .../ansible/templates/coredns-deployment.yml.j2 | 2 -- .../ansible/templates/dashboard.yml.j2 | 4 ---- .../ansible/templates/dns-autoscaler.yml.j2 | 2 -- .../oci/templates/oci-cloud-provider.yml.j2 | 3 --- .../azure-csi-azuredisk-controller.yml.j2 | 2 -- .../vsphere-csi-controller-deployment.yml.j2 | 3 --- ...loud-controller-manager-ds-with-networks.yml.j2 | 3 --- ...ernal-hcloud-cloud-controller-manager-ds.yml.j2 | 2 -- ...ernal-huawei-cloud-controller-manager-ds.yml.j2 | 2 -- ...al-openstack-cloud-controller-manager-ds.yml.j2 | 2 -- ...rnal-vsphere-cloud-controller-manager-ds.yml.j2 | 2 -- roles/kubernetes-apps/metallb/defaults/main.yml | 3 --- .../templates/metrics-server-deployment.yaml.j2 | 2 -- .../templates/calico-kube-controllers.yml.j2 | 2 -- .../control-plane/tasks/kubeadm-setup.yml | 1 - .../templates/kubeadm-config.v1beta3.yaml.j2 | 2 -- .../templates/kubeadm-controlplane.v1beta3.yaml.j2 | 2 -- .../calico/templates/calico-apiserver.yml.j2 | 2 -- .../calico/templates/calico-typha.yml.j2 | 3 --- 21 files changed, 62 deletions(-) diff --git a/docs/metallb.md b/docs/metallb.md index 94b81fa27..00f52b619 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 8882b5212..f8a4c2dda 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 6cb760434..d2123937f 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 b0c341926..7d2872535 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 c08540534..c10ebf97f 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 6b45d818c..e1fc11d21 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 36d38acaa..13e9b023e 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 dd009d8f7..93ad8b847 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 ec64d9a30..8279a44c5 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 a581781fb..64422101c 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 5e4b424f5..b9b2ec354 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 565875dff..1c1eda8c5 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 5f1068d81..05e4ac300 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 e9012dc10..22e2935b2 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 9bee26bc6..5dc4a3768 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 f89e4d6ac..490111c70 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 93a8fda66..57baf411a 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 64105719b..bc3b8601e 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 fc696ae3e..c950d00b3 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 24293442e..783561945 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 22d2f2cac..2c6d5108b 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