From a1cde03b2024bb0d1916add983598a4e31cda570 Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Mon, 25 Sep 2017 12:19:04 +0100 Subject: [PATCH] Correct master manifest cleanup logic (#1693) Fixes #1666 --- roles/kubernetes/master/tasks/pre-upgrade.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/kubernetes/master/tasks/pre-upgrade.yml b/roles/kubernetes/master/tasks/pre-upgrade.yml index 2e1aa269c..588db8833 100644 --- a/roles/kubernetes/master/tasks/pre-upgrade.yml +++ b/roles/kubernetes/master/tasks/pre-upgrade.yml @@ -17,14 +17,14 @@ file: path: "/etc/kubernetes/manifests/{{item}}.manifest" state: absent - with_nested: + with_items: - ["kube-apiserver", "kube-controller-manager", "kube-scheduler"] register: kube_apiserver_manifest_replaced when: (secret_changed|default(false) or etcd_secret_changed|default(false)) - name: "Pre-upgrade | Delete master containers forcefully" shell: "docker ps -f name=k8s-{{item}}* -q | xargs --no-run-if-empty docker rm -f" - with_nested: + with_items: - ["kube-apiserver", "kube-controller-manager", "kube-scheduler"] when: kube_apiserver_manifest_replaced.changed run_once: true