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

Create network policy directory for canal

Browse source
This commit is contained in:
Brad Beam 2017-01-04 16:51:11 -06:00
parent 65c86377fc
commit cf042b2a4c
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/network_plugin/canal/defaults/main.yml
View file

@ -14,6 +14,9 @@ canal_log_level: "info"
canal_cert_dir: /etc/canal/certs canal_cert_dir: /etc/canal/certs
etcd_cert_dir: /etc/ssl/etcd/ssl etcd_cert_dir: /etc/ssl/etcd/ssl
# Canal Network Policy directory
canal_policy_dir: /etc/kubernetes/policy
# Limits for apps # Limits for apps
calico_node_memory_limit: 500M calico_node_memory_limit: 500M
calico_node_cpu_limit: 200m calico_node_cpu_limit: 200m
@ -27,3 +30,4 @@ calicoctl_memory_limit: 170M
calicoctl_cpu_limit: 100m calicoctl_cpu_limit: 100m
calicoctl_memory_requests: 70M calicoctl_memory_requests: 70M
calicoctl_cpu_requests: 50m calicoctl_cpu_requests: 50m

5
roles/network_plugin/canal/tasks/main.yml
View file

@ -68,3 +68,8 @@
owner: root owner: root
group: root group: root
changed_when: false changed_when: false
- name: Canal | Create network policy directory
file:
path: "{{ canal_policy_dir }}"
state: directory

3
roles/network_plugin/canal/templates/calicoctl-container.j2
View file

@ -8,7 +8,8 @@
-v {{ docker_bin_dir }}/docker:{{ docker_bin_dir }}/docker \ -v {{ docker_bin_dir }}/docker:{{ docker_bin_dir }}/docker \
-v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/docker.sock:/var/run/docker.sock \
-v /var/run/calico:/var/run/calico \ -v /var/run/calico:/var/run/calico \
-v {{ canal_cert_dir }}:{{ calico_cert_dir }}:ro \ -v {{ canal_cert_dir }}:{{ canal_cert_dir }}:ro \
-v {{ canal_policy_dir }}:{{ canal_policy_dir }}:ro \
--memory={{ calicoctl_memory_limit|regex_replace('Mi', 'M') }} --cpu-shares={{ calicoctl_cpu_limit|regex_replace('m', '') }} \ --memory={{ calicoctl_memory_limit|regex_replace('Mi', 'M') }} --cpu-shares={{ calicoctl_cpu_limit|regex_replace('m', '') }} \
{{ calicoctl_image_repo }}:{{ calicoctl_image_tag}} \ {{ calicoctl_image_repo }}:{{ calicoctl_image_tag}} \
$@ $@