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

Force cidr on install
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Adrien Reslinger 2021-01-18 16:41:00 +01:00
parent f71394bed1
commit 22955f784a
Signed by: adrien
GPG key ID: DA7B27055C66D6DE
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/update.sh
View file

@ -17,4 +17,6 @@ line_nb=$(grep -n CALICO_IPV4POOL_IPIP files/calico-node-DaemonSet.yaml | cut -d
sed "$line_nb,$[$line_nb+1] s/\(value: \).*/\1\"Never\"/" -i files/calico-node-DaemonSet.yaml sed "$line_nb,$[$line_nb+1] s/\(value: \).*/\1\"Never\"/" -i files/calico-node-DaemonSet.yaml
line_nb=$(grep -n CALICO_IPV4POOL_VXLAN files/calico-node-DaemonSet.yaml | cut -d: -f1) line_nb=$(grep -n CALICO_IPV4POOL_VXLAN files/calico-node-DaemonSet.yaml | cut -d: -f1)
sed "$line_nb,$[$line_nb+1] s/\(value: \).*/\1\"Always\"/" -i files/calico-node-DaemonSet.yaml sed "$line_nb,$[$line_nb+1] s/\(value: \).*/\1\"Always\"/" -i files/calico-node-DaemonSet.yaml
line_nb=$(grep -n CALICO_IPV4POOL_CIDR files/calico-node-DaemonSet.yaml | cut -d: -f1)
sed "$line_nb,$[$line_nb+1] s|\(value: \).*|\1\"10.244.0.0/16\"|" -i files/calico-node-DaemonSet.yaml
sed "/-bird-/ s/\(- -bird-.*\)/# \1/" -i files/calico-node-DaemonSet.yaml sed "/-bird-/ s/\(- -bird-.*\)/# \1/" -i files/calico-node-DaemonSet.yaml

2
files/calico-node-DaemonSet.yaml
View file

@ -181,7 +181,7 @@ spec:
# chosen from this range. Changing this value after installation will have # chosen from this range. Changing this value after installation will have
# no effect. This should fall within `--cluster-cidr`. # no effect. This should fall within `--cluster-cidr`.
- name: CALICO_IPV4POOL_CIDR - name: CALICO_IPV4POOL_CIDR
value: "192.168.0.0/16" value: "10.244.0.0/16"
# Disable file logging so `kubectl logs` works. # Disable file logging so `kubectl logs` works.
- name: CALICO_DISABLE_FILE_LOGGING - name: CALICO_DISABLE_FILE_LOGGING
value: "true" value: "true"