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

Merge pull request #2538 from hswong3i/weave-2.2.1-fixup

Browse source 
Fixup #2523: Upgrade Weave to 2.2.1
This commit is contained in:
Andreas Krüger 2018-03-28 11:06:33 +02:00 committed by GitHub
commit c78f5393c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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: