Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Weave limits #2660

Merged
merged 2 commits into from
Apr 15, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion roles/network_plugin/weave/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 0 additions & 2 deletions tests/files/gce_centos-weave-kubeadm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions tests/files/gce_coreos-alpha-weave-ha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions tests/files/gce_rhel7-weave.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions tests/files/gce_ubuntu-weave-sep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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