Update to version 3.20.1

TODO.txt

@@ -1,6 +1,5 @@
 calico ENV:
   - CLUSTER_TYPE=kubeadm
-  - IP_AUTODETECTION_METHOD=cidr=10.0.1.0/24,10.0.2.0/24
 
 cat /etc/NetworkManager/conf.d/calico.conf
 [keyfile]

bin/update.sh

@@ -3,14 +3,14 @@ BASEURL=https://docs.projectcalico.org/manifests
 #BASEURL=https://docs.projectcalico.org/archive/v3.18/manifests
 curl "${BASEURL}"/calico.yaml -O
 kubernetes-split-yaml calico.yaml > generated.log
-mv generated/*.yaml files/
+mv generated/*.yaml templates/
 rmdir generated
 echo -e '---\ncalico_files:' > vars/calico-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\)|  - "\2"|' >> vars/calico-files.yaml
 rm -f generated.log calico.yaml
 curl "${BASEURL}"/calicoctl.yaml -O
 kubernetes-split-yaml calicoctl.yaml > generated.log
-mv generated/*.yaml files/
+mv generated/*.yaml templates/
 rmdir generated
 echo -e '\ncalicoctl_files:' >> vars/calico-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\)|  - "\2"|' >> vars/calico-files.yaml
@@ -18,17 +18,20 @@ rm -f generated.log calicoctl.yaml
 
 
 # Configure the pod IP range
-line_nb=$(grep -n CALICO_IPV4POOL_CIDR files/calico-node-DaemonSet.yaml | cut -d: -f1)
+line_nb=$(grep -n CALICO_IPV4POOL_CIDR templates/calico-node-DaemonSet.yaml | cut -d: -f1)
-sed "$line_nb,$[$line_nb+1] s/# //" -i files/calico-node-DaemonSet.yaml
+sed "$line_nb,$[$line_nb+1] s/# //" -i templates/calico-node-DaemonSet.yaml
 
 # Switch to VxLan
-sed "/calico_backend:/ s/bird/vxlan/" -i files/calico-config-ConfigMap.yaml
+sed "/calico_backend:/ s/bird/vxlan/" -i templates/calico-config-ConfigMap.yaml
-line_nb=$(grep -n CALICO_IPV4POOL_IPIP files/calico-node-DaemonSet.yaml | cut -d: -f1)
+line_nb=$(grep -n CALICO_IPV4POOL_IPIP templates/calico-node-DaemonSet.yaml | cut -d: -f1)
-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 templates/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 templates/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 templates/calico-node-DaemonSet.yaml
-line_nb=$(grep -n CALICO_IPV4POOL_CIDR files/calico-node-DaemonSet.yaml | cut -d: -f1)
+line_nb=$(grep -n CALICO_IPV4POOL_CIDR templates/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 "$line_nb,$[$line_nb+1] s|\(value: \).*|\1\"10.244.0.0/16\"|" -i templates/calico-node-DaemonSet.yaml
-line_nb=$(grep -n FELIX_HEALTHENABLED files/calico-node-DaemonSet.yaml | cut -d: -f1)
+line_nb=$(grep -n FELIX_HEALTHENABLED templates/calico-node-DaemonSet.yaml | cut -d: -f1)
-sed "$[${line_nb}+2]i\            - name: FELIX_IPTABLESBACKEND\n              value: \"Auto\"" -i files/calico-node-DaemonSet.yaml
+sed "$[${line_nb}+2]i\            - name: FELIX_IPTABLESBACKEND\n              value: \"Auto\"" -i templates/calico-node-DaemonSet.yaml
-sed "/-bird-/ s/\(- -bird-.*\)/# \1/" -i files/calico-node-DaemonSet.yaml
+sed "/-bird-/ s/\(- -bird-.*\)/# \1/" -i templates/calico-node-DaemonSet.yaml
+
+line_nb=$(grep -n FELIX_IPTABLESBACKEND templates/calico-node-DaemonSet.yaml | cut -d: -f1)
+sed "$line_nb i\{% if kubernetes_internal_network is defined %}\n            - name: IP_AUTODETECTION_METHOD\n              value: cidr=\"{{ kubernetes_internal_network }}\"\n{% endif %}" -i templates/calico-node-DaemonSet.yaml

tasks/main.yml

@@ -9,7 +9,7 @@
       state: present
       context: "{{ my_context }}"
       merge_type: merge
-      resource_definition: "{{ lookup('file', item) | from_yaml }}"
+      resource_definition: "{{ lookup('template', item) | from_yaml }}"
     with_items:
       - "{{ calico_files }}"
     register: calico_changed

templates/calico-kube-controllers-Deployment.yaml

@@ -34,7 +34,7 @@ spec:
       priorityClassName: system-cluster-critical
       containers:
         - name: calico-kube-controllers
-          image: docker.io/calico/kube-controllers:v3.20.0
+          image: docker.io/calico/kube-controllers:v3.20.1
           env:
             # Choose which controllers to run.
             - name: ENABLED_CONTROLLERS

templates/calico-node-DaemonSet.yaml

@@ -44,7 +44,7 @@ spec:
         # It can be deleted if this is a fresh installation, or if you have already
         # upgraded to use calico-ipam.
         - name: upgrade-ipam
-          image: docker.io/calico/cni:v3.20.0
+          image: docker.io/calico/cni:v3.20.1
           command: ["/opt/cni/bin/calico-ipam", "-upgrade"]
           envFrom:
           - configMapRef:
@@ -71,7 +71,7 @@ spec:
         # This container installs the CNI binaries
         # and CNI network config file on each node.
         - name: install-cni
-          image: docker.io/calico/cni:v3.20.0
+          image: docker.io/calico/cni:v3.20.1
           command: ["/opt/cni/bin/install"]
           envFrom:
           - configMapRef:
@@ -112,7 +112,7 @@ spec:
         # Adds a Flex Volume Driver that creates a per-pod Unix Domain Socket to allow Dikastes
         # to communicate with Felix over the Policy Sync API.
         - name: flexvol-driver
-          image: docker.io/calico/pod2daemon-flexvol:v3.20.0
+          image: docker.io/calico/pod2daemon-flexvol:v3.20.1
           volumeMounts:
           - name: flexvol-driver-host
             mountPath: /host/driver
@@ -123,7 +123,7 @@ spec:
         # container programs network policy and routes on each
         # host.
         - name: calico-node
-          image: docker.io/calico/node:v3.20.0
+          image: docker.io/calico/node:v3.20.1
           envFrom:
           - configMapRef:
               # Allow KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT to be overridden for eBPF mode.
@@ -193,6 +193,10 @@ spec:
               value: "false"
             - name: FELIX_HEALTHENABLED
               value: "true"
+{% if kubernetes_internal_network is defined %}
+            - name: IP_AUTODETECTION_METHOD
+              value: cidr="{{ kubernetes_internal_network }}"
+{% endif %}
             - name: FELIX_IPTABLESBACKEND
               value: "Auto"
           securityContext:

templates/calicoctl-Pod.yaml

@@ -11,7 +11,7 @@ spec:
   serviceAccountName: calicoctl
   containers:
   - name: calicoctl
-    image: calico/ctl:v3.20.0
+    image: calico/ctl:v3.20.1
     command:
       - /calicoctl
     args:

templates/calicoctl-ServiceAccount.yaml

@@ -1,7 +1,7 @@
-# Calico Version v3.20.0
+# Calico Version v3.20.1
-# https://docs.projectcalico.org/releases#v3.20.0
+# https://docs.projectcalico.org/releases#v3.20.1
 # This manifest includes the following component versions:
-#   calico/ctl:v3.20.0
+#   calico/ctl:v3.20.1
 
 apiVersion: v1
 kind: ServiceAccount