C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixup upgrades for canal and weave

Browse source
This commit is contained in:
Matthew Mosesohn 2017-02-10 13:27:41 +03:00
parent ee15f99dd7
commit 6ae70e03cb
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/kubernetes-apps/network_plugin/canal/tasks/main.yaml
View file

@ -13,7 +13,7 @@
kube: kube:
name: "canal-node" name: "canal-node"
kubectl: "{{ bin_dir }}/kubectl" kubectl: "{{ bin_dir }}/kubectl"
filename: "{{ kube_config_dir }}/canal-node.yml" filename: "{{ kube_config_dir }}/canal-node.yaml"
resource: "ds" resource: "ds"
namespace: "{{system_namespace}}" namespace: "{{system_namespace}}"
state: absent state: absent

2
roles/network_plugin/weave/tasks/pre-upgrade.yml
View file

@ -37,3 +37,5 @@
- name: Weave pre-upgrade | Purge legacy weave docker containers - name: Weave pre-upgrade | Purge legacy weave docker containers
shell: "docker ps -af 'name=^/weave.*' -q | xargs --no-run-if-empty docker rm -f" shell: "docker ps -af 'name=^/weave.*' -q | xargs --no-run-if-empty docker rm -f"
retries: 3
failed_when: false