From d300f30de0d8892c840cdb5ec5c18b395d8fde97 Mon Sep 17 00:00:00 2001 From: Adrien Date: Mon, 18 May 2020 22:26:55 +0200 Subject: [PATCH 1/2] Update script update --- scripts/update.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/update.sh b/scripts/update.sh index 99068e0..a995da9 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -1,27 +1,27 @@ #!/usr/bin/env bash -curl -L0 https://cloud.weave.works/k8s/1.13.0/scope.yaml +curl -L0 https://cloud.weave.works/k8s/1.13.1/scope.yaml -o scope.yaml sed -e /^apiVersion/d -e /^kind/d -e /^items/d -e "s/^ //" -e '/^- / i---' -e 's/^[ -] //' -i scope.yaml kubernetes-split-yaml scope.yaml > generated.log -mv generated/*.yaml scope/ -echo -e '---\nweave_scope_files:' > ../vars/scope-files.yaml -cat generated.log | while read LIGNE; do if [ $(echo "${LIGNE}" | grep -c ^File) -eq 1 ]; then echo -n "${LIGNE} "; else echo "${LIGNE}"; fi; done | grep ^File | sort -V | sed 's|.*\(generated/\)\(.*\.yaml\)| - "scope/\2"|' >> ../vars/scope-files.yaml +mv generated/*.yaml files/scope/ +echo -e '---\nweave_scope_files:' > vars/scope-files.yaml +cat generated.log | while read LIGNE; do if [ $(echo "${LIGNE}" | grep -c ^File) -eq 1 ]; then echo -n "${LIGNE} "; else echo "${LIGNE}"; fi; done | grep ^File | sort -V | sed 's|.*\(generated/\)\(.*\.yaml\)| - "scope/\2"|' >> vars/scope-files.yaml 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 +curl -LO https://cloud.weave.works/k8s/2.6.2/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 net/ -echo -e '---\nweave_net_files:' > ../vars/net-files.yaml -cat generated.log | while read LIGNE; do if [ $(echo "${LIGNE}" | grep -c ^File) -eq 1 ]; then echo -n "${LIGNE} "; else echo "${LIGNE}"; fi; done | grep ^File | sort -V | sed 's|.*\(generated/\)\(.*\.yaml\)| - "net/\2"|' >> ../vars/net-files.yaml +mv generated/*.yaml files/net/ +echo -e '---\nweave_net_files:' > vars/net-files.yaml +cat generated.log | while read LIGNE; do if [ $(echo "${LIGNE}" | grep -c ^File) -eq 1 ]; then echo -n "${LIGNE} "; else echo "${LIGNE}"; fi; done | grep ^File | sort -V | sed 's|.*\(generated/\)\(.*\.yaml\)| - "net/\2"|' >> vars/net-files.yaml rm -fr generated{,.log} net.yaml # Configuration https://www.weave.works/docs/net/latest/kubernetes/kube-addon/ -line_nb=$(cat -n net/weave-net-DaemonSet.yaml | sed -n '/ - name: weave/,/ - name: weave-npc/p' | grep env: | cut -f1) -sed -e ${line_nb}' a\ - name: IPALLOC_RANGE\n value: 10.32.0.0/12' -i net/weave-net-DaemonSet.yaml -sed -e ${line_nb}' a\ - name: WEAVE_MTU\n value: "1376"' -i net/weave-net-DaemonSet.yaml -sed -e ${line_nb}' a\ - name: IPTABLES_BACKEND\n value: nft' -i net/weave-net-DaemonSet.yaml -sed -e ${line_nb}' a\ - name: WEAVE_PASSWORD\n valueFrom:\n secretKeyRef:\n name: weave-passwd\n key: weave-passwd' -i net/weave-net-DaemonSet.yaml +line_nb=$(cat -n files/net/weave-net-DaemonSet.yaml | sed -n '/ - name: weave/,/ - name: weave-npc/p' | grep env: | cut -f1) +sed -e ${line_nb}' a\ - name: IPALLOC_RANGE\n value: 10.32.0.0/12' -i files/net/weave-net-DaemonSet.yaml +sed -e ${line_nb}' a\ - name: WEAVE_MTU\n value: "1376"' -i files/net/weave-net-DaemonSet.yaml +sed -e ${line_nb}' a\ - name: IPTABLES_BACKEND\n value: nft' -i files/net/weave-net-DaemonSet.yaml +sed -e ${line_nb}' a\ - name: WEAVE_PASSWORD\n valueFrom:\n secretKeyRef:\n name: weave-passwd\n key: weave-passwd' -i files/net/weave-net-DaemonSet.yaml From 89e91d8c6a92e5130ed80764f1fe1d3b4ce495d2 Mon Sep 17 00:00:00 2001 From: Adrien Date: Mon, 18 May 2020 22:27:16 +0200 Subject: [PATCH 2/2] Update weave scope to 1.13.1 --- files/scope/weave-scope-ClusterRole.yaml | 4 ++-- files/scope/weave-scope-ClusterRoleBinding.yaml | 4 ++-- files/scope/weave-scope-ServiceAccount.yaml | 4 ++-- files/scope/weave-scope-agent-DaemonSet.yaml | 6 +++--- files/scope/weave-scope-app-Deployment.yaml | 6 +++--- files/scope/weave-scope-app-Service.yaml | 4 ++-- files/scope/weave-scope-cluster-agent-Deployment.yaml | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/files/scope/weave-scope-ClusterRole.yaml b/files/scope/weave-scope-ClusterRole.yaml index a4a363a..c2281e4 100644 --- a/files/scope/weave-scope-ClusterRole.yaml +++ b/files/scope/weave-scope-ClusterRole.yaml @@ -6,8 +6,8 @@ metadata: cloud.weave.works/launcher-info: |- { "original-request": { - "url": "/k8s/1.13.0/scope.yaml", - "date": "Mon Apr 27 2020 20:49:06 GMT+0000 (UTC)" + "url": "/k8s/1.13.1/scope.yaml", + "date": "Mon May 18 2020 20:22:49 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 9e4a149..70a27d1 100644 --- a/files/scope/weave-scope-ClusterRoleBinding.yaml +++ b/files/scope/weave-scope-ClusterRoleBinding.yaml @@ -6,8 +6,8 @@ metadata: cloud.weave.works/launcher-info: |- { "original-request": { - "url": "/k8s/1.13.0/scope.yaml", - "date": "Mon Apr 27 2020 20:49:06 GMT+0000 (UTC)" + "url": "/k8s/1.13.1/scope.yaml", + "date": "Mon May 18 2020 20:22:49 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 f6aa126..dda0e1d 100644 --- a/files/scope/weave-scope-ServiceAccount.yaml +++ b/files/scope/weave-scope-ServiceAccount.yaml @@ -6,8 +6,8 @@ metadata: cloud.weave.works/launcher-info: |- { "original-request": { - "url": "/k8s/1.13.0/scope.yaml", - "date": "Mon Apr 27 2020 20:49:06 GMT+0000 (UTC)" + "url": "/k8s/1.13.1/scope.yaml", + "date": "Mon May 18 2020 20:22:49 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 d8e56be..aa24c9b 100644 --- a/files/scope/weave-scope-agent-DaemonSet.yaml +++ b/files/scope/weave-scope-agent-DaemonSet.yaml @@ -6,8 +6,8 @@ metadata: cloud.weave.works/launcher-info: |- { "original-request": { - "url": "/k8s/1.13.0/scope.yaml", - "date": "Mon Apr 27 2020 20:49:06 GMT+0000 (UTC)" + "url": "/k8s/1.13.1/scope.yaml", + "date": "Mon May 18 2020 20:22:49 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } @@ -47,7 +47,7 @@ spec: command: - /home/weave/scope env: [] - image: 'docker.io/weaveworks/scope:1.13.0' + image: 'docker.io/weaveworks/scope:1.13.1' imagePullPolicy: IfNotPresent resources: requests: diff --git a/files/scope/weave-scope-app-Deployment.yaml b/files/scope/weave-scope-app-Deployment.yaml index 47f61ca..c8603dd 100644 --- a/files/scope/weave-scope-app-Deployment.yaml +++ b/files/scope/weave-scope-app-Deployment.yaml @@ -6,8 +6,8 @@ metadata: cloud.weave.works/launcher-info: |- { "original-request": { - "url": "/k8s/1.13.0/scope.yaml", - "date": "Mon Apr 27 2020 20:49:06 GMT+0000 (UTC)" + "url": "/k8s/1.13.1/scope.yaml", + "date": "Mon May 18 2020 20:22:49 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } @@ -41,7 +41,7 @@ spec: command: - /home/weave/scope env: [] - image: 'docker.io/weaveworks/scope:1.13.0' + image: 'docker.io/weaveworks/scope:1.13.1' imagePullPolicy: IfNotPresent ports: - containerPort: 4040 diff --git a/files/scope/weave-scope-app-Service.yaml b/files/scope/weave-scope-app-Service.yaml index ca35350..c6850f4 100644 --- a/files/scope/weave-scope-app-Service.yaml +++ b/files/scope/weave-scope-app-Service.yaml @@ -6,8 +6,8 @@ metadata: cloud.weave.works/launcher-info: |- { "original-request": { - "url": "/k8s/1.13.0/scope.yaml", - "date": "Mon Apr 27 2020 20:49:06 GMT+0000 (UTC)" + "url": "/k8s/1.13.1/scope.yaml", + "date": "Mon May 18 2020 20:22:49 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 85bc8e2..3181c84 100644 --- a/files/scope/weave-scope-cluster-agent-Deployment.yaml +++ b/files/scope/weave-scope-cluster-agent-Deployment.yaml @@ -6,8 +6,8 @@ metadata: cloud.weave.works/launcher-info: |- { "original-request": { - "url": "/k8s/1.13.0/scope.yaml", - "date": "Mon Apr 27 2020 20:49:06 GMT+0000 (UTC)" + "url": "/k8s/1.13.1/scope.yaml", + "date": "Mon May 18 2020 20:22:49 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } @@ -47,7 +47,7 @@ spec: command: - /home/weave/scope env: [] - image: 'docker.io/weaveworks/scope:1.13.0' + image: 'docker.io/weaveworks/scope:1.13.1' imagePullPolicy: IfNotPresent ports: - containerPort: 4041