From 6ae70e03cb2ba2e08277cb50d862aafc99125347 Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Fri, 10 Feb 2017 13:27:41 +0300 Subject: [PATCH] fixup upgrades for canal and weave --- roles/kubernetes-apps/network_plugin/canal/tasks/main.yaml | 2 +- roles/network_plugin/weave/tasks/pre-upgrade.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/kubernetes-apps/network_plugin/canal/tasks/main.yaml b/roles/kubernetes-apps/network_plugin/canal/tasks/main.yaml index 2133e85fb..f5ffc4393 100644 --- a/roles/kubernetes-apps/network_plugin/canal/tasks/main.yaml +++ b/roles/kubernetes-apps/network_plugin/canal/tasks/main.yaml @@ -13,7 +13,7 @@ kube: name: "canal-node" kubectl: "{{ bin_dir }}/kubectl" - filename: "{{ kube_config_dir }}/canal-node.yml" + filename: "{{ kube_config_dir }}/canal-node.yaml" resource: "ds" namespace: "{{system_namespace}}" state: absent diff --git a/roles/network_plugin/weave/tasks/pre-upgrade.yml b/roles/network_plugin/weave/tasks/pre-upgrade.yml index 42a031f45..0b10a7551 100644 --- a/roles/network_plugin/weave/tasks/pre-upgrade.yml +++ b/roles/network_plugin/weave/tasks/pre-upgrade.yml @@ -37,3 +37,5 @@ - name: Weave pre-upgrade | Purge legacy weave docker containers shell: "docker ps -af 'name=^/weave.*' -q | xargs --no-run-if-empty docker rm -f" + retries: 3 + failed_when: false