diff --git a/roles/network_plugin/weave/defaults/main.yml b/roles/network_plugin/weave/defaults/main.yml index eecb06171be55c0ad95791c3ab0d72f52112aba1..ab955ebef60913f9d00449f03d03fe6a83c72ac9 100644 --- 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 index a1c88e97661642e9328c9a2a722b2a77a67465b2..a410be3f2571d03240f318b78dfdfb02e108ed09 100644 --- 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 index 1666e0927faa4a29ae070a5869a991ee4bee13ce..883a67e2ac0db3279fb33dcaa6dd99496c8ff8f0 100644 --- 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 index e6928b7a2508bd813a7f7331102113cb33e34c4e..bfff490daae32e04d99a054cfe1144c3bdbb7d98 100644 --- 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 index 6e701cb233334b78d511f852fa2223469653029d..4598672d10c3a0afeb2ada83d6f1611c2f7035b7 100644 --- 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