Adding calicoctl to canal deployment
This commit is contained in:
parent
96372c15e2
commit
65c86377fc
3 changed files with 27 additions and 0 deletions
|
@ -23,3 +23,7 @@ flannel_memory_limit: 500M
|
||||||
flannel_cpu_limit: 200m
|
flannel_cpu_limit: 200m
|
||||||
flannel_memory_requests: 256M
|
flannel_memory_requests: 256M
|
||||||
flannel_cpu_requests: 100m
|
flannel_cpu_requests: 100m
|
||||||
|
calicoctl_memory_limit: 170M
|
||||||
|
calicoctl_cpu_limit: 100m
|
||||||
|
calicoctl_memory_requests: 70M
|
||||||
|
calicoctl_cpu_requests: 50m
|
||||||
|
|
|
@ -59,3 +59,12 @@
|
||||||
delay: "{{ retry_stagger | random + 3 }}"
|
delay: "{{ retry_stagger | random + 3 }}"
|
||||||
changed_when: false
|
changed_when: false
|
||||||
tags: [hyperkube, upgrade]
|
tags: [hyperkube, upgrade]
|
||||||
|
|
||||||
|
- name: Canal | Install calicoctl container script
|
||||||
|
template:
|
||||||
|
src: calicoctl-container.j2
|
||||||
|
dest: "{{ bin_dir }}/calicoctl"
|
||||||
|
mode: 0755
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
changed_when: false
|
||||||
|
|
14
roles/network_plugin/canal/templates/calicoctl-container.j2
Normal file
14
roles/network_plugin/canal/templates/calicoctl-container.j2
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
#!/bin/bash
|
||||||
|
{{ docker_bin_dir }}/docker run -i --privileged --rm \
|
||||||
|
--net=host --pid=host \
|
||||||
|
-e ETCD_ENDPOINTS={{ etcd_access_endpoint }} \
|
||||||
|
-e ETCD_CA_CERT_FILE={{ canal_cert_dir }}/ca_cert.crt \
|
||||||
|
-e ETCD_CERT_FILE={{ canal_cert_dir }}/cert.crt \
|
||||||
|
-e ETCD_KEY_FILE={{ canal_cert_dir }}/key.pem \
|
||||||
|
-v {{ docker_bin_dir }}/docker:{{ docker_bin_dir }}/docker \
|
||||||
|
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||||
|
-v /var/run/calico:/var/run/calico \
|
||||||
|
-v {{ canal_cert_dir }}:{{ calico_cert_dir }}:ro \
|
||||||
|
--memory={{ calicoctl_memory_limit|regex_replace('Mi', 'M') }} --cpu-shares={{ calicoctl_cpu_limit|regex_replace('m', '') }} \
|
||||||
|
{{ calicoctl_image_repo }}:{{ calicoctl_image_tag}} \
|
||||||
|
$@
|
Loading…
Reference in a new issue