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

Merge pull request #412 from kubespray/optionalkubeletcni

Browse Source 
Copy hyperkube cni plugins optionally for calico deployment
This commit is contained in:
Smaine Kahlouch
2016-08-16 14:00:27 +02:00
committed by GitHub
parent 612266f3e5 f073ee91ea
commit c6f2102073
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
roles/network_plugin/calico/defaults/main.yml
View File

@@ -9,3 +9,8 @@ ipip: false
# cloud_provider: # cloud_provider:
calicoctl_image_repo: calico/ctl calicoctl_image_repo: calico/ctl
calicoctl_image_tag: "{{ calico_version }}" calicoctl_image_tag: "{{ calico_version }}"
# Set to true if your Hyperkube has all required components to run
# calico. This is required in order to run canalized calico.
use_hyperkube_cni: false

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

@@ -25,10 +25,17 @@
- name: Calico | Install calico cni bin - name: Calico | Install calico cni bin
command: rsync -piu "{{ local_release_dir }}/calico/bin/calico" "/opt/cni/bin/calico" command: rsync -piu "{{ local_release_dir }}/calico/bin/calico" "/opt/cni/bin/calico"
changed_when: false changed_when: false
when: not use_hyperkube_cni
- name: Calico | Install calico-ipam cni bin - name: Calico | Install calico-ipam cni bin
command: rsync -piu "{{ local_release_dir }}/calico/bin/calico" "/opt/cni/bin/calico-ipam" command: rsync -piu "{{ local_release_dir }}/calico/bin/calico" "/opt/cni/bin/calico-ipam"
changed_when: false changed_when: false
when: not use_hyperkube_cni
- name: Calico | Copy cni plugins from hyperkube
command: "/usr/bin/docker run --rm -v /opt/cni/bin:/cnibindir {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }} /bin/cp -r /opt/cni/bin/. /cnibindir/"
changed_when: false
when: use_hyperkube_cni
- name: Calico | wait for etcd - name: Calico | wait for etcd
uri: url=http://localhost:2379/health uri: url=http://localhost:2379/health