adrien/ansible-role-k8s-weave
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update weave net to version 2.6.3

Browse source
This commit is contained in:
Adrien Reslinger 2020-05-28 14:00:29 +02:00
parent 62dd2c859e
commit acdee84508
15 changed files with 38 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/update.sh
View file

@ -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 # 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 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 kubernetes-split-yaml net.yaml > generated.log
mv generated/*.yaml files/net/ mv generated/*.yaml files/net/

2
files/net/weave-net-ClusterRole.yaml
View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/v1.16/net.yaml", "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" "email-address": "support@weave.works"
} }

2
files/net/weave-net-ClusterRoleBinding.yaml
View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/v1.16/net.yaml", "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" "email-address": "support@weave.works"
} }

6
files/net/weave-net-DaemonSet.yaml
View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/v1.16/net.yaml", "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" "email-address": "support@weave.works"
} }
@ -45,7 +45,7 @@ spec:
fieldRef: fieldRef:
apiVersion: v1 apiVersion: v1
fieldPath: spec.nodeName fieldPath: spec.nodeName
image: 'docker.io/weaveworks/weave-kube:2.6.2' image: 'docker.io/weaveworks/weave-kube:2.6.3'
readinessProbe: readinessProbe:
httpGet: httpGet:
host: 127.0.0.1 host: 127.0.0.1
@ -78,7 +78,7 @@ spec:
fieldRef: fieldRef:
apiVersion: v1 apiVersion: v1
fieldPath: spec.nodeName fieldPath: spec.nodeName
image: 'docker.io/weaveworks/weave-npc:2.6.2' image: 'docker.io/weaveworks/weave-npc:2.6.3'
resources: resources:
requests: requests:
cpu: 10m cpu: 10m

2
files/net/weave-net-Role.yaml
View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/v1.16/net.yaml", "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" "email-address": "support@weave.works"
} }

2
files/net/weave-net-RoleBinding.yaml
View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/v1.16/net.yaml", "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" "email-address": "support@weave.works"
} }

2
files/net/weave-net-ServiceAccount.yaml
View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/v1.16/net.yaml", "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" "email-address": "support@weave.works"
} }

2
files/scope/weave-scope-ClusterRole.yaml
View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "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" "email-address": "support@weave.works"
} }

2
files/scope/weave-scope-ClusterRoleBinding.yaml
View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "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" "email-address": "support@weave.works"
} }

2
files/scope/weave-scope-ServiceAccount.yaml
View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "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" "email-address": "support@weave.works"
} }

2
files/scope/weave-scope-agent-DaemonSet.yaml
View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "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" "email-address": "support@weave.works"
} }

2
files/scope/weave-scope-app-Deployment.yaml
View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "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" "email-address": "support@weave.works"
} }

2
files/scope/weave-scope-app-Service.yaml
View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "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" "email-address": "support@weave.works"
} }

2
files/scope/weave-scope-cluster-agent-Deployment.yaml
View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "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" "email-address": "support@weave.works"
} }

12
tasks/main.yml
View file

@ -11,6 +11,16 @@
- "{{ weave_net_files }}" - "{{ weave_net_files }}"
when: when:
- kubernetes_network == "weave-net" - 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 tags: weave
- name: Weave Scope setup - name: Weave Scope setup
@ -39,7 +49,6 @@
when: when:
- basic_auth == true - basic_auth == true
- traefik_version is not defined or traefik_version | regex_search('(^1.)') - traefik_version is not defined or traefik_version | regex_search('(^1.)')
tags: weave
- name: Remove a Secret object for basic authentification (traefik 1.7) - name: Remove a Secret object for basic authentification (traefik 1.7)
k8s: k8s:
@ -57,7 +66,6 @@
when: when:
- traefik_version is defined - traefik_version is defined
- traefik_version | regex_search('(^2.)') - traefik_version | regex_search('(^2.)')
tags: weave
- name: Remove old existing Ingress object - name: Remove old existing Ingress object
k8s: k8s: