From 402e85ad6e592300a0c91a0d4e28cafabad289fd Mon Sep 17 00:00:00 2001
From: Cristian Calin <6627509+cristicalin@users.noreply.github.com>
Date: Wed, 16 Feb 2022 02:35:02 +0200
Subject: [PATCH] [calico] upgrade release checksums (#8544)

* [calico] upgrade 3.19.x to 3.19.4

* [calico] upgrade 3.20.x to 3.20.4

* [calico] upgrade 3.21.x to 3.21.4 and make it the default

* [calico] add 3.22.0 checksums

* [calico] account for path changes in calico 3.21.4 crd archive and above
---
 README.md                                     |  2 +-
 roles/download/defaults/main.yml              | 37 +++++++++++--------
 roles/network_plugin/calico/tasks/install.yml |  9 ++++-
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index c1527b1b7..3a10829d0 100644
--- a/README.md
+++ b/README.md
@@ -138,7 +138,7 @@ Note: Upstart/SysV init based OS types are not supported.
   - [cri-o](http://cri-o.io/) v1.22 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS)
 - Network Plugin
   - [cni-plugins](https://github.com/containernetworking/plugins) v1.0.1
-  - [calico](https://github.com/projectcalico/calico) v3.20.3
+  - [calico](https://github.com/projectcalico/calico) v3.21.4
   - [canal](https://github.com/projectcalico/canal) (given calico/flannel versions)
   - [cilium](https://github.com/cilium/cilium) v1.11.1
   - [flanneld](https://github.com/flannel-io/flannel) v0.15.1
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index dc06f73d9..233f5b8fd 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -94,7 +94,7 @@ github_image_repo: "ghcr.io"
 
 # TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults
 # after migration to container download
-calico_version: "v3.21.2"
+calico_version: "v3.21.4"
 calico_ctl_version: "{{ calico_version }}"
 calico_cni_version: "{{ calico_version }}"
 calico_flexvol_version: "{{ calico_version }}"
@@ -470,26 +470,31 @@ cni_binary_checksums:
 
 calicoctl_binary_checksums:
   arm:
-    v3.21.2: 0
-    v3.20.3: 0
-    v3.19.3: 0
+    v3.22.0: 0
+    v3.21.4: 0
+    v3.20.4: 0
+    v3.19.4: 0
   amd64:
-    v3.21.2: d495edfc254e00f008ef6872422a31ef5f442a1ff96bcb724dd2df86ef75b7e3
-    v3.20.3: 29bec97b1dfc135b830b0cbfd3dfe216f00e97e9e6ef08e620d81d4a09db6393
-    v3.19.3: e9d91036764ec24f32025c3176efb2c2673b9936270e6165fb6583cce97bc43f
+    v3.22.0: 5138f6257308071df648cfb5d90201d17704d16767b8db807ed5fdec501559c9
+    v3.21.4: 3fb4f31bd72f0a570f6a6cf71d7b4c7641a0f142d2239fad32012058f0ec63bc
+    v3.20.4: f61f3892712e4871fa57f6b9726cd42c36c333ca45bb178df48a15e64b5e8166
+    v3.19.4: 1b2ac701b05b77a14e0545a7d70915792ce833eea875f7eb7a18ded5a5878d5c
   arm64:
-    v3.21.2: 94c1bec6b7661243f053314d901df54d2e3e5bf4eb746af09b29b07e4654f4b9
-    v3.20.3: 63683f21515a20ceee8f234a9aba0e5efb342860940026d0ba6f281cc76aa1e3
-    v3.19.3: ec3cfbd2dccbd614ac353be8c9abf8e336d8700fbd2b9b76da1c3c4c14a6dfe2
+    v3.22.0: a32cb536d282ed39fdbe940987616297e4060a6ab166886b6c4988bbf1bf677f
+    v3.21.4: 5c277b8de4c069f7cf8bd87e02709eeeb668e3a1ca4784aafcf83cdd05568df8
+    v3.20.4: 4115ed46669d2bcfdcdcaec3f3a73345cd96932d8a0e9dde1523e6c02d45f8aa
+    v3.19.4: 50fd7085a6810efd88385df13ad2dfcc0078cd3813ad7bf56b2eb9f18fa7bad0
   ppc64le:
-    v3.21.2: 1c1c8a6887bdcc8d49a93fc3ba6aa538b167088f4fea436af447e84b555fe170
-    v3.20.3: d8b2a383a490ef6327ce99a3858ac322982afd47c7884411fa06471da7425028
-    v3.19.3: ccb66efa2f01dfeee421ab35650458cde980faac57357a7fe314ce0714786b0d
+    v3.22.0: c445855cc887cd1955469e32574b14cb6ac28fb5e9e2f5a3c6bae7e490278393
+    v3.21.4: 29b4e2fd9131e01343d4804b1a14eb09a1d50146d54a139a35eb4030e521a5b1
+    v3.20.4: 63e2ca9d34c67bb758f478475a3e41735e520535d15f0663cfe00a53bc10af3c
+    v3.19.4: d2cbc2e987859564f618c749ce7cf01b754683f2a6fc4e9e873cdd756404b48d
 
 calico_crds_archive_checksums:
-  v3.21.2: 6f1342ac8b3d9ebfa9714f06aa92f4f0eea0d2b09d7e77ed73c0c9de0bb0aee8
-  v3.20.3: 2a3a5cbe05c60fa2fc850252c4eecfa36dd6629191ed805eea31f9b5c740bc4c
-  v3.19.3: 7066d0e6b0136920f82a75a5bd2d595e9f69bd3ab823403e920906569ec6be07
+  v3.22.0: 204c12a6394784861b38ad1951ef720f24dff53b5b8c56ced7b701257e4bba2b
+  v3.21.4: e778b230e82378d848e6e75387ab5b6f78e0049953cdf30027eedba2cdbb4e57
+  v3.20.4: 47d749ee79732f320669350ef8a7e3ca16b67ad6c97c2e0da8278d6c2659fce3
+  v3.19.4: 8f271c23442ca20d54a598d046312af0144e8bc53a14809945ce1dfc0cb1b7d4
 
 krew_archive_checksums:
   linux:
diff --git a/roles/network_plugin/calico/tasks/install.yml b/roles/network_plugin/calico/tasks/install.yml
index adbb29594..5df4ee2b1 100644
--- a/roles/network_plugin/calico/tasks/install.yml
+++ b/roles/network_plugin/calico/tasks/install.yml
@@ -123,9 +123,16 @@
     - enable_dual_stack_networks
 
 - block:
+    - name: Calico | Check if extra directory is needed
+      stat:
+        path: "{{ local_release_dir }}/calico-{{ calico_version }}-kdd-crds/kdd"
+      register: kdd_path
+    - name: Calico | Set kdd path
+      set_fact:
+        calico_kdd_path: "{{ local_release_dir }}/calico-{{ calico_version }}-kdd-crds{{ '/kdd' if kdd_path.stat.exists is defined and kdd_path.stat.exists }}"
     - name: Calico | Create calico manifests for kdd
       assemble:
-        src: "{{ local_release_dir }}/calico-{{ calico_version }}-kdd-crds"
+        src: "{{ calico_kdd_path }}"
         dest: "{{ kube_config_dir }}/kdd-crds.yml"
         mode: 0644
         delimiter: "---\n"