epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-28 09:39:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #600 from adidenko/calico-cni-container-support

Browse Source 
Replace calico-cni binaries with calico/cni container
This commit is contained in:
Bogdan Dobrelya
2016-11-15 15:40:13 +01:00
committed by GitHub
parent 5f5199bf53 8092f57695
commit e587e82f7f
3 changed files with 8 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/network_plugin/calico/meta/main.yml
View File

@@ -1,9 +1,7 @@
---
dependencies:
- role: download
file: "{{ downloads.calico_cni_plugin }}"
- role: download
file: "{{ downloads.calico_cni_plugin_ipam }}"
file: "{{ downloads.calico_cni }}"
- role: download
file: "{{ downloads.calico_node }}"
- role: download

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

@@ -48,13 +48,12 @@
delay: "{{ retry_stagger | random + 3 }}"
changed_when: false
- name: Calico | Install calico cni bin
command: rsync -pi "{{ local_release_dir }}/calico/bin/calico" "/opt/cni/bin/calico"
changed_when: false
when: "{{ overwrite_hyperkube_cni|bool }}"
- name: Calico | Install calico-ipam cni bin
command: rsync -pi "{{ local_release_dir }}/calico/bin/calico-ipam" "/opt/cni/bin/calico-ipam"
- name: Calico | Copy cni plugins from calico/cni container
command: "/usr/bin/docker run --rm -v /opt/cni/bin:/cnibindir {{ calico_cni_image_repo }}:{{ calico_cni_image_tag }} sh -c 'cp -a /opt/cni/bin/* /cnibindir/'"
register: cni_task_result
until: cni_task_result.rc == 0
retries: 4
delay: "{{ retry_stagger | random + 3 }}"
changed_when: false
when: "{{ overwrite_hyperkube_cni|bool }}"