kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix drain rescue task when `kube_override_hostname` is set (#9556) 

This fixes a task failure in the rescue block that uncordons nodes after an unsuccessful drain. The issue occurs when `kube_override_hostname` is set and does not match `inventory_hostname`.
pull/9557/head
Chad Swenson 2022-12-08 18:02:11 -06:00 committed by GitHub
parent 3dc384a17a
commit 4f32f94a51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/upgrade/pre-upgrade/tasks/main.yml
View File

@ -119,11 +119,11 @@
rescue: rescue:
- name: Set node back to schedulable - name: Set node back to schedulable
command: "{{ kubectl }} uncordon {{ inventory_hostname }}" command: "{{ kubectl }} uncordon {{ kube_override_hostname|default(inventory_hostname) }}"
when: upgrade_node_uncordon_after_drain_failure when: upgrade_node_uncordon_after_drain_failure
- name: Fail after rescue - name: Fail after rescue
fail: fail:
msg: "Failed to drain node {{ inventory_hostname }}" msg: "Failed to drain node {{ kube_override_hostname|default(inventory_hostname) }}"
when: upgrade_node_fail_if_drain_fails when: upgrade_node_fail_if_drain_fails
delegate_to: "{{ groups['kube_control_plane'][0] }}" delegate_to: "{{ groups['kube_control_plane'][0] }}"
when: when: