mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-20 12:40:12 -03:30
Enable weave upgrade from previous versions
Raise readiness probe initial time to 60 (was 30)
This commit is contained in:
@@ -1,4 +1,6 @@
|
||||
---
|
||||
- include: pre-upgrade.yml
|
||||
|
||||
- name: Weave | Copy cni plugins from hyperkube
|
||||
command: "{{ docker_bin_dir }}/docker run --rm -v /opt/cni/bin:/cnibindir {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }} /bin/cp -r /opt/cni/bin/. /cnibindir/"
|
||||
register: cni_task_result
|
||||
|
||||
39
roles/network_plugin/weave/tasks/pre-upgrade.yml
Normal file
39
roles/network_plugin/weave/tasks/pre-upgrade.yml
Normal file
@@ -0,0 +1,39 @@
|
||||
- name: Weave pre-upgrade | Stop legacy weave
|
||||
command: weave stop
|
||||
failed_when: false
|
||||
|
||||
- name: Weave pre-upgrade | Stop legacy systemd weave services
|
||||
service:
|
||||
name: "{{ item }}"
|
||||
enabled: no
|
||||
state: stopped
|
||||
with_items:
|
||||
- weaveexpose
|
||||
- weaveproxy
|
||||
- weave
|
||||
failed_when: false
|
||||
|
||||
- name: Weave pre-upgrade | Purge legacy systemd weave systemd unit files
|
||||
file:
|
||||
path: "{{ item }}"
|
||||
state: absent
|
||||
register: purged_weave_systemd_units
|
||||
with_items:
|
||||
- "/etc/systemd/system/weaveexpose.service"
|
||||
- "/etc/systemd/system/weaveproxy.service"
|
||||
- "/etc/systemd/system/weave.service"
|
||||
|
||||
- name: Weave pre-upgrade | Reload systemd
|
||||
command: systemctl daemon-reload
|
||||
when: ansible_service_mgr == "systemd" and purged_weave_systemd_units.changed
|
||||
|
||||
- name: Weave pre-upgrade | Purge legacy weave configs and binary
|
||||
file:
|
||||
path: "{{ item }}"
|
||||
state: absent
|
||||
with_items:
|
||||
- "{{ bin_dir }}/weave"
|
||||
- "/etc/weave.env"
|
||||
|
||||
- name: Weave pre-upgrade | Purge legacy weave docker containers
|
||||
shell: "docker ps -af 'name=^/weave.*' -q | xargs --no-run-if-empty docker rm -f"
|
||||
@@ -54,7 +54,7 @@ spec:
|
||||
value: {{ weave_expose_ip }}
|
||||
{% endif %}
|
||||
livenessProbe:
|
||||
initialDelaySeconds: 30
|
||||
initialDelaySeconds: 60
|
||||
httpGet:
|
||||
host: 127.0.0.1
|
||||
path: /status
|
||||
|
||||
Reference in New Issue
Block a user