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

Fixup #2523: Upgrade Weave to 2.2.1
2018-03-28 11:06:33 +02:00 · 2018-03-28 11:06:33 +02:00 · c78f5393c3
commit c78f5393c3
parent fda49564bf 848fc323db
3 changed files with 6 additions and 2 deletions
--- a/roles/network_plugin/weave/tasks/main.yml
+++ b/roles/network_plugin/weave/tasks/main.yml
@ -4,7 +4,7 @@

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

--- a/roles/network_plugin/weave/templates/00-weave.conflist.j2
+++ b/roles/network_plugin/weave/templates/00-weave.conflist.j2
--- a/roles/network_plugin/weave/templates/weave-net.yml.j2
+++ b/roles/network_plugin/weave/templates/weave-net.yml.j2
@ -141,7 +141,11 @@ items:
                initialDelaySeconds: 30
              resources:
                requests:
-                  cpu: 10m
+                  cpu: {{ weave_cpu_requests }}
+                  memory: {{ weave_memory_requests }}
+                limits:
+                  cpu: {{ weave_cpu_limits }}
+                  memory: {{ weave_memory_limits }}
              securityContext:
                privileged: true
              volumeMounts: