Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Calico to 3.16.1 #2824

Merged
merged 3 commits into from
Oct 2, 2020
Merged

Upgrade Calico to 3.16.1 #2824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
445d343
calico: Update to Calico 3.16.1
TeddyAndrieux Oct 1, 2020
d4c6457
salt: Use cidr as detection method for calico IP
TeddyAndrieux Oct 1, 2020
7d3713c
salt: Tie `calico-kube-controllers` to master nodes
TeddyAndrieux Oct 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ to 1.17.9 (PR [#2363](https://github.com/scality/metalk8s/pull/2679))
- [#2572](https://github.com/scality/metalk8s/issues/2572) - Bump CoreDNS
version to 1.6.5 (PR [#2582](https://github.com/scality/metalk8s/pull/2582))

- Bump Calico version to 3.16.1
(PR[#2824](https://github.com/scality/metalk8s/pull/2824))

## Release 2.5.2 (in development)

### Enhancements
Expand Down
6 changes: 3 additions & 3 deletions buildchain/buildchain/versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

# Project-wide versions {{{

CALICO_VERSION : str = '3.12.0'
CALICO_VERSION : str = '3.16.1'
K8S_VERSION : str = '1.17.9'
SALT_VERSION : str = '3000.3'
CONTAINERD_VERSION : str = '1.2.13'
Expand Down Expand Up @@ -87,12 +87,12 @@ def _version_prefix(version: str, prefix: str = 'v') -> str:
Image(
name='calico-node',
version=_version_prefix(CALICO_VERSION),
digest='sha256:0a16ddf391c06e065c5b4db75069da9e153f9fc9dd45f92ff64a55616e0bfe26',
digest='sha256:8f7ae199f9f00e03527c515008aa1dbc21f8a27eaefe4b00ca789f732b0f0aef',
),
Image(
name='calico-kube-controllers',
version=_version_prefix(CALICO_VERSION),
digest='sha256:3a015bcc7304b13aaecbb35648fcef739f69a955d3b38af305c24f4c6d215902',
digest='sha256:04bba565d9e133ce7c8184d3b08fab09df061b7fb5936b08c5d12cc9e56a3799',
),
Image(
name='configmap-reload',
Expand Down
9 changes: 6 additions & 3 deletions packages/redhat/calico-cni-plugin.spec
View file
Open in desktop
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 020b1387d903a8f9a8b68f727972ed319f8c9af16b5ca7059539d3480999a9a6
%global calico_ipam_sha256 a5d6c71246cac61c41c22439f2890fbf4254bde2a02d1800a872d6c31b988b37
%global calico_sha256 baa67cb9fbceb2aebebd6b14e12d448c89dcf694f32b5f450ffd8b780fb3d18d
%global calico_ipam_sha256 baa67cb9fbceb2aebebd6b14e12d448c89dcf694f32b5f450ffd8b780fb3d18d
%endif

Name: calico-cni-plugin
Version: 3.12.0
Version: 3.16.1
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
* Thu Oct 1 2020 Teddy Andrieux <[email protected]> - 3.16.1-1
- Version bump

* Thu Feb 20 2020 Nicolas Trangez <[email protected]> - 3.12.0-1
- Version bump

Expand Down
Loading