From 5f75d4c09905ab437cbd61935eca3c247064851c Mon Sep 17 00:00:00 2001 From: Abdelsalam Abbas Date: Tue, 27 Jun 2017 22:11:44 +0200 Subject: [PATCH] Uncodron Masters which have scheduling Enabled --- roles/upgrade/post-upgrade/tasks/main.yml | 3 ++- upgrade-cluster.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/upgrade/post-upgrade/tasks/main.yml b/roles/upgrade/post-upgrade/tasks/main.yml index c32f42491..e7efa0601 100644 --- a/roles/upgrade/post-upgrade/tasks/main.yml +++ b/roles/upgrade/post-upgrade/tasks/main.yml @@ -3,4 +3,5 @@ - name: Uncordon node command: "{{ bin_dir }}/kubectl uncordon {{ inventory_hostname }}" delegate_to: "{{ groups['kube-master'][0] }}" - when: needs_cordoning|default(false) + when: (needs_cordoning|default(false)) and ( {%- if inventory_hostname in groups['kube-node'] -%} true {%- else -%} false {%- endif -%} ) + diff --git a/upgrade-cluster.yml b/upgrade-cluster.yml index 09f268ecf..1a66904ce 100644 --- a/upgrade-cluster.yml +++ b/upgrade-cluster.yml @@ -67,6 +67,7 @@ - { role: kubernetes/node, tags: node } - { role: kubernetes/master, tags: master } - { role: network_plugin, tags: network } + - { role: upgrade/post-upgrade, tags: post-upgrade } #Finally handle worker upgrades, based on given batch size - hosts: kube-node:!kube-master