mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-03-28 14:25:09 -02:30
weave: Upgrade to 2.4.0
Upstream Changes: - weave 2.4.0 (https://github.com/weaveworks/weave/releases/tag/v2.4.0) - Support `externalTrafficPolicy: Local` (https://github.com/weaveworks/weave/issues/2924) - Make the ipset list size bigger (https://github.com/weaveworks/weave/pull/3305) - Break out of kube rm-peers loop if nothing changes (https://github.com/weaveworks/weave/pull/3317) Our Changes: - Revamp weave-net.yml.j2 with upstream changes - Add more variables for customization - Replace WEAVE_PASSWORD with k8s secret - Remove hard-corded seed mode support, in favor of variables customization
This commit is contained in:
@@ -1,12 +1,4 @@
|
||||
---
|
||||
- import_tasks: seed.yml
|
||||
when: weave_mode_seed
|
||||
|
||||
- name: template weavenet conflist
|
||||
template:
|
||||
src: 00-weave.conflist.j2
|
||||
dest: /etc/cni/net.d/00-weave.conflist
|
||||
owner: kube
|
||||
|
||||
- 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 -rf /opt/cni/bin/. /cnibindir/"
|
||||
@@ -19,9 +11,12 @@
|
||||
- hyperkube
|
||||
- upgrade
|
||||
|
||||
- name: Weave | Create weave-net manifest
|
||||
- name: Weave | Create manifest
|
||||
template:
|
||||
src: weave-net.yml.j2
|
||||
dest: "{{ kube_config_dir }}/weave-net.yml"
|
||||
mode: 0640
|
||||
register: weave_manifest
|
||||
|
||||
- name: Weave | Fix nodePort for Weave
|
||||
template:
|
||||
src: 00-weave.conflist.j2
|
||||
dest: /etc/cni/net.d/00-weave.conflist
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
---
|
||||
- name: Weave seed | Set seed if first time
|
||||
set_fact:
|
||||
seed: '{% for host in groups["k8s-cluster"] %}{{ hostvars[host]["ansible_default_ipv4"]["macaddress"] }}{% if not loop.last %},{% endif %}{% endfor %}'
|
||||
when: "weave_seed == 'uninitialized'"
|
||||
run_once: true
|
||||
tags:
|
||||
- confweave
|
||||
|
||||
- name: Weave seed | Set seed if not first time
|
||||
set_fact:
|
||||
seed: '{{ weave_seed }}'
|
||||
when: "weave_seed != 'uninitialized'"
|
||||
run_once: true
|
||||
tags:
|
||||
- confweave
|
||||
|
||||
- name: Weave seed | Set peers if fist time
|
||||
set_fact:
|
||||
peers: '{{ weave_ip_current_cluster }}'
|
||||
when: "weave_peers == 'uninitialized'"
|
||||
run_once: true
|
||||
tags:
|
||||
- confweave
|
||||
|
||||
- name: Weave seed | Set peers if existing peers
|
||||
set_fact:
|
||||
peers: '{{ weave_peers }}{% for ip in weave_ip_current_cluster.split(" ") %}{% if ip not in weave_peers.split(" ") %} {{ ip }}{% endif %}{% endfor %}'
|
||||
when: "weave_peers != 'uninitialized'"
|
||||
run_once: true
|
||||
tags:
|
||||
- confweave
|
||||
|
||||
- name: Weave seed | Save seed
|
||||
lineinfile:
|
||||
dest: "{{ inventory_dir }}/group_vars/k8s-cluster.yml"
|
||||
state: present
|
||||
regexp: '^weave_seed:'
|
||||
line: 'weave_seed: {{ seed }}'
|
||||
become: no
|
||||
delegate_to: 127.0.0.1
|
||||
run_once: true
|
||||
tags:
|
||||
- confweave
|
||||
|
||||
- name: Weave seed | Save peers
|
||||
lineinfile:
|
||||
dest: "{{ inventory_dir }}/group_vars/k8s-cluster.yml"
|
||||
state: present
|
||||
regexp: '^weave_peers:'
|
||||
line: 'weave_peers: {{ peers }}'
|
||||
become: no
|
||||
delegate_to: 127.0.0.1
|
||||
run_once: true
|
||||
tags:
|
||||
- confweave
|
||||
Reference in New Issue
Block a user