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

build, pkgs: Bump containerd to 1.6.36 and pause to 3.10 #4460

Merged
merged 2 commits into from
Nov 18, 2024
Merged

build, pkgs: Bump containerd to 1.6.36 and pause to 3.10 #4460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50672ac
build, pkgs: Bump containerd to 1.6.36 and pause to 3.10
eg-ayoub Oct 18, 2024
5c0828a
add doc to bump containerd
eg-ayoub Nov 15, 2024
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
4 changes: 4 additions & 0 deletions BUMPING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,3 +146,7 @@ This guide is applied for both `metalk8s-operator` and `storage-operator`.
- Update manifest in `salt/metalk8s/kubernetes/cni/calico/deployed.sls`:
- copy the file from [here](https://github.com/projectcalico/calico/blob/$version/manifests/calico.yaml).
- apply metalk8s patches as they will show up in the diffs. All Metalk8s necessary changes have appended comments.

## Containerd

Instructions to bump Containerd version are in its [spec file](./packages/redhat/common/containerd.spec)
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@
- Bump Calico version to [3.29.0](https://github.com/projectcalico/calico/releases/tag/v3.29.0)
(PR[#4457](https://github.com/scality/metalk8s/pull/4457))

- Bump containerd to [1.6.36](https://github.com/containerd/containerd/releases/tag/v1.6.36)
The pause image has been bump to 3.10
(PR[#4460](https://github.com/scality/metalk8s/pull/4460))

## Release 128.0.1 (in development)

## Release 128.0.0
Expand Down
8 changes: 4 additions & 4 deletions buildchain/buildchain/versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@

CALICO_VERSION: str = "3.29.0"
SALT_VERSION: str = "3002.9"
CONTAINERD_VERSION: str = "1.6.35"
CONTAINERD_VERSION: str = "1.6.36"

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


Expand Down Expand Up @@ -197,8 +197,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
),
Image(
name="pause",
version="3.9",
digest="sha256:e6f1816883972d4be47bd48879a08919b96afcd344132622e4d444987919323c",
version="3.10",
digest="sha256:873ed75102791e5b0b8a7fcd41606c92fcec98d56d05ead4ac5131650004c136",
),
Image(
name="prometheus",
Expand Down
Loading
Loading