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:
Wong Hoi Sing Edison
2018-07-22 08:14:38 +08:00
parent 280d6cac1a
commit 538cb3b1bd
8 changed files with 136 additions and 143 deletions

View File

@@ -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