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

Compare commits

base: adrien:89e91d8c6a92e5130ed80764f1fe1d3b4ce495d2
Branches Tags
adrien:master
..
compare: adrien:7414baf2f546af97b56f7f23527c5c9535a287ab
Branches Tags
adrien:master

No commits in common. "89e91d8c6a92e5130ed80764f1fe1d3b4ce495d2" and "7414baf2f546af97b56f7f23527c5c9535a287ab" have entirely different histories.
89e91d8c6a ... 7414baf2f5

8 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,8 +6,8 @@ metadata:
cloud.weave.works/launcher-info: |- cloud.weave.works/launcher-info: |-
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "url": "/k8s/1.13.0/scope.yaml",
"date": "Mon May 18 2020 20:22:49 GMT+0000 (UTC)" "date": "Mon Apr 27 2020 20:49:06 GMT+0000 (UTC)"
}, },
"email-address": "support@weave.works" "email-address": "support@weave.works"
} }

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

@ -6,8 +6,8 @@ metadata:
cloud.weave.works/launcher-info: |- cloud.weave.works/launcher-info: |-
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "url": "/k8s/1.13.0/scope.yaml",
"date": "Mon May 18 2020 20:22:49 GMT+0000 (UTC)" "date": "Mon Apr 27 2020 20:49:06 GMT+0000 (UTC)"
}, },
"email-address": "support@weave.works" "email-address": "support@weave.works"
} }

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

@ -6,8 +6,8 @@ metadata:
cloud.weave.works/launcher-info: |- cloud.weave.works/launcher-info: |-
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "url": "/k8s/1.13.0/scope.yaml",
"date": "Mon May 18 2020 20:22:49 GMT+0000 (UTC)" "date": "Mon Apr 27 2020 20:49:06 GMT+0000 (UTC)"
}, },
"email-address": "support@weave.works" "email-address": "support@weave.works"
} }

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

@ -6,8 +6,8 @@ metadata:
cloud.weave.works/launcher-info: |- cloud.weave.works/launcher-info: |-
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "url": "/k8s/1.13.0/scope.yaml",
"date": "Mon May 18 2020 20:22:49 GMT+0000 (UTC)" "date": "Mon Apr 27 2020 20:49:06 GMT+0000 (UTC)"
}, },
"email-address": "support@weave.works" "email-address": "support@weave.works"
} }
@ -47,7 +47,7 @@ spec:
command: command:
- /home/weave/scope - /home/weave/scope
env: [] env: []
image: 'docker.io/weaveworks/scope:1.13.1' image: 'docker.io/weaveworks/scope:1.13.0'
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
resources: resources:
requests: requests:

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

@ -6,8 +6,8 @@ metadata:
cloud.weave.works/launcher-info: |- cloud.weave.works/launcher-info: |-
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "url": "/k8s/1.13.0/scope.yaml",
"date": "Mon May 18 2020 20:22:49 GMT+0000 (UTC)" "date": "Mon Apr 27 2020 20:49:06 GMT+0000 (UTC)"
}, },
"email-address": "support@weave.works" "email-address": "support@weave.works"
} }
@ -41,7 +41,7 @@ spec:
command: command:
- /home/weave/scope - /home/weave/scope
env: [] env: []
image: 'docker.io/weaveworks/scope:1.13.1' image: 'docker.io/weaveworks/scope:1.13.0'
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 4040 - containerPort: 4040

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

@ -6,8 +6,8 @@ metadata:
cloud.weave.works/launcher-info: |- cloud.weave.works/launcher-info: |-
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "url": "/k8s/1.13.0/scope.yaml",
"date": "Mon May 18 2020 20:22:49 GMT+0000 (UTC)" "date": "Mon Apr 27 2020 20:49:06 GMT+0000 (UTC)"
}, },
"email-address": "support@weave.works" "email-address": "support@weave.works"
} }

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

@ -6,8 +6,8 @@ metadata:
cloud.weave.works/launcher-info: |- cloud.weave.works/launcher-info: |-
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "url": "/k8s/1.13.0/scope.yaml",
"date": "Mon May 18 2020 20:22:49 GMT+0000 (UTC)" "date": "Mon Apr 27 2020 20:49:06 GMT+0000 (UTC)"
}, },
"email-address": "support@weave.works" "email-address": "support@weave.works"
} }
@ -47,7 +47,7 @@ spec:
command: command:
- /home/weave/scope - /home/weave/scope
env: [] env: []
image: 'docker.io/weaveworks/scope:1.13.1' image: 'docker.io/weaveworks/scope:1.13.0'
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 4041 - containerPort: 4041

26
scripts/update.sh
View file

@ -1,27 +1,27 @@
#!/usr/bin/env bash #!/usr/bin/env bash
curl -L0 https://cloud.weave.works/k8s/1.13.1/scope.yaml -o scope.yaml curl -L0 https://cloud.weave.works/k8s/1.13.0/scope.yaml
sed -e /^apiVersion/d -e /^kind/d -e /^items/d -e "s/^ //" -e '/^- / i---' -e 's/^[ -] //' -i 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 kubernetes-split-yaml scope.yaml > generated.log
mv generated/*.yaml files/scope/ mv generated/*.yaml scope/
echo -e '---\nweave_scope_files:' > vars/scope-files.yaml 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 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 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.2/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 net/
echo -e '---\nweave_net_files:' > vars/net-files.yaml 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 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 rm -fr generated{,.log} net.yaml
# Configuration https://www.weave.works/docs/net/latest/kubernetes/kube-addon/ # Configuration https://www.weave.works/docs/net/latest/kubernetes/kube-addon/
line_nb=$(cat -n files/net/weave-net-DaemonSet.yaml | sed -n '/ - name: weave/,/ - name: weave-npc/p' | grep env: | cut -f1) 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 files/net/weave-net-DaemonSet.yaml 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 files/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 files/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 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 net/weave-net-DaemonSet.yaml