epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-14 05:45:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Migrate node-role.kubernetes.io/master to node-role.kubernetes.io/con… (#10464)

Browse Source 
* 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
This commit is contained in:
Unai Arríen
2023-10-17 21:39:40 +02:00
committed by GitHub
parent 401ea552c2
commit 228efcba0e
21 changed files with 0 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/metallb.md
View File

@@ -29,10 +29,6 @@ metallb_config:
nodeselector: nodeselector:
kubernetes.io/os: linux kubernetes.io/os: linux
tolerations: tolerations:
- key: "node-role.kubernetes.io/master"
operator: "Equal"
value: ""
effect: "NoSchedule"
- key: "node-role.kubernetes.io/control-plane" - key: "node-role.kubernetes.io/control-plane"
operator: "Equal" operator: "Equal"
value: "" value: ""

14
inventory/sample/group_vars/k8s_cluster/addons.yml
View File

@@ -103,10 +103,6 @@ ingress_publish_status_address: ""
# ingress_nginx_nodeselector: # ingress_nginx_nodeselector:
# kubernetes.io/os: "linux" # kubernetes.io/os: "linux"
# ingress_nginx_tolerations: # ingress_nginx_tolerations:
# - key: "node-role.kubernetes.io/master"
# operator: "Equal"
# value: ""
# effect: "NoSchedule"
# - key: "node-role.kubernetes.io/control-plane" # - key: "node-role.kubernetes.io/control-plane"
# operator: "Equal" # operator: "Equal"
# value: "" # value: ""
@@ -140,8 +136,6 @@ ingress_alb_enabled: false
cert_manager_enabled: false cert_manager_enabled: false
# cert_manager_namespace: "cert-manager" # cert_manager_namespace: "cert-manager"
# cert_manager_tolerations: # cert_manager_tolerations:
# - key: node-role.kubernetes.io/master
# effect: NoSchedule
# - key: node-role.kubernetes.io/control-plane # - key: node-role.kubernetes.io/control-plane
# effect: NoSchedule # effect: NoSchedule
# cert_manager_affinity: # cert_manager_affinity:
@@ -185,10 +179,6 @@ metallb_speaker_enabled: "{{ metallb_enabled }}"
# nodeselector: # nodeselector:
# kubernetes.io/os: "linux" # kubernetes.io/os: "linux"
# tollerations: # tollerations:
# - key: "node-role.kubernetes.io/master"
# operator: "Equal"
# value: ""
# effect: "NoSchedule"
# - key: "node-role.kubernetes.io/control-plane" # - key: "node-role.kubernetes.io/control-plane"
# operator: "Equal" # operator: "Equal"
# value: "" # value: ""
@@ -197,10 +187,6 @@ metallb_speaker_enabled: "{{ metallb_enabled }}"
# nodeselector: # nodeselector:
# kubernetes.io/os: "linux" # kubernetes.io/os: "linux"
# tolerations: # tolerations:
# - key: "node-role.kubernetes.io/master"
# operator: "Equal"
# value: ""
# effect: "NoSchedule"
# - key: "node-role.kubernetes.io/control-plane" # - key: "node-role.kubernetes.io/control-plane"
# operator: "Equal" # operator: "Equal"
# value: "" # value: ""

2
roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
View File

@@ -32,8 +32,6 @@ spec:
priorityClassName: system-cluster-critical priorityClassName: system-cluster-critical
serviceAccountName: coredns serviceAccountName: coredns
tolerations: tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane - key: node-role.kubernetes.io/control-plane
effect: NoSchedule effect: NoSchedule
{% if dns_extra_tolerations is defined %} {% if dns_extra_tolerations is defined %}

4
roles/kubernetes-apps/ansible/templates/dashboard.yml.j2
View File

@@ -225,8 +225,6 @@ spec:
serviceAccountName: kubernetes-dashboard serviceAccountName: kubernetes-dashboard
{% if dashboard_master_toleration %} {% if dashboard_master_toleration %}
tolerations: tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane - key: node-role.kubernetes.io/control-plane
effect: NoSchedule effect: NoSchedule
{% endif %} {% endif %}
@@ -332,8 +330,6 @@ spec:
emptyDir: {} emptyDir: {}
{% if dashboard_master_toleration %} {% if dashboard_master_toleration %}
tolerations: tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane - key: node-role.kubernetes.io/control-plane
effect: NoSchedule effect: NoSchedule
{% endif %} {% endif %}

2
roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
View File

@@ -42,8 +42,6 @@ spec:
nodeSelector: nodeSelector:
kubernetes.io/os: linux kubernetes.io/os: linux
tolerations: tolerations:
- effect: NoSchedule
key: node-role.kubernetes.io/master
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/control-plane key: node-role.kubernetes.io/control-plane
{% if dns_autoscaler_extra_tolerations is defined %} {% if dns_autoscaler_extra_tolerations is defined %}

3
roles/kubernetes-apps/cloud_controller/oci/templates/oci-cloud-provider.yml.j2
View File

@@ -41,9 +41,6 @@ spec:
- key: node.cloudprovider.kubernetes.io/uninitialized - key: node.cloudprovider.kubernetes.io/uninitialized
value: "true" value: "true"
effect: NoSchedule effect: NoSchedule
- key: node-role.kubernetes.io/master
operator: Exists
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane - key: node-role.kubernetes.io/control-plane
operator: Exists operator: Exists
effect: NoSchedule effect: NoSchedule

2
roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-controller.yml.j2
View File

@@ -20,8 +20,6 @@ spec:
kubernetes.io/os: linux kubernetes.io/os: linux
priorityClassName: system-cluster-critical priorityClassName: system-cluster-critical
tolerations: tolerations:
- key: "node-role.kubernetes.io/master"
effect: "NoSchedule"
- key: "node-role.kubernetes.io/control-plane" - key: "node-role.kubernetes.io/control-plane"
effect: "NoSchedule" effect: "NoSchedule"
{% if azure_csi_controller_affinity %} {% if azure_csi_controller_affinity %}

3
roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-controller-deployment.yml.j2
View File

@@ -34,9 +34,6 @@ spec:
nodeSelector: nodeSelector:
node-role.kubernetes.io/control-plane: "" node-role.kubernetes.io/control-plane: ""
tolerations: tolerations:
- operator: "Exists"
key: node-role.kubernetes.io/master
effect: NoSchedule
- operator: "Exists" - operator: "Exists"
key: node-role.kubernetes.io/control-plane key: node-role.kubernetes.io/control-plane
effect: NoSchedule effect: NoSchedule

3
roles/kubernetes-apps/external_cloud_controller/hcloud/templates/external-hcloud-cloud-controller-manager-ds-with-networks.yml.j2
View File

@@ -25,9 +25,6 @@ spec:
effect: "NoSchedule" effect: "NoSchedule"
- key: "CriticalAddonsOnly" - key: "CriticalAddonsOnly"
operator: "Exists" operator: "Exists"
- key: "node-role.kubernetes.io/master"
effect: NoSchedule
operator: Exists
- key: "node-role.kubernetes.io/control-plane" - key: "node-role.kubernetes.io/control-plane"
effect: NoSchedule effect: NoSchedule
operator: Exists operator: Exists

2
roles/kubernetes-apps/external_cloud_controller/hcloud/templates/external-hcloud-cloud-controller-manager-ds.yml.j2
View File

@@ -27,8 +27,6 @@ spec:
effect: "NoSchedule" effect: "NoSchedule"
- key: "CriticalAddonsOnly" - key: "CriticalAddonsOnly"
operator: "Exists" operator: "Exists"
- key: "node-role.kubernetes.io/master"
effect: NoSchedule
- key: "node-role.kubernetes.io/control-plane" - key: "node-role.kubernetes.io/control-plane"
effect: NoSchedule effect: NoSchedule
- key: "node.kubernetes.io/not-ready" - key: "node.kubernetes.io/not-ready"

2
roles/kubernetes-apps/external_cloud_controller/huaweicloud/templates/external-huawei-cloud-controller-manager-ds.yml.j2
View File

@@ -35,8 +35,6 @@ spec:
- key: node.cloudprovider.kubernetes.io/uninitialized - key: node.cloudprovider.kubernetes.io/uninitialized
value: "true" value: "true"
effect: NoSchedule effect: NoSchedule
- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane - key: node-role.kubernetes.io/control-plane
effect: NoSchedule effect: NoSchedule
serviceAccountName: cloud-controller-manager serviceAccountName: cloud-controller-manager

2
roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-controller-manager-ds.yml.j2
View File

@@ -31,8 +31,6 @@ spec:
- key: node.cloudprovider.kubernetes.io/uninitialized - key: node.cloudprovider.kubernetes.io/uninitialized
value: "true" value: "true"
effect: NoSchedule effect: NoSchedule
- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane - key: node-role.kubernetes.io/control-plane
effect: NoSchedule effect: NoSchedule
serviceAccountName: cloud-controller-manager serviceAccountName: cloud-controller-manager

2
roles/kubernetes-apps/external_cloud_controller/vsphere/templates/external-vsphere-cloud-controller-manager-ds.yml.j2
View File

@@ -31,8 +31,6 @@ spec:
- key: node.cloudprovider.kubernetes.io/uninitialized - key: node.cloudprovider.kubernetes.io/uninitialized
value: "true" value: "true"
effect: NoSchedule effect: NoSchedule
- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane - key: node-role.kubernetes.io/control-plane
effect: NoSchedule effect: NoSchedule
serviceAccountName: cloud-controller-manager serviceAccountName: cloud-controller-manager

3
roles/kubernetes-apps/metallb/defaults/main.yml
View File

@@ -9,9 +9,6 @@ metallb_speaker_nodeselector:
metallb_controller_nodeselector: metallb_controller_nodeselector:
kubernetes.io/os: "linux" kubernetes.io/os: "linux"
metallb_speaker_tolerations: metallb_speaker_tolerations:
- effect: NoSchedule
key: node-role.kubernetes.io/master
operator: Exists
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/control-plane key: node-role.kubernetes.io/control-plane
operator: Exists operator: Exists

2
roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
View File

@@ -89,8 +89,6 @@ spec:
{% if not masters_are_not_tainted or metrics_server_extra_tolerations is defined %} {% if not masters_are_not_tainted or metrics_server_extra_tolerations is defined %}
tolerations: tolerations:
{% if not masters_are_not_tainted %} {% if not masters_are_not_tainted %}
- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane - key: node-role.kubernetes.io/control-plane
effect: NoSchedule effect: NoSchedule
{% endif %} {% endif %}

2
roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2
View File

@@ -28,8 +28,6 @@ spec:
tolerations: tolerations:
- key: CriticalAddonsOnly - key: CriticalAddonsOnly
operator: Exists operator: Exists
- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane - key: node-role.kubernetes.io/control-plane
effect: NoSchedule effect: NoSchedule
{% if policy_controller_extra_tolerations is defined %} {% if policy_controller_extra_tolerations is defined %}

1
roles/kubernetes/control-plane/tasks/kubeadm-setup.yml
View File

@@ -243,7 +243,6 @@
command: "{{ kubectl }} taint node {{ inventory_hostname }} {{ item }}" command: "{{ kubectl }} taint node {{ inventory_hostname }} {{ item }}"
delegate_to: "{{ first_kube_control_plane }}" delegate_to: "{{ first_kube_control_plane }}"
with_items: with_items:
- "node-role.kubernetes.io/master:NoSchedule-"
- "node-role.kubernetes.io/control-plane:NoSchedule-" - "node-role.kubernetes.io/control-plane:NoSchedule-"
when: inventory_hostname in groups['kube_node'] when: inventory_hostname in groups['kube_node']
failed_when: false failed_when: false

2
roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2
View File

@@ -18,8 +18,6 @@ nodeRegistration:
{% endif %} {% endif %}
{% if inventory_hostname in groups['kube_control_plane'] and inventory_hostname not in groups['kube_node'] %} {% if inventory_hostname in groups['kube_control_plane'] and inventory_hostname not in groups['kube_node'] %}
taints: taints:
- effect: NoSchedule
key: node-role.kubernetes.io/master
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/control-plane key: node-role.kubernetes.io/control-plane
{% else %} {% else %}

2
roles/kubernetes/control-plane/templates/kubeadm-controlplane.v1beta3.yaml.j2
View File

@@ -21,8 +21,6 @@ nodeRegistration:
criSocket: {{ cri_socket }} criSocket: {{ cri_socket }}
{% if inventory_hostname in groups['kube_control_plane'] and inventory_hostname not in groups['kube_node'] %} {% if inventory_hostname in groups['kube_control_plane'] and inventory_hostname not in groups['kube_node'] %}
taints: taints:
- effect: NoSchedule
key: node-role.kubernetes.io/master
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/control-plane key: node-role.kubernetes.io/control-plane
{% else %} {% else %}

2
roles/network_plugin/calico/templates/calico-apiserver.yml.j2
View File

@@ -92,8 +92,6 @@ spec:
serviceAccount: calico-apiserver serviceAccount: calico-apiserver
serviceAccountName: calico-apiserver serviceAccountName: calico-apiserver
tolerations: tolerations:
- effect: NoSchedule
key: node-role.kubernetes.io/master
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/control-plane key: node-role.kubernetes.io/control-plane
volumes: volumes:

3
roles/network_plugin/calico/templates/calico-typha.yml.j2
View File

@@ -61,9 +61,6 @@ spec:
kubernetes.io/os: linux kubernetes.io/os: linux
hostNetwork: true hostNetwork: true
tolerations: tolerations:
- key: node-role.kubernetes.io/master
operator: Exists
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane - key: node-role.kubernetes.io/control-plane
operator: Exists operator: Exists
effect: NoSchedule effect: NoSchedule