From acdee84508b4f23badbf0b5d81a421d1cd3a714a Mon Sep 17 00:00:00 2001 From: Adrien Date: Thu, 28 May 2020 14:00:29 +0200 Subject: [PATCH] Update weave net to version 2.6.3 --- bin/update.sh | 2 +- files/net/weave-net-ClusterRole.yaml | 2 +- files/net/weave-net-ClusterRoleBinding.yaml | 2 +- files/net/weave-net-DaemonSet.yaml | 6 ++-- files/net/weave-net-Role.yaml | 2 +- files/net/weave-net-RoleBinding.yaml | 2 +- files/net/weave-net-ServiceAccount.yaml | 2 +- files/scope/weave-scope-ClusterRole.yaml | 2 +- .../scope/weave-scope-ClusterRoleBinding.yaml | 2 +- files/scope/weave-scope-ServiceAccount.yaml | 2 +- files/scope/weave-scope-agent-DaemonSet.yaml | 2 +- files/scope/weave-scope-app-Deployment.yaml | 2 +- files/scope/weave-scope-app-Service.yaml | 2 +- .../weave-scope-cluster-agent-Deployment.yaml | 2 +- tasks/main.yml | 36 +++++++++++-------- 15 files changed, 38 insertions(+), 30 deletions(-) diff --git a/bin/update.sh b/bin/update.sh index a995da9..5faa9a8 100755 --- a/bin/update.sh +++ b/bin/update.sh @@ -10,7 +10,7 @@ rm -fr generated{,.log} scope.yaml # https://github.com/weaveworks/weave/releases/download/latest_release/weave-daemonset-k8s-1.11.yaml -curl -LO https://cloud.weave.works/k8s/2.6.2/net.yaml -o net.yaml +curl -LO https://cloud.weave.works/k8s/2.6.3/net.yaml -o net.yaml sed -e /^apiVersion/d -e /^kind/d -e /^items/d -e "s/^ //" -e '/^- / i---' -e 's/^[ -] //' -i net.yaml kubernetes-split-yaml net.yaml > generated.log mv generated/*.yaml files/net/ diff --git a/files/net/weave-net-ClusterRole.yaml b/files/net/weave-net-ClusterRole.yaml index af79068..b0f86a0 100644 --- a/files/net/weave-net-ClusterRole.yaml +++ b/files/net/weave-net-ClusterRole.yaml @@ -7,7 +7,7 @@ metadata: { "original-request": { "url": "/k8s/v1.16/net.yaml", - "date": "Mon Apr 27 2020 21:31:25 GMT+0000 (UTC)" + "date": "Thu May 28 2020 11:55:51 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } diff --git a/files/net/weave-net-ClusterRoleBinding.yaml b/files/net/weave-net-ClusterRoleBinding.yaml index 4847093..180aa42 100644 --- a/files/net/weave-net-ClusterRoleBinding.yaml +++ b/files/net/weave-net-ClusterRoleBinding.yaml @@ -7,7 +7,7 @@ metadata: { "original-request": { "url": "/k8s/v1.16/net.yaml", - "date": "Mon Apr 27 2020 21:31:25 GMT+0000 (UTC)" + "date": "Thu May 28 2020 11:55:51 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } diff --git a/files/net/weave-net-DaemonSet.yaml b/files/net/weave-net-DaemonSet.yaml index fc0e568..6602467 100644 --- a/files/net/weave-net-DaemonSet.yaml +++ b/files/net/weave-net-DaemonSet.yaml @@ -7,7 +7,7 @@ metadata: { "original-request": { "url": "/k8s/v1.16/net.yaml", - "date": "Mon Apr 27 2020 21:31:25 GMT+0000 (UTC)" + "date": "Thu May 28 2020 11:55:51 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } @@ -45,7 +45,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 'docker.io/weaveworks/weave-kube:2.6.2' + image: 'docker.io/weaveworks/weave-kube:2.6.3' readinessProbe: httpGet: host: 127.0.0.1 @@ -78,7 +78,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 'docker.io/weaveworks/weave-npc:2.6.2' + image: 'docker.io/weaveworks/weave-npc:2.6.3' resources: requests: cpu: 10m diff --git a/files/net/weave-net-Role.yaml b/files/net/weave-net-Role.yaml index 473da68..91d689e 100644 --- a/files/net/weave-net-Role.yaml +++ b/files/net/weave-net-Role.yaml @@ -7,7 +7,7 @@ metadata: { "original-request": { "url": "/k8s/v1.16/net.yaml", - "date": "Mon Apr 27 2020 21:31:25 GMT+0000 (UTC)" + "date": "Thu May 28 2020 11:55:51 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } diff --git a/files/net/weave-net-RoleBinding.yaml b/files/net/weave-net-RoleBinding.yaml index 82999df..83b1bd2 100644 --- a/files/net/weave-net-RoleBinding.yaml +++ b/files/net/weave-net-RoleBinding.yaml @@ -7,7 +7,7 @@ metadata: { "original-request": { "url": "/k8s/v1.16/net.yaml", - "date": "Mon Apr 27 2020 21:31:25 GMT+0000 (UTC)" + "date": "Thu May 28 2020 11:55:51 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } diff --git a/files/net/weave-net-ServiceAccount.yaml b/files/net/weave-net-ServiceAccount.yaml index 92a2f81..d93d01e 100644 --- a/files/net/weave-net-ServiceAccount.yaml +++ b/files/net/weave-net-ServiceAccount.yaml @@ -7,7 +7,7 @@ metadata: { "original-request": { "url": "/k8s/v1.16/net.yaml", - "date": "Mon Apr 27 2020 21:31:25 GMT+0000 (UTC)" + "date": "Thu May 28 2020 11:55:51 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } diff --git a/files/scope/weave-scope-ClusterRole.yaml b/files/scope/weave-scope-ClusterRole.yaml index c2281e4..65665a4 100644 --- a/files/scope/weave-scope-ClusterRole.yaml +++ b/files/scope/weave-scope-ClusterRole.yaml @@ -7,7 +7,7 @@ metadata: { "original-request": { "url": "/k8s/1.13.1/scope.yaml", - "date": "Mon May 18 2020 20:22:49 GMT+0000 (UTC)" + "date": "Thu May 28 2020 11:55:51 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } diff --git a/files/scope/weave-scope-ClusterRoleBinding.yaml b/files/scope/weave-scope-ClusterRoleBinding.yaml index 70a27d1..806b1ea 100644 --- a/files/scope/weave-scope-ClusterRoleBinding.yaml +++ b/files/scope/weave-scope-ClusterRoleBinding.yaml @@ -7,7 +7,7 @@ metadata: { "original-request": { "url": "/k8s/1.13.1/scope.yaml", - "date": "Mon May 18 2020 20:22:49 GMT+0000 (UTC)" + "date": "Thu May 28 2020 11:55:51 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } diff --git a/files/scope/weave-scope-ServiceAccount.yaml b/files/scope/weave-scope-ServiceAccount.yaml index dda0e1d..aee3504 100644 --- a/files/scope/weave-scope-ServiceAccount.yaml +++ b/files/scope/weave-scope-ServiceAccount.yaml @@ -7,7 +7,7 @@ metadata: { "original-request": { "url": "/k8s/1.13.1/scope.yaml", - "date": "Mon May 18 2020 20:22:49 GMT+0000 (UTC)" + "date": "Thu May 28 2020 11:55:51 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } diff --git a/files/scope/weave-scope-agent-DaemonSet.yaml b/files/scope/weave-scope-agent-DaemonSet.yaml index aa24c9b..870c56e 100644 --- a/files/scope/weave-scope-agent-DaemonSet.yaml +++ b/files/scope/weave-scope-agent-DaemonSet.yaml @@ -7,7 +7,7 @@ metadata: { "original-request": { "url": "/k8s/1.13.1/scope.yaml", - "date": "Mon May 18 2020 20:22:49 GMT+0000 (UTC)" + "date": "Thu May 28 2020 11:55:51 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } diff --git a/files/scope/weave-scope-app-Deployment.yaml b/files/scope/weave-scope-app-Deployment.yaml index c8603dd..afbf3ea 100644 --- a/files/scope/weave-scope-app-Deployment.yaml +++ b/files/scope/weave-scope-app-Deployment.yaml @@ -7,7 +7,7 @@ metadata: { "original-request": { "url": "/k8s/1.13.1/scope.yaml", - "date": "Mon May 18 2020 20:22:49 GMT+0000 (UTC)" + "date": "Thu May 28 2020 11:55:51 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } diff --git a/files/scope/weave-scope-app-Service.yaml b/files/scope/weave-scope-app-Service.yaml index c6850f4..2247cf8 100644 --- a/files/scope/weave-scope-app-Service.yaml +++ b/files/scope/weave-scope-app-Service.yaml @@ -7,7 +7,7 @@ metadata: { "original-request": { "url": "/k8s/1.13.1/scope.yaml", - "date": "Mon May 18 2020 20:22:49 GMT+0000 (UTC)" + "date": "Thu May 28 2020 11:55:51 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } diff --git a/files/scope/weave-scope-cluster-agent-Deployment.yaml b/files/scope/weave-scope-cluster-agent-Deployment.yaml index 3181c84..e3aae96 100644 --- a/files/scope/weave-scope-cluster-agent-Deployment.yaml +++ b/files/scope/weave-scope-cluster-agent-Deployment.yaml @@ -7,7 +7,7 @@ metadata: { "original-request": { "url": "/k8s/1.13.1/scope.yaml", - "date": "Mon May 18 2020 20:22:49 GMT+0000 (UTC)" + "date": "Thu May 28 2020 11:55:51 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } diff --git a/tasks/main.yml b/tasks/main.yml index 378d8ef..81f51b3 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,17 +1,27 @@ --- - name: Weave Net setup block: - - name: Weave Net files - k8s: - state: present - context: "{{ my_context }}" - merge_type: merge - resource_definition: "{{ lookup('file', item) | from_yaml }}" - with_items: - - "{{ weave_net_files }}" - when: - - kubernetes_network == "weave-net" - tags: weave + - name: Weave Net files + k8s: + state: present + context: "{{ my_context }}" + merge_type: merge + resource_definition: "{{ lookup('file', item) | from_yaml }}" + with_items: + - "{{ weave_net_files }}" + when: + - kubernetes_network == "weave-net" + - name: Weave Net password + k8s: + state: present + context: "{{ my_context }}" + merge_type: merge + resource_definition: "{{ lookup('template', item) | from_yaml }}" + with_items: + - weave-net-secret.yml.j2 + when: + - kubernetes_network == "weave-net" + tags: weave - name: Weave Scope setup block: @@ -39,7 +49,6 @@ when: - basic_auth == true - traefik_version is not defined or traefik_version | regex_search('(^1.)') - tags: weave - name: Remove a Secret object for basic authentification (traefik 1.7) k8s: @@ -57,7 +66,6 @@ when: - traefik_version is defined - traefik_version | regex_search('(^2.)') - tags: weave - name: Remove old existing Ingress object k8s: @@ -80,5 +88,5 @@ resource_definition: "{{ lookup('file', item) | from_yaml }}" with_items: - "{{ weave_scope_files }}" - tags: weave + tags: weave