Weave limits (#2660)

* Raise limits for weave * Adjust weave limits
kubernetes-sigs · Apr 15, 2018 · 02cd541 · 02cd541
1 parent c7683f3
commit 02cd541
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 9 deletions.
diff --git a/roles/network_plugin/weave/defaults/main.yml b/roles/network_plugin/weave/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 # Limits
 weave_memory_limits: 400M
-weave_cpu_limits: 30m
+weave_cpu_limits: 300m
 weave_memory_requests: 64M
 weave_cpu_requests: 10m
 

diff --git a/tests/files/gce_centos-weave-kubeadm.yml b/tests/files/gce_centos-weave-kubeadm.yml
@@ -7,8 +7,6 @@ startup_script: ""
 
 # Deployment settings
 kube_network_plugin: weave
-weave_cpu_limits: "100m"
-weave_cpu_requests: "100m"
 kubeadm_enabled: true
 deploy_netchecker: true
 kubedns_min_replicas: 1

diff --git a/tests/files/gce_coreos-alpha-weave-ha.yml b/tests/files/gce_coreos-alpha-weave-ha.yml
@@ -7,8 +7,6 @@ startup_script: 'systemctl disable locksmithd && systemctl stop locksmithd'
 
 # Deployment settings
 kube_network_plugin: weave
-weave_cpu_limits: "100m"
-weave_cpu_requests: "100m"
 bootstrap_os: coreos
 resolvconf_mode: host_resolvconf # this is required as long as the coreos stable channel uses docker < 1.12
 deploy_netchecker: true

diff --git a/tests/files/gce_rhel7-weave.yml b/tests/files/gce_rhel7-weave.yml
@@ -5,8 +5,6 @@ mode: default
 
 # Deployment settings
 kube_network_plugin: weave
-weave_cpu_limits: "100m"
-weave_cpu_requests: "100m"
 deploy_netchecker: true
 kubedns_min_replicas: 1
 cloud_provider: gce
diff --git a/tests/files/gce_ubuntu-weave-sep.yml b/tests/files/gce_ubuntu-weave-sep.yml
@@ -6,8 +6,6 @@ mode: separate
 # Deployment settings
 bootstrap_os: ubuntu
 kube_network_plugin: weave
-weave_cpu_limits: "100m"
-weave_cpu_requests: "100m"
 deploy_netchecker: true
 kubedns_min_replicas: 1
 cloud_provider: gce