From 1989db54d968f2814357270c19ed9499846e8add Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Thu, 13 Feb 2025 12:45:00 -0800 Subject: [PATCH 1/3] bump base image with statically linked plugins --- 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 2073c989d3..21acc81331 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:v20250117-f528b021" +const DefaultBaseImage = "docker.io/kindest/base:v20250212-53ff1fb7" From 673b9425ac72fb857688a17ea380d8f04397bc75 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Thu, 13 Feb 2025 12:52:27 -0800 Subject: [PATCH 2/3] enhance push-node script --- hack/release/push-node.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hack/release/push-node.sh b/hack/release/push-node.sh index 5f9faeff8e..16f8c78cc5 100755 --- a/hack/release/push-node.sh +++ b/hack/release/push-node.sh @@ -25,13 +25,20 @@ IMAGE_NAME="${IMAGE_NAME:-node}" REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." &> /dev/null && pwd -P)" cd "${REPO_ROOT}" -VERSION="$1" +VERSION="${1:-}" +if [[ -z "${VERSION}" ]]; then + echo >&2 "version argument not supplied, looking up current stable ..." + VERSION="$(curl -sL https://dl.k8s.io/release/stable.txt)" +fi +echo >&2 "will build node image for Kubernetes ${VERSION} ..." # ensure we have up to date kind +echo >&2 "building kind ..." make build # ensure we have qemu setup so we can run cross-arch images # TODO: dedupe specifying this image? +echo >&2 "ensuring binfmt_misc ..." docker run --rm --privileged tonistiigi/binfmt:qemu-v7.0.0-28@sha256:66e11bea77a5ea9d6f0fe79b57cd2b189b5d15b93a2bdb925be22949232e4e55 --install all # NOTE: adding platforms is costly in terms of build time @@ -48,6 +55,7 @@ IMAGE="${REGISTRY}/${IMAGE_NAME}:${VERSION}" images=() for arch in "${__arches__[@]}"; do image="${REGISTRY}/${IMAGE_NAME}-${arch}:${VERSION}" + echo >&2 "building ${image} ..." "${REPO_ROOT}/bin/kind" build node-image --image="${image}" --arch="${arch}" "${VERSION}" images+=("${image}") done From b258ce2c371fc8b00697d0c2e2f45da933e0a4ae Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Thu, 13 Feb 2025 12:56:42 -0800 Subject: [PATCH 3/3] update default node image to 1.32.2 --- 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 7ff018816f..16808e4bbd 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.1@sha256:6afef2b7f69d627ea7bf27ee6696b6868d18e03bf98167c420df486da4662db6" +const Image = "kindest/node:v1.32.2@sha256:ec2582d73b2982e0c515f6630a6d3af5a599f5f8a830d2f65f09e61600314b88"