diff --git a/roles/network_plugin/weave/tasks/main.yml b/roles/network_plugin/weave/tasks/main.yml index a8dfa05864771f0277f2b624cb2ac91536624816..c2c5d82c00e42b8286b8dd7ab1e2c60cb9d731f1 100644 --- 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 diff --git a/roles/network_plugin/weave/templates/weavenet.conflist.j2 b/roles/network_plugin/weave/templates/00-weave.conflist.j2 similarity index 100% rename from roles/network_plugin/weave/templates/weavenet.conflist.j2 rename to roles/network_plugin/weave/templates/00-weave.conflist.j2 diff --git a/roles/network_plugin/weave/templates/weave-net.yml.j2 b/roles/network_plugin/weave/templates/weave-net.yml.j2 index 70b70b3f8ba7a774410be2229ade952e42fcab66..699ba3128410e862438fea419e68cad9cd2e6c17 100644 --- 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: