Skip to content

Commit

Permalink
build,packages,salt: Update Calico
Browse files Browse the repository at this point in the history
Update Calico from 3.17.0 to 3.19.0

Calico binaries sha256 updated from:
  https://github.com/projectcalico/cni-plugin/releases/tag/v3.19.0

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

Deployment manifest updated based on upstream from:
  https://docs.projectcalico.org/v3.19/manifests/calico.yaml

Refs: #3279
  • Loading branch information
alexandre-allard committed May 11, 2021
1 parent b9475d6 commit 0548449
Show file tree
Hide file tree
Showing 4 changed files with 145 additions and 86 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
dex image from v2.27.0 to v2.28.1
(PR[#3370](https://github.com/scality/metalk8s/pull/3370))

- [#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/))

### Breaking changes

- [#2199](https://github.com/scality/metalk8s/issues/2199) - Prometheus label
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.17.0"
CALICO_VERSION: str = "3.19.0"
K8S_VERSION: str = "1.21.0"
SALT_VERSION: str = "3002.6"
CONTAINERD_VERSION: str = "1.4.3"
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:92227666988edccd1222d463173489fd656c5a37b8dedab0dadfbc22a471893a",
digest="sha256:b6f8efff537a3618a84e715f86b6beac9199217a4b9293dad43adb0ac4bace2e",
),
Image(
name="calico-kube-controllers",
version=_version_prefix(CALICO_VERSION),
digest="sha256:78a6e7648e22b2c87fcc06db610d753e49c6f9b3cf622ab23fdc3a63c1563fc8",
digest="sha256:1f6affe77017e121d7ee1afae8bd9a8476ef860fb238a866401190b62d1808f1",
),
Image(
name="configmap-reload",
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 9325d1ead70f2afb9222da64f0c7eaa1f3c5f68763241d6b07cff3a853b783f2
%global calico_ipam_sha256 9325d1ead70f2afb9222da64f0c7eaa1f3c5f68763241d6b07cff3a853b783f2
%global calico_sha256 78d2e1ef77c81775c907489b4ce174d72c8e04638edf4b0017299b0d2f39b9e5
%global calico_ipam_sha256 78d2e1ef77c81775c907489b4ce174d72c8e04638edf4b0017299b0d2f39b9e5
%endif

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

Expand Down Expand Up @@ -49,6 +49,9 @@ install -p -m 755 %{SOURCE2} %{buildroot}/opt/cni/bin/calico-ipam
%doc README.md

%changelog
* Tue May 11 2021 Alexandre Allard <[email protected]> - 3.19.0-1
- Version bump

* Wed Nov 25 2020 Teddy Andrieux <[email protected]> - 3.17.0-1
- Version bump

Expand Down
Loading

0 comments on commit 0548449

Please sign in to comment.