External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-01 01:28:11 -03:30
Code Issues Packages Projects Releases Wiki Activity

Idempotency fixes (#1838)

Browse Source
This commit is contained in:
Matthew Mosesohn
2017-10-25 21:19:40 +01:00
committed by GitHub
parent 7123956ecd
commit 86fb669fd3
9 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/network_plugin/calico/tasks/main.yml
View File

@@ -60,7 +60,7 @@
- upgrade
- name: Calico | Copy cni plugins from calico/cni container
command: "{{ docker_bin_dir }}/docker run --rm -v /opt/cni/bin:/cnibindir {{ calico_cni_image_repo }}:{{ calico_cni_image_tag }} sh -c 'cp -a /opt/cni/bin/* /cnibindir/'"
command: "{{ docker_bin_dir }}/docker run --rm -v /opt/cni/bin:/cnibindir {{ calico_cni_image_repo }}:{{ calico_cni_image_tag }} sh -c 'cp /opt/cni/bin/* /cnibindir/'"
register: cni_task_result
until: cni_task_result.rc == 0
retries: 4

4
roles/network_plugin/canal/tasks/main.yml
View File

@@ -30,6 +30,7 @@
set /{{ cluster_name }}/network/config \
'{ "Network": "{{ kube_pods_subnet }}", "SubnetLen": {{ kube_network_node_prefix }}, "Backend": { "Type": "{{ flannel_backend_type }}" } }'
delegate_to: "{{groups['etcd'][0]}}"
changed_when: false
run_once: true
- name: Canal | Create canal node manifests
@@ -61,7 +62,7 @@
- upgrade
- name: Canal | Copy cni plugins from calico/cni
command: "{{ docker_bin_dir }}/docker run --rm -v /opt/cni/bin:/cnibindir {{ calico_cni_image_repo }}:{{ calico_cni_image_tag }} sh -c 'cp -a /opt/cni/bin/* /cnibindir/'"
command: "{{ docker_bin_dir }}/docker run --rm -v /opt/cni/bin:/cnibindir {{ calico_cni_image_repo }}:{{ calico_cni_image_tag }} sh -c 'cp /opt/cni/bin/* /cnibindir/'"
register: cni_task_result
until: cni_task_result.rc == 0
retries: 4
@@ -86,7 +87,6 @@
mode: 0755
owner: root
group: root
changed_when: false
- name: Canal | Create network policy directory
file: