Skip to content

Commit

Permalink
build,packages,salt: Update Calico to 3.23.1
Browse files Browse the repository at this point in the history
Calico binaries sha256 updated from:
  https://github.com/projectcalico/calico/releases/tag/v3.23.1

Images bumped with:
  docker.io/calico/node:v3.23.1
  docker.io/calico/kube-controllers:v3.23.1

Manifest updated based on upstream from:
  https://docs.projectcalico.org/v3.23/manifests/calico.yaml
  • Loading branch information
TeddyAndrieux committed May 18, 2022
1 parent 8c121a1 commit a87c20e
Show file tree
Hide file tree
Showing 4 changed files with 253 additions and 45 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
The pause image has been bump to 3.6
(PR[#3711](https://github.com/scality/metalk8s/pull/3711))

- Bump Calico version to [3.22.0](https://github.com/projectcalico/calico/releases/tag/v3.22.0)
(PR[#3712](https://github.com/scality/metalk8s/pull/3712))
- Bump Calico version to [3.23.1](https://github.com/projectcalico/calico/releases/tag/v3.23.1)
(PR[#3771](https://github.com/scality/metalk8s/pull/3771))

- Allow to resolve the registry endpoint from inside containers using CoreDNS
(PR[#3690](https://github.com/scality/metalk8s/pull/3690))
Expand Down
6 changes: 3 additions & 3 deletions buildchain/buildchain/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

# Project-wide versions {{{

CALICO_VERSION: str = "3.22.0"
CALICO_VERSION: str = "3.23.1"
K8S_VERSION: str = "1.23.5"
SALT_VERSION: str = "3002.8"
CONTAINERD_VERSION: str = "1.6.0"
Expand Down Expand Up @@ -97,12 +97,12 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
Image(
name="calico-node",
version=_version_prefix(CALICO_VERSION),
digest="sha256:393eb65c51e5acef64adb0648d9f2d087fcf0639f0020f757e80aa61b6fd0f77",
digest="sha256:d2c1613ef26c9ad43af40527691db1f3ad640291d5e4655ae27f1dd9222cc380",
),
Image(
name="calico-kube-controllers",
version=_version_prefix(CALICO_VERSION),
digest="sha256:cfb3941c051abfa94bfae1bb907344117fe68914cb2962b4c5640b0b84f3a1d7",
digest="sha256:e8b2af28f2c283a38b4d80436e2d2a25e70f2820d97d1a8684609d42c3973afb",
),
Image(
name="coredns",
Expand Down
9 changes: 6 additions & 3 deletions packages/redhat/common/calico-cni-plugin.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

%ifarch x86_64
%global built_arch amd64
%global calico_sha256 6bac456294a08a5bba3121e44056e264f11085f78582b1770df740ebe9a5de5c
%global calico_ipam_sha256 6bac456294a08a5bba3121e44056e264f11085f78582b1770df740ebe9a5de5c
%global calico_sha256 906c5f20c6d9b48d1ac78559fc82f86a8ffa4448c1671e77b794f84f61606cd8
%global calico_ipam_sha256 906c5f20c6d9b48d1ac78559fc82f86a8ffa4448c1671e77b794f84f61606cd8
%endif

Name: calico-cni-plugin
Version: 3.22.0
Version: 3.23.1
Release: 1%{?dist}
Summary: Calico CNI plugin

Expand Down Expand Up @@ -50,6 +50,9 @@ install -p -m 755 %{_builddir}/release-v%{version}/bin/cni/%{built_arch}/calico-
%doc README.md

%changelog
* Wed May 18 2022 Teddy Andrieux <[email protected]> - 3.23.1.1-1
- Version bump

* Fri Feb 18 2022 Teddy Andrieux <[email protected]> - 3.22.0.1-1
- Version bump

Expand Down
Loading

0 comments on commit a87c20e

Please sign in to comment.