Pull master, Rebase, add changes again (#8745)

roles/download/defaults/main.yml

@@ -95,7 +95,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.4"
+calico_version: "v3.22.2"
 calico_ctl_version: "{{ calico_version }}"
 calico_cni_version: "{{ calico_version }}"
 calico_flexvol_version: "{{ calico_version }}"
@@ -578,29 +578,29 @@ cni_binary_checksums:
 
 calicoctl_binary_checksums:
   arm:
-    v3.22.1: 0
-    v3.21.4: 0
+    v3.22.2: 0
+    v3.21.5: 0
     v3.20.4: 0
     v3.19.4: 0
   amd64:
-    v3.22.1: b42be4f7c053f209127a9b9a6945ce11ab3bc0725f2741f92380400b008c6111
-    v3.21.4: 3fb4f31bd72f0a570f6a6cf71d7b4c7641a0f142d2239fad32012058f0ec63bc
+    v3.22.2: 2608fe464b50019e4ade388142f194463e351013ec81da21b111307411865a81
+    v3.21.5: 98407b1c608fec0896004767c72cd4b6cf939976d67d3eca121f1f02137c92a7
     v3.20.4: f61f3892712e4871fa57f6b9726cd42c36c333ca45bb178df48a15e64b5e8166
     v3.19.4: 1b2ac701b05b77a14e0545a7d70915792ce833eea875f7eb7a18ded5a5878d5c
   arm64:
-    v3.22.1: 6ad55dd57190f474c2a186ad935f25e71ec8ca25fadf504dacfc1e19b1b70155
-    v3.21.4: 5c277b8de4c069f7cf8bd87e02709eeeb668e3a1ca4784aafcf83cdd05568df8
+    v3.22.2: 4817dff5a867e4e5e8cfe4571b569cfe73d56e3f9a3bac4ccf5d25a5a681277d
+    v3.21.5: cc73e2b8f5b695b6ab06e7856cd516c1e9ec3e903abb510ef465ca6b530e18e6
     v3.20.4: 4115ed46669d2bcfdcdcaec3f3a73345cd96932d8a0e9dde1523e6c02d45f8aa
     v3.19.4: 50fd7085a6810efd88385df13ad2dfcc0078cd3813ad7bf56b2eb9f18fa7bad0
   ppc64le:
-    v3.22.1: c7bf3d9bb77288e3c384f568eab657b47ef72f5147ce386ac01a60f0f19224ea
-    v3.21.4: 29b4e2fd9131e01343d4804b1a14eb09a1d50146d54a139a35eb4030e521a5b1
+    v3.22.2: 56d39963a201d32dc43dcc3483dbe530b09b4a83005a7e39090f368d354946ba
+    v3.21.5: 1ebb615b18f9c3fe2d41281d1bc9e3909048b56d2bc76c18431cbeb7a653d24d
     v3.20.4: 63e2ca9d34c67bb758f478475a3e41735e520535d15f0663cfe00a53bc10af3c
     v3.19.4: d2cbc2e987859564f618c749ce7cf01b754683f2a6fc4e9e873cdd756404b48d
 
 calico_crds_archive_checksums:
-  v3.22.1: 7b778b88a8ab6574d0f84918c831bfab6034389e03435ef9d9e3b53922334af3
-  v3.21.4: e778b230e82378d848e6e75387ab5b6f78e0049953cdf30027eedba2cdbb4e57
+  v3.22.2: 839f2ceb2b2227801c3d588d8e9b1bb7f05520a4afe7665e928fe30919d30f5b
+  v3.21.5: ffbbaa2bc32b01bf160828d2cfd4504d83c69cb1f74c0028349181ed61bad635
   v3.20.4: 47d749ee79732f320669350ef8a7e3ca16b67ad6c97c2e0da8278d6c2659fce3
   v3.19.4: 8f271c23442ca20d54a598d046312af0144e8bc53a14809945ce1dfc0cb1b7d4