Migrate node-role.kubernetes.io/master to node-role.kubernetes.io/con…

…trol-plane
kubernetes-sigs · Oct 17, 2023 · a1c09a0 · a1c09a0
1 parent 0128a2c
commit a1c09a0
Show file tree

Hide file tree

Showing 20 changed files with 0 additions and 67 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...troller/hcloud/templates/external-hcloud-cloud-controller-manager-ds-with-networks.yml.j2 b/...troller/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/...rnal_cloud_controller/hcloud/templates/external-hcloud-cloud-controller-manager-ds.yml.j2 b/...rnal_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/...cloud_controller/huaweicloud/templates/external-huawei-cloud-controller-manager-ds.yml.j2 b/...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/...loud_controller/openstack/templates/external-openstack-cloud-controller-manager-ds.yml.j2 b/...loud_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/...al_cloud_controller/vsphere/templates/external-vsphere-cloud-controller-manager-ds.yml.j2 b/...al_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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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

diff --git a/roles/upgrade/post-upgrade/tasks/main.yml b/roles/upgrade/post-upgrade/tasks/main.yml
@@ -11,15 +11,6 @@
     --timeout={{ upgrade_post_cilium_wait_timeout }}
   delegate_to: "{{ groups['kube_control_plane'][0] }}"
 
-- name: Ensure control-plane taints after upgrade
-  command: "{{ kubectl }} taint --overwrite node {{ kube_override_hostname|default(inventory_hostname) }} {{ item }}"
-  delegate_to: "{{ groups['kube_control_plane'][0] }}"
-  with_items:
-    - "node-role.kubernetes.io/control-plane:NoSchedule"
-  when:
-    - inventory_hostname in groups['kube_control_plane']
-    - inventory_hostname not in groups['kube_node']
-
 - name: Confirm node uncordon
   pause:
     echo: yes