From 5c2d6996c6603708c212b042e007ef0e1defa7a0 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Thu, 24 Apr 2025 04:14:12 +0000 Subject: [PATCH 1/6] bump go to 1.24.2 --- .go-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.go-version b/.go-version index d8c40e53..e4a973f9 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.23.6 +1.24.2 From 9e8fe397af1da447bee11c3e48479d0005654404 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Thu, 24 Apr 2025 04:16:31 +0000 Subject: [PATCH 2/6] bump containerd to latest stable (2.0.5) --- images/base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/base/Dockerfile b/images/base/Dockerfile index 0f02c576..7218ff92 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.0.3" +ARG CONTAINERD_VERSION="v2.0.5" 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 c9432c3662feda15291b54bdb84833bf0ef2969a Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Thu, 24 Apr 2025 04:17:51 +0000 Subject: [PATCH 3/6] bump runc to latest stable (1.2.6, which matches containerd 2.0.5) --- images/base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/base/Dockerfile b/images/base/Dockerfile index 7218ff92..dddfb02a 100644 --- a/images/base/Dockerfile +++ b/images/base/Dockerfile @@ -140,7 +140,7 @@ RUN git clone --filter=tree:0 "${CONTAINERD_CLONE_URL}" /containerd \ # stage for building runc FROM go-build AS build-runc ARG TARGETARCH GO_VERSION -ARG RUNC_VERSION="v1.2.5" +ARG RUNC_VERSION="v1.2.6" ARG RUNC_CLONE_URL="https://github.com/opencontainers/runc" RUN git clone --filter=tree:0 "${RUNC_CLONE_URL}" /runc \ && cd /runc \ From e49a49dabd8ea4a50964afbdf219780b9378c11b Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Thu, 24 Apr 2025 04:24:49 +0000 Subject: [PATCH 4/6] update 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 698a00c6..9f6396e5 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:v20250312-b98dc21a" +const DefaultBaseImage = "docker.io/kindest/base:v20250424-c9432c36" From 66a7fbf3935e04ae846e054588e7a26a5b69023a Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Wed, 23 Apr 2025 22:45:01 -0700 Subject: [PATCH 5/6] temp: 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 7be06bdd..5fb488e0 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.32.3@sha256:b36e76b4ad37b88539ce5e07425f77b29f73a8eaaebf3f1a8bc9c764401d118c" +const Image = "kindest/node:v1.33.0@sha256:91e9ed777db80279c22d1d1068c091b899b2078506e4a0f797fbf6e397c0b0b2" From 8950d6cc4494ba76870f36e4ac8a28a6855ee5d0 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Thu, 24 Apr 2025 17:33:26 -0700 Subject: [PATCH 6/6] switch remaining workflows to ubuntu-24.04 --- .github/workflows/docker.yaml | 2 +- .github/workflows/nerdctl.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 771848f5..93ae78a4 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -14,7 +14,7 @@ permissions: jobs: docker: name: Docker - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 timeout-minutes: 30 strategy: fail-fast: false diff --git a/.github/workflows/nerdctl.yaml b/.github/workflows/nerdctl.yaml index 4f22debb..1a1b549c 100644 --- a/.github/workflows/nerdctl.yaml +++ b/.github/workflows/nerdctl.yaml @@ -14,7 +14,7 @@ permissions: jobs: nerdctl: name: Nerdctl - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 timeout-minutes: 30 strategy: fail-fast: false