Skip to content

revert containerd-2.2 update and changelog update to v1.60.0 #4824

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

Merged
piyush-jena merged 3 commits into from
May 1, 2026
Merged

revert containerd-2.2 update and changelog update to v1.60.0 #4824

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
a2772f9
twoliter: bump kernel-kit to v5.4.1
piyush-jena May 1, 2026
6ca684b
Revert "feat(variants): bump containerd-2.1 variants to containerd 2.2"
piyush-jena May 1, 2026
827ca44
changelog: update changelog to drop containerd-2.2 update and bump ke…
piyush-jena May 1, 2026
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
19 changes: 7 additions & 12 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
# v1.60.0 (2026-04-28)
# v1.60.0 (2026-05-04)

## Release Highlights
* Update `containerd` 2.1 to 2.2 on the following variants ([#4801]):
* `aws-k8s-1.30-nvidia-fips`
* `aws-k8s-1.31-nvidia-fips`
* `aws-k8s-1.33+`
* `aws-ecs-3-*`
* `vmware-k8s-1.33+`
* `aws-dev` and `vmware-dev`
* Add `topology-manager-policy-options` settings (`prefer-closest-numa-nodes`, `max-allowable-numa-nodes`) ([#4778], [bottlerocket-core-kit#901])
* Add `max-concurrent-unpacks` setting support for `containerd-2.2` ([#4801], [bottlerocket-core-kit#886])
Comment thread
KCSesh marked this conversation as resolved.

## Security Fixes
* Patch `kernel-6.1`, `kernel-6.12` and `kernel-6.18` to mitigate CVE-2026-31431 ([bottlerocket-kernel-kit#416])

## OS Changes
* Update `bottlerocket-core-kit` from 14.1.0 to 14.2.0 [CHANGELOG](https://github.com/bottlerocket-os/bottlerocket-core-kit/blob/develop/CHANGELOG.md#v1420) ([commits](https://github.com/bottlerocket-os/bottlerocket-core-kit/compare/v14.1.0...v14.2.0)) ([#4818])
* Update `bottlerocket-kernel-kit` from 5.3.3 to 5.4.0 [CHANGELOG](https://github.com/bottlerocket-os/bottlerocket-kernel-kit/blob/develop/CHANGELOG.md#v540) ([commits](https://github.com/bottlerocket-os/bottlerocket-kernel-kit/compare/v5.3.3...v5.4.0)) ([#4818])
* Update `bottlerocket-kernel-kit` from 5.3.3 to 5.4.1 [CHANGELOG](https://github.com/bottlerocket-os/bottlerocket-kernel-kit/blob/develop/CHANGELOG.md#v541) ([commits](https://github.com/bottlerocket-os/bottlerocket-kernel-kit/compare/v5.3.3...v5.4.1)) ([#4818] [#4824])
* Use the 6.18 kernel for `aws-dev` variant ([#4802])
* Update `admin-container` from 0.20.5 to 0.20.6 [CHANGELOG](https://github.com/bottlerocket-os/bottlerocket-admin-container/blob/develop/CHANGELOG.md#0206) ([commits](https://github.com/bottlerocket-os/bottlerocket-admin-container/compare/v0.20.5...v0.20.6)) ([#4820])
* Update `control-container` from 0.20.5 to 0.20.6 [CHANGELOG](https://github.com/bottlerocket-os/bottlerocket-control-container/blob/develop/CHANGELOG.md#0206) ([commits](https://github.com/bottlerocket-os/bottlerocket-control-container/compare/v0.20.5...v0.20.6)) ([#4820])
Expand All @@ -32,11 +27,11 @@
[#4765]: https://github.com/bottlerocket-os/bottlerocket/pull/4765
[#4778]: https://github.com/bottlerocket-os/bottlerocket/pull/4778
[#4792]: https://github.com/bottlerocket-os/bottlerocket/pull/4792
[#4801]: https://github.com/bottlerocket-os/bottlerocket/pull/4801
[#4802]: https://github.com/bottlerocket-os/bottlerocket/pull/4802
[#4818]: https://github.com/bottlerocket-os/bottlerocket/pull/4818
[#4820]: https://github.com/bottlerocket-os/bottlerocket/pull/4820
[bottlerocket-core-kit#886]: https://github.com/bottlerocket-os/bottlerocket-core-kit/pull/886
[#4824]: https://github.com/bottlerocket-os/bottlerocket/pull/4824
[bottlerocket-kernel-kit#416]: https://github.com/bottlerocket-os/bottlerocket-kernel-kit/pull/416
[bottlerocket-core-kit#896]: https://github.com/bottlerocket-os/bottlerocket-core-kit/pull/896
[bottlerocket-core-kit#901]: https://github.com/bottlerocket-os/bottlerocket-core-kit/pull/901

Expand Down
6 changes: 3 additions & 3 deletions Twoliter.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ digest = "0eWj4taxRMckHeUNLcPSAS8dYNessdJrDR1+poSjqM4="

[[kit]]
name = "bottlerocket-kernel-kit"
version = "5.4.0"
version = "5.4.1"
vendor = "bottlerocket"
source = "public.ecr.aws/bottlerocket/bottlerocket-kernel-kit:v5.4.0"
digest = "GyFMZxHNXragPnJnoR9QY2vWZAT0UZMUMPB5f9pMF7U="
source = "public.ecr.aws/bottlerocket/bottlerocket-kernel-kit:v5.4.1"
digest = "vK5mD+mvbv74cflqJMKAKZMMAADx1X5gLl3fFK2UYiE="

[[kit]]
name = "bottlerocket-core-kit"
Expand Down
2 changes: 1 addition & 1 deletion Twoliter.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ vendor = "bottlerocket"

[[kit]]
name = "bottlerocket-kernel-kit"
version = "5.4.0"
version = "5.4.1"
vendor = "bottlerocket"

[[kit]]
Expand Down
2 changes: 1 addition & 1 deletion variants/aws-dev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ included-packages = [
# core
"release",
"kernel-6.18",
"containerd-2.2",
"containerd-2.1",
"systemd-257",
"nftables",
"whippet",
Expand Down
2 changes: 1 addition & 1 deletion variants/aws-ecs-3-fips/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ included-packages = [
# core
"release",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"systemd-257",
"nftables",
"whippet",
Expand Down
2 changes: 1 addition & 1 deletion variants/aws-ecs-3-nvidia-fips/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ included-packages = [
# core
"release",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"systemd-257",
"nftables",
"whippet",
Expand Down
2 changes: 1 addition & 1 deletion variants/aws-ecs-3-nvidia/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ included-packages = [
# core
"release",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"systemd-257",
"nftables",
"whippet",
Expand Down
2 changes: 1 addition & 1 deletion variants/aws-ecs-3/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ included-packages = [
# core
"release",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"systemd-257",
"nftables",
"whippet",
Expand Down
2 changes: 1 addition & 1 deletion variants/aws-k8s-1.30-nvidia-fips/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ included-packages = [
# core
"release",
"kernel-6.1",
"containerd-2.2",
"containerd-2.1",
"whippet",
# k8s
"cni",
Expand Down
2 changes: 1 addition & 1 deletion variants/aws-k8s-1.31-nvidia-fips/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ included-packages = [
# core
"release",
"kernel-6.1",
"containerd-2.2",
"containerd-2.1",
"whippet",
# k8s
"cni",
Expand Down
2 changes: 1 addition & 1 deletion variants/aws-k8s-1.32-nvidia-fips/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ included-packages = [
# core
"release",
"kernel-6.1",
"containerd-2.2",
"containerd-2.1",
"whippet",
# k8s
"cni",
Expand Down
2 changes: 1 addition & 1 deletion variants/aws-k8s-1.33-fips/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ included-packages = [
# core
"release",
"kernel-6.1",
"containerd-2.2",
"containerd-2.1",
"whippet",
# k8s
"cni",
Expand Down
2 changes: 1 addition & 1 deletion variants/aws-k8s-1.33-nvidia-fips/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ included-packages = [
# core
"release",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"whippet",
# k8s
"cni",
Expand Down
2 changes: 1 addition & 1 deletion variants/aws-k8s-1.33-nvidia/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ included-packages = [
# core
"release",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"whippet",
# k8s
"cni",
Expand Down
2 changes: 1 addition & 1 deletion variants/aws-k8s-1.33/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ included-packages = [
# core
"release",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"whippet",
# k8s
"cni",
Expand Down
2 changes: 1 addition & 1 deletion variants/aws-k8s-1.34-fips/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ included-packages = [
# core
"release",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"systemd-257",
"nftables",
"whippet",
Expand Down
2 changes: 1 addition & 1 deletion variants/aws-k8s-1.34-nvidia-fips/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ included-packages = [
# core
"release",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"systemd-257",
"nftables",
"whippet",
Expand Down
2 changes: 1 addition & 1 deletion variants/aws-k8s-1.34-nvidia/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ included-packages = [
# core
"release",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"systemd-257",
"nftables",
"whippet",
Expand Down
2 changes: 1 addition & 1 deletion variants/aws-k8s-1.34/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ included-packages = [
# core
"release",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"systemd-257",
"nftables",
"whippet",
Expand Down
2 changes: 1 addition & 1 deletion variants/aws-k8s-1.35-fips/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ included-packages = [
# core
"release-swap",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"systemd-257",
"nftables",
"whippet",
Expand Down
2 changes: 1 addition & 1 deletion variants/aws-k8s-1.35-nvidia-fips/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ included-packages = [
# core
"release-swap",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"systemd-257",
"nftables",
"whippet",
Expand Down
2 changes: 1 addition & 1 deletion variants/aws-k8s-1.35-nvidia/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ included-packages = [
# core
"release-swap",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"systemd-257",
"nftables",
"whippet",
Expand Down
2 changes: 1 addition & 1 deletion variants/aws-k8s-1.35/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ included-packages = [
# core
"release-swap",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"systemd-257",
"nftables",
"whippet",
Expand Down
2 changes: 1 addition & 1 deletion variants/vmware-dev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ included-packages = [
# core
"release",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"systemd-257",
"nftables",
"whippet",
Expand Down
2 changes: 1 addition & 1 deletion variants/vmware-k8s-1.33-fips/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ included-packages = [
# core
"release",
"kernel-6.1",
"containerd-2.2",
"containerd-2.1",
"whippet",
# k8s
"cni",
Expand Down
2 changes: 1 addition & 1 deletion variants/vmware-k8s-1.33/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ included-packages = [
# core
"release",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"whippet",
# k8s
"cni",
Expand Down
2 changes: 1 addition & 1 deletion variants/vmware-k8s-1.34-fips/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ included-packages = [
# core
"release",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"systemd-257",
"nftables",
"whippet",
Expand Down
2 changes: 1 addition & 1 deletion variants/vmware-k8s-1.34/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ included-packages = [
# core
"release",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"systemd-257",
"nftables",
"whippet",
Expand Down
2 changes: 1 addition & 1 deletion variants/vmware-k8s-1.35-fips/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ included-packages = [
# core
"release-swap",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"systemd-257",
"nftables",
"whippet",
Expand Down
2 changes: 1 addition & 1 deletion variants/vmware-k8s-1.35/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ included-packages = [
# core
"release-swap",
"kernel-6.12",
"containerd-2.2",
"containerd-2.1",
"systemd-257",
"nftables",
"whippet",
Expand Down
Loading