Fix weave-net after upgrade to 1.82
- Set recommended CPU settings - Cleans up upgrade to weave 1.82. The original WeaveWorks daemonset definition uses weave-net name. - Limit DS creation to master - Combined 2 tasks into one with better condition
This commit is contained in:
parent
776e48e898
commit
83a90861ba
2 changed files with 7 additions and 7 deletions
|
@ -8,17 +8,17 @@
|
||||||
namespace: "{{system_namespace}}"
|
namespace: "{{system_namespace}}"
|
||||||
state: "{{ item | ternary('latest','present') }}"
|
state: "{{ item | ternary('latest','present') }}"
|
||||||
with_items: "{{ weave_manifest.changed }}"
|
with_items: "{{ weave_manifest.changed }}"
|
||||||
|
delegate_to: "{{groups['kube-master'][0]}}"
|
||||||
|
|
||||||
|
|
||||||
- name: "Weave | wait for weave to become available"
|
- name: "Weave | wait for weave to become available"
|
||||||
uri:
|
uri:
|
||||||
url: http://127.0.0.1:6784/status
|
url: http://127.0.0.1:6784/status
|
||||||
return_content: yes
|
return_content: yes
|
||||||
|
run_once: true
|
||||||
register: weave_status
|
register: weave_status
|
||||||
retries: 10
|
retries: 10
|
||||||
delay: "{{ retry_stagger | random + 3 }}"
|
delay: "{{ retry_stagger | random + 3 }}"
|
||||||
until: weave_status.status == 200
|
until: "{{ weave_status.status == 200 and
|
||||||
|
'Status: ready' in weave_status.content }}"
|
||||||
- name: "Weave | check if weave is ready"
|
delegate_to: "{{groups['kube-master'][0]}}"
|
||||||
fail:
|
|
||||||
when: "'Status: ready' not in weave_status.content"
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
# Limits
|
# Limits
|
||||||
weave_memory_limit: 500M
|
weave_memory_limit: 500M
|
||||||
weave_cpu_limit: 300m
|
weave_cpu_limit: 30m
|
||||||
weave_memory_requests: 300M
|
weave_memory_requests: 300M
|
||||||
weave_cpu_requests: 200m
|
weave_cpu_requests: 10m
|
||||||
|
|
Loading…
Reference in a new issue