Skip to content

Commit

Permalink
build,salt: Upgrade Calico to 3.24.1
Browse files Browse the repository at this point in the history
Images bumped with:
  docker.io/calico/node:v3.24.1
  docker.io/calico/kube-controllers:v3.24.1
  docker.io/calico/cni:v3.24.1

Manifest updated based on upstream from:
  https://github.com/projectcalico/calico/blob/v3.24.1/manifests/calico.yaml
  • Loading branch information
TeddyAndrieux committed Sep 30, 2022
1 parent 71d715a commit 77d364c
Show file tree
Hide file tree
Showing 3 changed files with 180 additions and 100 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
The pause image has been bump to 3.8
(PR[#3881](https://github.com/scality/metalk8s/pull/3881))

- Bump Calico version to [3.24.1](https://github.com/projectcalico/calico/releases/tag/v3.24.1)
(PR[#3884](https://github.com/scality/metalk8s/pull/3884))

- Bump Prometheus Adapter chart version to
[3.4.0](https://github.com/prometheus-community/helm-charts/releases/tag/prometheus-adapter-3.4.0)
The prometheus-adapter image has been bumped accordingly to
Expand Down
9 changes: 4 additions & 5 deletions buildchain/buildchain/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@

# Project-wide versions {{{

CALICO_VERSION: str = "3.23.1"
CALICO_VERSION: str = "3.24.1"
K8S_VERSION: str = "1.24.6"
SALT_VERSION: str = "3002.9"
CONTAINERD_VERSION: str = "1.6.8"

CALICO_RELEASE: str = "1"
CONTAINERD_RELEASE: str = "1"
SOSREPORT_RELEASE: str = "2"

Expand Down Expand Up @@ -106,17 +105,17 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
Image(
name="calico-cni",
version=_version_prefix(CALICO_VERSION),
digest="sha256:26802bb7714fda18b93765e908f2d48b0230fd1c620789ba2502549afcde4338",
digest="sha256:e60b90d7861e872efa720ead575008bc6eca7bee41656735dcaa8210b688fcd9",
),
Image(
name="calico-node",
version=_version_prefix(CALICO_VERSION),
digest="sha256:d2c1613ef26c9ad43af40527691db1f3ad640291d5e4655ae27f1dd9222cc380",
digest="sha256:43f6cee5ca002505ea142b3821a76d585aa0c8d22bc58b7e48589ca7deb48c13",
),
Image(
name="calico-kube-controllers",
version=_version_prefix(CALICO_VERSION),
digest="sha256:e8b2af28f2c283a38b4d80436e2d2a25e70f2820d97d1a8684609d42c3973afb",
digest="sha256:4010b2739792ae5e77a750be909939c0a0a372e378f3c81020754efcf4a91efa",
),
Image(
name="coredns",
Expand Down
Loading

0 comments on commit 77d364c

Please sign in to comment.