From a9321aaf8642de0880b6bd59c04b683c61df7b68 Mon Sep 17 00:00:00 2001
From: Mohamed Omar Zaian <mohamedzaian@gmail.com>
Date: Wed, 6 Dec 2023 03:05:33 +0100
Subject: [PATCH] [calico] Add version 3.26.4 and make it default (#10669)

---
 README.md                                  | 2 +-
 roles/download/defaults/main/checksums.yml | 5 +++++
 roles/download/defaults/main/main.yml      | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1b8fad50a..70381b6fa 100644
--- a/README.md
+++ b/README.md
@@ -168,7 +168,7 @@ Note: Upstart/SysV init based OS types are not supported.
   - [cri-o](http://cri-o.io/) v1.27 (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.2.0
-  - [calico](https://github.com/projectcalico/calico) v3.26.3
+  - [calico](https://github.com/projectcalico/calico) v3.26.4
   - [cilium](https://github.com/cilium/cilium) v1.13.4
   - [flannel](https://github.com/flannel-io/flannel) v0.22.0
   - [kube-ovn](https://github.com/alauda/kube-ovn) v1.11.5
diff --git a/roles/download/defaults/main/checksums.yml b/roles/download/defaults/main/checksums.yml
index 01c7eb4a5..f19461880 100644
--- a/roles/download/defaults/main/checksums.yml
+++ b/roles/download/defaults/main/checksums.yml
@@ -470,6 +470,7 @@ cni_binary_checksums:
     v0.9.1: 5bd3c82ef248e5c6cc388f25545aa5a7d318778e5f9bc0a31475361bb27acefe
 calicoctl_binary_checksums:
   arm:
+    v3.26.4: 0
     v3.26.3: 0
     v3.26.2: 0
     v3.26.1: 0
@@ -494,6 +495,7 @@ calicoctl_binary_checksums:
     v3.22.4: 0
     v3.22.3: 0
   arm64:
+    v3.26.4: d647d9443ce89df62da6619643375a4f577f5a7fa4e1162416403df521826c2d
     v3.26.3: c50272a39658a3b358b33c03fe10d1dde894764413279fecc72d40b95535b398
     v3.26.2: 44de9118f481a1125e2d50cdfbb55073e744dd8e71d2be45eeb2757302910c67
     v3.26.1: bba2fbdd6d2998bca144ae12c2675d65c4fbf51c0944d69b1b2f20e08cd14c22
@@ -518,6 +520,7 @@ calicoctl_binary_checksums:
     v3.22.4: e84ba529091818282012fd460e7509995156e50854781c031c81e4f6c715a39a
     v3.22.3: 3a3e70828c020efd911181102d21cb4390b7b68669898bd40c0c69b64d11bb63
   amd64:
+    v3.26.4: 9960357ef6d61eda7abf80bd397544c1952f89d61e5eaf9f6540dae379a3ef61
     v3.26.3: 82bd7d12b0f6973f9593fb62f5410ad6a81ff6b79e92f1afd3e664202e8387cf
     v3.26.2: eba9bc34f44801a513c48f730a409dc1ece0ebfd9c1acc21fd3adf0eff93ecdc
     v3.26.1: c8f61c1c8e2504410adaff4a7255c65785fe7805eebfd63340ccd3c472aa42cf
@@ -542,6 +545,7 @@ calicoctl_binary_checksums:
     v3.22.4: cc412783992abeba6dc01d7bc67bdb2e3a0cf2f27fc3334bdfc02d326c3c9e15
     v3.22.3: a9e5f6bad4ad8c543f6bdcd21d3665cdd23edc780860d8e52a87881a7b3e203c
   ppc64le:
+    v3.26.4: 41cfa77cc27cfe89a046ddb033cf71a46512f4b81251e28c69fca2cee13617ff
     v3.26.3: 30a32acbe71894a9783e350ed44294e739b3322f157b2c224ad3c058473e5701
     v3.26.2: c4d42a85afb67020e9cf9dcafe184af6ad60c5609d60001b9505b1a83959b246
     v3.26.1: 7f8baf18f4d7954b6f16b1ddcdadbc818cae2fe1f72137464ccc7b8e6fef03a0
@@ -611,6 +615,7 @@ ciliumcli_binary_checksums:
     v0.14.1: 0
     v0.14.0: 0
 calico_crds_archive_checksums:
+  v3.26.4: 481e52de684c049f3f7f7bac78f0f6f4ae424d643451adc9e3d3fa9d03fb6d57
   v3.26.3: b51817e7ae5189b0737ccc901b7b5950a4f84b6029eebfdcc3e3b851bd410d03
   v3.26.2: 8c15b29db525c4cab7bea304357c942a0d55483c03d9c2a0ed3303f66b8f9ff8
   v3.26.1: 6d0afbbd4bdfe4deb18d0ac30adb7165eb08b0114ec5a00d016f37a8caf88849
diff --git a/roles/download/defaults/main/main.yml b/roles/download/defaults/main/main.yml
index 19969b478..8ff47f666 100644
--- a/roles/download/defaults/main/main.yml
+++ b/roles/download/defaults/main/main.yml
@@ -101,7 +101,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.26.3"
+calico_version: "v3.26.4"
 calico_ctl_version: "{{ calico_version }}"
 calico_cni_version: "{{ calico_version }}"
 calico_flexvol_version: "{{ calico_version }}"