From 31a79fd4b952ded0fe07ea991ef53b9d0158c5ea Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 20 May 2025 17:05:07 -0700 Subject: [PATCH 1/4] upgrade containerd to 2.1.1 --- images/base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/base/Dockerfile b/images/base/Dockerfile index dfe41e1dfc..4a1e616f80 100644 --- a/images/base/Dockerfile +++ b/images/base/Dockerfile @@ -122,7 +122,7 @@ RUN eval "$(gimme "${GO_VERSION}")" \ # stage for building containerd FROM go-build AS build-containerd ARG TARGETARCH GO_VERSION -ARG CONTAINERD_VERSION="v2.1.0" +ARG CONTAINERD_VERSION="v2.1.1" ARG CONTAINERD_CLONE_URL="https://github.com/containerd/containerd" # we don't build with optional snapshotters, we never select any of these # they're not ideal inside kind anyhow, and we save some disk space From 06a0fcede9ac47f8f3e67fe54fb3d59f6515dd5c Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 20 May 2025 18:00:42 -0700 Subject: [PATCH 2/4] bump base image --- pkg/build/nodeimage/defaults.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/build/nodeimage/defaults.go b/pkg/build/nodeimage/defaults.go index f3af1ace6e..803f3a394a 100644 --- a/pkg/build/nodeimage/defaults.go +++ b/pkg/build/nodeimage/defaults.go @@ -22,4 +22,4 @@ const DefaultImage = "kindest/node:latest" // DefaultBaseImage is the default base image used // TODO: come up with a reasonable solution to digest pinning // https://github.com/moby/moby/issues/43188 -const DefaultBaseImage = "docker.io/kindest/base:v20250512-ceffaf4e" +const DefaultBaseImage = "docker.io/kindest/base:v20250521-31a79fd4" From 64430da6d930088735fd12751e3fafd0f76e5bc1 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 20 May 2025 18:07:12 -0700 Subject: [PATCH 3/4] use staging node image --- pkg/apis/config/defaults/image.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/apis/config/defaults/image.go b/pkg/apis/config/defaults/image.go index 411cd32ea5..6efd1da3d6 100644 --- a/pkg/apis/config/defaults/image.go +++ b/pkg/apis/config/defaults/image.go @@ -18,4 +18,4 @@ limitations under the License. package defaults // Image is the default for the Config.Image field, aka the default node image. -const Image = "kindest/node:v1.33.1@sha256:8d866994839cd096b3590681c55a6fa4a071fdaf33be7b9660e5697d2ed13002" +const Image = "gcr.io/k8s-staging-kind/node:v1.33.1@sha256:050072256b9a903bd914c0b2866828150cb229cea0efe5892e2b644d5dd3b34f" From d4708afcdcd1e0ee214224c150dd1aa8beb7b28e Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 20 May 2025 18:12:43 -0700 Subject: [PATCH 4/4] switch to promoted v1.33.1 with containerd 2.1.1 node image --- pkg/apis/config/defaults/image.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/apis/config/defaults/image.go b/pkg/apis/config/defaults/image.go index 6efd1da3d6..c1e19f80b6 100644 --- a/pkg/apis/config/defaults/image.go +++ b/pkg/apis/config/defaults/image.go @@ -18,4 +18,4 @@ limitations under the License. package defaults // Image is the default for the Config.Image field, aka the default node image. -const Image = "gcr.io/k8s-staging-kind/node:v1.33.1@sha256:050072256b9a903bd914c0b2866828150cb229cea0efe5892e2b644d5dd3b34f" +const Image = "kindest/node:v1.33.1@sha256:050072256b9a903bd914c0b2866828150cb229cea0efe5892e2b644d5dd3b34f"