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

Respect kube_override_hostname during removal/upgrade (#6347)

Browse Source 
* respect kube_override_hostname during removal/upgrade

* Use hostvars in loop
This commit is contained in:
Qasim Sarfraz
2020-07-13 16:18:40 +02:00
committed by GitHub
parent b347aefd61
commit feeb701c13
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/remove-node/post-remove/tasks/main.yml
View File

@@ -1,5 +1,5 @@
---
- name: Delete node
command: "{{ bin_dir }}/kubectl delete node {{ inventory_hostname }}"
command: "{{ bin_dir }}/kubectl delete node {{ kube_override_hostname|default(inventory_hostname) }}"
delegate_to: "{{ groups['kube-master']|first }}"
ignore_errors: yes

4
roles/remove-node/pre-remove/tasks/main.yml
View File

@@ -1,7 +1,7 @@
---
- name: cordon-node | Mark all nodes as unschedulable before drain
command: >-
{{ bin_dir }}/kubectl cordon {{ item }}
{{ bin_dir }}/kubectl cordon {{ hostvars[item]['kube_override_hostname']|default(item) }}
with_items:
- "{{ node.split(',') | default(groups['kube-node']) }}"
failed_when: false
@@ -16,7 +16,7 @@
--ignore-daemonsets
--grace-period {{ drain_grace_period }}
--timeout {{ drain_timeout }}
--delete-local-data {{ item }}
--delete-local-data {{ hostvars[item]['kube_override_hostname']|default(item) }}
with_items:
- "{{ node.split(',') | default(groups['kube-node']) }}"
failed_when: false