kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixup for #2523: 

- Rename template for /etc/cni/net.d/00-weave.conflist to 00-weave.conflist.j2
- Apply resources requests/limits to both container weave and weave-npc
pull/2538/head
Wong Hoi Sing Edison 2018-03-28 11:16:42 +08:00
parent 015ea62e92
commit 848fc323db
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
- name: template weavenet conflist - name: template weavenet conflist
template: template:
src: weavenet.conflist.j2 src: 00-weave.conflist.j2
dest: /etc/cni/net.d/00-weave.conflist dest: /etc/cni/net.d/00-weave.conflist
owner: kube owner: kube

0
roles/network_plugin/weave/templates/weavenet.conflist.j2 → roles/network_plugin/weave/templates/00-weave.conflist.j2
View File

6
roles/network_plugin/weave/templates/weave-net.yml.j2
View File

@ -141,7 +141,11 @@ items:
initialDelaySeconds: 30 initialDelaySeconds: 30
resources: resources:
requests: requests:
cpu: 10m cpu: {{ weave_cpu_requests }}
memory: {{ weave_memory_requests }}
limits:
cpu: {{ weave_cpu_limits }}
memory: {{ weave_memory_limits }}
securityContext: securityContext:
privileged: true privileged: true
volumeMounts: volumeMounts: