From 22955f784a54167074744c2acb4e83b90894f2dd Mon Sep 17 00:00:00 2001
From: Adrien Reslinger <adrien@reslinger.net>
Date: Mon, 18 Jan 2021 16:41:00 +0100
Subject: [PATCH] Force cidr on install

---
 bin/update.sh                    | 2 ++
 files/calico-node-DaemonSet.yaml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/update.sh b/bin/update.sh
index 2601439..711f8bf 100755
--- a/bin/update.sh
+++ b/bin/update.sh
@@ -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
 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
+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
diff --git a/files/calico-node-DaemonSet.yaml b/files/calico-node-DaemonSet.yaml
index b5d3873..9ec9909 100644
--- a/files/calico-node-DaemonSet.yaml
+++ b/files/calico-node-DaemonSet.yaml
@@ -181,7 +181,7 @@ spec:
             # chosen from this range. Changing this value after installation will have
             # no effect. This should fall within `--cluster-cidr`.
             - name: CALICO_IPV4POOL_CIDR
-              value: "192.168.0.0/16"
+              value: "10.244.0.0/16"
             # Disable file logging so `kubectl logs` works.
             - name: CALICO_DISABLE_FILE_LOGGING
               value: "true"