From 3e522a9f5927e079accc2ca757b9ff76a026d23d Mon Sep 17 00:00:00 2001
From: Mohamed Omar Zaian <mohamedzaian@gmail.com>
Date: Tue, 17 Oct 2023 08:22:39 +0200
Subject: [PATCH] [calico] Make version 3.26.3 default (#10526)
---
README.md | 2 +-
roles/download/defaults/main/checksums.yml | 10 ++++++++++
roles/download/defaults/main/main.yml | 2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 69dffe2e7..9ea6e1ee4 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.1
+ - [calico](https://github.com/projectcalico/calico) v3.26.3
- [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 342b02703..79e74a34a 100644
--- a/roles/download/defaults/main/checksums.yml
+++ b/roles/download/defaults/main/checksums.yml
@@ -390,6 +390,8 @@ cni_binary_checksums:
v0.9.1: 5bd3c82ef248e5c6cc388f25545aa5a7d318778e5f9bc0a31475361bb27acefe
calicoctl_binary_checksums:
arm:
+ v3.26.3: 0
+ v3.26.2: 0
v3.26.1: 0
v3.26.0: 0
v3.25.2: 0
@@ -412,6 +414,8 @@ calicoctl_binary_checksums:
v3.22.4: 0
v3.22.3: 0
arm64:
+ v3.26.3: c50272a39658a3b358b33c03fe10d1dde894764413279fecc72d40b95535b398
+ v3.26.2: 44de9118f481a1125e2d50cdfbb55073e744dd8e71d2be45eeb2757302910c67
v3.26.1: bba2fbdd6d2998bca144ae12c2675d65c4fbf51c0944d69b1b2f20e08cd14c22
v3.26.0: b88c4fd34293fa95d4291b7631502f6b9ad38b5f5a3889bb8012f36f001ff170
v3.25.2: 1cf28599dc1d52ef7c888731f508662a187129ff7bb3294f58319d79c517085c
@@ -434,6 +438,8 @@ calicoctl_binary_checksums:
v3.22.4: e84ba529091818282012fd460e7509995156e50854781c031c81e4f6c715a39a
v3.22.3: 3a3e70828c020efd911181102d21cb4390b7b68669898bd40c0c69b64d11bb63
amd64:
+ v3.26.3: 82bd7d12b0f6973f9593fb62f5410ad6a81ff6b79e92f1afd3e664202e8387cf
+ v3.26.2: eba9bc34f44801a513c48f730a409dc1ece0ebfd9c1acc21fd3adf0eff93ecdc
v3.26.1: c8f61c1c8e2504410adaff4a7255c65785fe7805eebfd63340ccd3c472aa42cf
v3.26.0: 19ce069f121f9e245f785a7517521e20fe3294ce1add9d1b2bbcbb0a9b9de24e
v3.25.2: b6f6017b1c9520d8eaea101442d82020123d1efc622964b20d97d3e08e198eed
@@ -456,6 +462,8 @@ calicoctl_binary_checksums:
v3.22.4: cc412783992abeba6dc01d7bc67bdb2e3a0cf2f27fc3334bdfc02d326c3c9e15
v3.22.3: a9e5f6bad4ad8c543f6bdcd21d3665cdd23edc780860d8e52a87881a7b3e203c
ppc64le:
+ v3.26.3: 30a32acbe71894a9783e350ed44294e739b3322f157b2c224ad3c058473e5701
+ v3.26.2: c4d42a85afb67020e9cf9dcafe184af6ad60c5609d60001b9505b1a83959b246
v3.26.1: 7f8baf18f4d7954b6f16b1ddcdadbc818cae2fe1f72137464ccc7b8e6fef03a0
v3.26.0: b82b931e3aa53248d87b24f00969abfe5ea4518c56a85b5894187c7b47dc452e
v3.25.2: a5e19931ce50953a36387c67b596e56c4b4fc7903893f1ad25248177027ad0dd
@@ -523,6 +531,8 @@ ciliumcli_binary_checksums:
v0.14.1: 0
v0.14.0: 0
calico_crds_archive_checksums:
+ v3.26.3: b51817e7ae5189b0737ccc901b7b5950a4f84b6029eebfdcc3e3b851bd410d03
+ v3.26.2: 8c15b29db525c4cab7bea304357c942a0d55483c03d9c2a0ed3303f66b8f9ff8
v3.26.1: 6d0afbbd4bdfe4deb18d0ac30adb7165eb08b0114ec5a00d016f37a8caf88849
v3.26.0: a263e507e79c0a131fdc2a49422d3bdf0456ea5786eb44ace2659aba879b5c7c
v3.25.2: 6a6e95a51a8ebf65d41d671f20854319cca1f26cd87fbcfc30d1382a06ecfee0
diff --git a/roles/download/defaults/main/main.yml b/roles/download/defaults/main/main.yml
index e0a675436..e93ad3ae8 100644
--- a/roles/download/defaults/main/main.yml
+++ b/roles/download/defaults/main/main.yml
@@ -100,7 +100,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.1"
+calico_version: "v3.26.3"
calico_ctl_version: "{{ calico_version }}"
calico_cni_version: "{{ calico_version }}"
calico_flexvol_version: "{{ calico_version }}"
--
GitLab