Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate node-role.kubernetes.io/master to node-role.kubernetes.io/control-plane #10532

Merged
merged 4 commits into from
Oct 25, 2023
Merged

Migrate node-role.kubernetes.io/master to node-role.kubernetes.io/control-plane #10532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
577bf95
Migrate node-role.kubernetes.io/master to node-role.kubernetes.io/con…
unai-ttxu Oct 17, 2023
bd1990a
Migrate node-role.kubernetes.io/master to node-role.kubernetes.io/con…
unai-ttxu Oct 17, 2023
6349e84
Migrate node-role.kubernetes.io/master to node-role.kubernetes.io/con…
unai-ttxu Oct 17, 2023
be60f9d
Migrate node-role.kubernetes.io/master to node-role.kubernetes.io/con…
unai-ttxu Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion roles/kubernetes/control-plane/tasks/kubeadm-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
2 changes: 0 additions & 2 deletions roles/kubernetes/control-plane/templates/kubeadm-controlplane.v1beta3.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
25 changes: 25 additions & 0 deletions roles/upgrade/pre-upgrade/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,31 @@
false
{%- endif %}

# Legacy taint: key = node-role.kubernetes.io/master, effect = NoSchedule
# New taint: key = node-role.kubernetes.io/control-plane, effect = NoSchedule
#
# During the upgrade to k8s v1.25 legacy taint is deleted:
# https://github.com/kubernetes/kubernetes/commit/ddd046f3dd88186cbc83b57e83144db96eae4af4
#
# In order to avoid taint lost we need to ensure node-role.kubernetes.io/control-plane:NoSchedule
# if node-role.kubernetes.io/master:NoSchedule is set prior to k8s upgrade
- name: See if node has legacy taints
command: >
{{ kubectl }} get node {{ kube_override_hostname | default(inventory_hostname) }}
-o jsonpath='{.spec.taints[?(@.key=="node-role.kubernetes.io/master")]}'
register: kubectl_node_legacy_taints
delegate_to: "{{ groups['kube_control_plane'][0] }}"
failed_when: false
changed_when: false

- name: Migrate node legacy taints
command: >
{{ kubectl }} taint --overwrite node {{ kube_override_hostname | default(inventory_hostname) }}
node-role.kubernetes.io/control-plane:NoSchedule
delegate_to: "{{ groups['kube_control_plane'][0] }}"
when:
- kubectl_node_legacy_taints.stdout | length

- name: Node draining
delegate_to: "{{ groups['kube_control_plane'][0] }}"
when:
Expand Down