Bump up go version to 1.24 and cri-api to 0.33.0 #11823

djdongjin · 2025-05-07T21:28:01Z

Commit 1: bump golang in CI to 1.24.3.

go1.24.3 (released 2025-05-06) includes security fixes to the os package, as well as bug fixes to the runtime, the compiler, the linker, the go command, and the crypto/tls and os packages. See the Go 1.24.3 milestone on our issue tracker for details.

Commit 2: bump go min version to 1.24.3, as we already released containerd 2.1.

Commit 3: bump k8s.io/cri-api to 0.33.0 (depends on commit 2), A few PRs require k8s/cri-api side bumps:

go.mod

AkihiroSuda · 2025-05-08T07:14:00Z

.github/workflows/ci.yml

      matrix:
        os: [ubuntu-22.04, ubuntu-24.04, ubuntu-24.04-arm, macos-13, windows-2019, windows-2022]
-        go-version: ["1.23.8", "1.24.2"]
+        go-version: ["1.23.9", "1.24.3"]


1.23.9 is meaningless as go.mod now requires 1.24

you're right, but somehow the CI didn't fail 🤔. anyway removed 1.23.x

CI didn't fail probably because it automatically updated Go 1.23 to 1.24.

We should have GOTOOLCHAIN=local to prevent this

If the required modules is larger than the current go version in go.mod, it will attempt to download the latest go version and compile.

ref: https://go.dev/doc/toolchain#download

djdongjin · 2025-05-14T19:20:17Z

@dmcgowan @AkihiroSuda @samuelkarp @thaJeztah are we good to merge this PR and bump go min version to 1.24 :) thanks!

thaJeztah

LGTM

djdongjin · 2025-05-18T20:09:46Z

@AkihiroSuda @samuelkarp could you help add this PR to merge queue again 🙏thanks!

samuelkarp · 2025-05-23T18:54:43Z

@djdongjin Can you rebase this on main?

Signed-off-by: Jin Dong <djdongjin95@gmail.com>

djdongjin · 2025-05-23T22:54:12Z

@samuelkarp can we try merge queue one more time 😅 🙏

failure doesn't seem related

=== Failed
=== FAIL: plugins/snapshots/devmapper TestSnapshotterSuite/LayerFileupdate (1.39s)
    log_hook.go:47: time="2025-05-23T22:07:01.470887486Z" level=info msg="initializing pool device \"containerd-snapshotter-suite-pool-380465626\"" func=devmapper.NewPoolDevice file="/home/runner/work/containerd/containerd/plugins/snapshots/devmapper/pool_device.go:46" testcase=TestSnapshotterSuite/LayerFileupdate

lujinda · 2025-05-27T07:50:38Z

Go 1.24 map[uint64]struct{} has a 10% performance degradation issue. Should we be aware of this? golang/go#71368
golang/go#70835

mikebrow

LGTM

austinvazquez · 2025-05-28T01:26:51Z

Go 1.24 map[uint64]struct{} has a 10% performance degradation issue. Should we be aware of this? golang/go#71368 golang/go#70835

@lujinda, for what it is worth, the Go 1.24 minimum requirement is only on main branch. We try not to backport Go min changes to release branches unless absolutely required. This means Go 1.24 will not be a required minimum until containerd v2.2 which is currently expected in November 2025, and by that time Go 1.23 should be out of support.

Bump up go version to 1.24 and cri-api to 0.33.0

Signed-off-by: Sascha Grunert <sgrunert@redhat.com> Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com> Signed-off-by: Sascha Grunert <sgrunert@redhat.com>

github-project-automation bot added this to Pull Request Review May 7, 2025

github-project-automation bot moved this to Needs Triage in Pull Request Review May 7, 2025

k8s-ci-robot added the size/XXL label May 7, 2025

dosubot bot added dependencies Pull requests that update a dependency file go Pull requests that update Go code labels May 7, 2025

thaJeztah reviewed May 7, 2025

View reviewed changes

go.mod Outdated Show resolved Hide resolved

go.mod Outdated Show resolved Hide resolved

djdongjin force-pushed the go-mod-1.24 branch from 15464c5 to df3fd71 Compare May 7, 2025 21:59

djdongjin changed the title ~~Bump up go.mod go version to 1.24.0 and k8s deps~~ Bump up go.mod go version to 1.24.0 and cri-api May 7, 2025

djdongjin force-pushed the go-mod-1.24 branch 5 times, most recently from 20296b1 to 10afa3d Compare May 7, 2025 23:49

AkihiroSuda reviewed May 8, 2025

View reviewed changes

djdongjin force-pushed the go-mod-1.24 branch from 10afa3d to a38e204 Compare May 8, 2025 13:46

djdongjin changed the title ~~Bump up go.mod go version to 1.24.0 and cri-api~~ Bump up go version to 1.24 and cri-api to 0.33.0 May 8, 2025

djdongjin requested review from AkihiroSuda and thaJeztah May 8, 2025 13:51

djdongjin force-pushed the go-mod-1.24 branch from a38e204 to c0c1f40 Compare May 11, 2025 14:33

samuelkarp mentioned this pull request May 13, 2025

[SIG-Node]: KEP-4960 - Container Stop Signals #11617

Open

djdongjin mentioned this pull request May 14, 2025

chore: remove go version specific code #11857

Merged

samuelkarp approved these changes May 14, 2025

View reviewed changes

AkihiroSuda approved these changes May 15, 2025

View reviewed changes

github-project-automation bot moved this from Needs Triage to Review In Progress in Pull Request Review May 15, 2025

AkihiroSuda added this pull request to the merge queue May 15, 2025

github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 15, 2025

samuelkarp added this pull request to the merge queue May 15, 2025

github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 15, 2025

thaJeztah approved these changes May 15, 2025

View reviewed changes

github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 15, 2025

AkihiroSuda added this pull request to the merge queue May 18, 2025

github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 18, 2025

k8s-ci-robot added the needs-rebase label May 23, 2025

djdongjin added 3 commits May 23, 2025 19:36

ci: bump up go to 1.24.3

b9a29bd

Signed-off-by: Jin Dong <djdongjin95@gmail.com>

go.mod: bump up go to 1.24.3

a4dd2b8

Signed-off-by: Jin Dong <djdongjin95@gmail.com>

dep: bump up k8s.io/cri-api to 0.33.0

e57b9f7

Signed-off-by: Jin Dong <djdongjin95@gmail.com>

djdongjin force-pushed the go-mod-1.24 branch from c0c1f40 to e57b9f7 Compare May 23, 2025 19:37

k8s-ci-robot removed the needs-rebase label May 23, 2025

samuelkarp approved these changes May 23, 2025

View reviewed changes

samuelkarp added this pull request to the merge queue May 23, 2025

github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 23, 2025

samuelkarp added this pull request to the merge queue May 23, 2025

github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 23, 2025

samuelkarp added this pull request to the merge queue May 23, 2025

github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 23, 2025

laurazard approved these changes May 25, 2025

View reviewed changes

azr approved these changes May 27, 2025

View reviewed changes

mikebrow approved these changes May 27, 2025

View reviewed changes

mikebrow added this pull request to the merge queue May 27, 2025

Merged via the queue into containerd:main with commit e393f41 May 27, 2025
89 of 91 checks passed

github-project-automation bot moved this from Review In Progress to Done in Pull Request Review May 27, 2025

ningmingxiao pushed a commit to ningmingxiao/containerd that referenced this pull request Jun 4, 2025

Merge pull request containerd#11823 from djdongjin/go-mod-1.24

e9d2ebf

Bump up go version to 1.24 and cri-api to 0.33.0

mauriciovasquezbernal referenced this pull request in containerd/nri Aug 22, 2025

Drop tinygo requirement

f6f8d03

Signed-off-by: Sascha Grunert <sgrunert@redhat.com> Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com> Signed-off-by: Sascha Grunert <sgrunert@redhat.com>

Bump up go version to 1.24 and cri-api to 0.33.0 #11823

Bump up go version to 1.24 and cri-api to 0.33.0 #11823

Uh oh!

Conversation

djdongjin commented May 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AkihiroSuda May 8, 2025

Choose a reason for hiding this comment

Uh oh!

djdongjin May 8, 2025

Choose a reason for hiding this comment

Uh oh!

AkihiroSuda May 8, 2025

Choose a reason for hiding this comment

Uh oh!

yylt May 9, 2025

Choose a reason for hiding this comment

Uh oh!

djdongjin commented May 14, 2025

Uh oh!

Uh oh!

Uh oh!

thaJeztah left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

djdongjin commented May 18, 2025

Uh oh!

Uh oh!

samuelkarp commented May 23, 2025

Uh oh!

Uh oh!

Uh oh!

djdongjin commented May 23, 2025

Uh oh!

Uh oh!

lujinda commented May 27, 2025

Uh oh!

mikebrow left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

austinvazquez commented May 28, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

djdongjin commented May 7, 2025 •

edited

Loading