diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f793f2d2c..ac3026185b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,9 +44,8 @@ nginx-ingress-controller image has been bump accordingly from v0.41.2 to v0.46.0 (PR[#3371](https://github.com/scality/metalk8s/pull/3371)) -- [#3279](https://github.com/scality/metalk8s/issues/3279) - Bump - Calico version from 3.17.0 to 3.19.0 - (PR [#](https://github.com/scality/metalk8s/pull/)) +- Bump Calico version to 3.19.1 + (PR [#3430](https://github.com/scality/metalk8s/pull/3430)) - [#3366](https://github.com/scality/metalk8s/issues/3366) - Use `systemd` cgroupDriver for Kubelet and containerd diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py index fedb08619e..8eb643c18f 100644 --- a/buildchain/buildchain/versions.py +++ b/buildchain/buildchain/versions.py @@ -18,7 +18,7 @@ # Project-wide versions {{{ -CALICO_VERSION: str = "3.19.0" +CALICO_VERSION: str = "3.19.1" K8S_VERSION: str = "1.21.2" SALT_VERSION: str = "3002.6" CONTAINERD_VERSION: str = "1.4.3" @@ -98,12 +98,12 @@ def _version_prefix(version: str, prefix: str = "v") -> str: Image( name="calico-node", version=_version_prefix(CALICO_VERSION), - digest="sha256:b6f8efff537a3618a84e715f86b6beac9199217a4b9293dad43adb0ac4bace2e", + digest="sha256:bc4a631d553b38fdc169ea4cb8027fa894a656e80d68d513359a4b9d46836b55", ), Image( name="calico-kube-controllers", version=_version_prefix(CALICO_VERSION), - digest="sha256:1f6affe77017e121d7ee1afae8bd9a8476ef860fb238a866401190b62d1808f1", + digest="sha256:904458fe1bd56f995ef76e2c4d9a6831c506cc80f79e8fc0182dc059b1db25a4", ), Image( name="coredns", diff --git a/packages/redhat/common/calico-cni-plugin.spec b/packages/redhat/common/calico-cni-plugin.spec index 3ed70bf7db..c96769bd93 100644 --- a/packages/redhat/common/calico-cni-plugin.spec +++ b/packages/redhat/common/calico-cni-plugin.spec @@ -6,12 +6,12 @@ %ifarch x86_64 %global built_arch amd64 -%global calico_sha256 78d2e1ef77c81775c907489b4ce174d72c8e04638edf4b0017299b0d2f39b9e5 -%global calico_ipam_sha256 78d2e1ef77c81775c907489b4ce174d72c8e04638edf4b0017299b0d2f39b9e5 +%global calico_sha256 08786c58ad05bdd274ac4433e522853a08ade0cf2ca6e3cbfb5b4adb52bd303a +%global calico_ipam_sha256 08786c58ad05bdd274ac4433e522853a08ade0cf2ca6e3cbfb5b4adb52bd303a %endif Name: calico-cni-plugin -Version: 3.19.0 +Version: 3.19.1 Release: 1%{?dist} Summary: Calico CNI plugin @@ -49,6 +49,9 @@ install -p -m 755 %{SOURCE2} %{buildroot}/opt/cni/bin/calico-ipam %doc README.md %changelog +* Tue Jun 29 2021 Teddy Andrieux - 3.19.1-1 +- Version bump + * Tue May 11 2021 Alexandre Allard - 3.19.0-1 - Version bump