8000 Merge pull request #3861 from BenTheElder/bump-base-static · orange-guo/kind@8094f03 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8094f03

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-sigs#3861 from BenTheElder/bump-base-static
bump base image with statically linked plugins, improve new push-node.sh, adopt 1.32.2
2 parents 53ff1fb + b258ce2 commit 8094f03

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

‎hack/release/push-node.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,20 @@ IMAGE_NAME="${IMAGE_NAME:-node}"
2525
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." &> /dev/null && pwd -P)"
2626
cd "${REPO_ROOT}"
2727

28-
VERSION="$1"
28+
VERSION="${1:-}"
29+
if [[ -z "${VERSION}" ]]; then
30+
echo >&2 "version argument not supplied, looking up current stable ..."
31+
VERSION="$(curl -sL https://dl.k8s.io/release/stable.txt)"
32+
fi
33+
echo >&2 "will build node image for Kubernetes ${VERSION} ..."
2934

3035
# ensure we have up to date kind
36+
echo >&2 "building kind ..."
3137
make build
3238

3339
# ensure we have qemu setup so we can run cross-arch images
3440
# TODO: dedupe specifying this image?
41+
echo >&2 "ensuring binfmt_misc ..."
3542
docker run --rm --privileged tonistiigi/binfmt:qemu-v7.0.0-28@sha256:66e11bea77a5ea9d6f0fe79b57cd2b189b5d15b93a2bdb925be22949232e4e55 --install all
3643

3744
# NOTE: adding platforms is costly in terms of build time
@@ -48,6 +55,7 @@ IMAGE="${REGISTRY}/${IMAGE_NAME}:${VERSION}"
4855
images=()
4956
for arch in "${__arches__[@]}"; do
5057
image="${REGISTRY}/${IMAGE_NAME}-${arch}:${VERSION}"
58+
echo >&2 "building ${image} ..."
5159
"${REPO_ROOT}/bin/kind" build node-image --image="${image}" --arch="${arch}" "${VERSION}"
5260
images+=("${image}")
5361
done

‎pkg/apis/config/defaults/image.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ limitations under the License.
1818
package defaults
1919

2020
// Image is the default for the Config.Image field, aka the default node image.
21-
const Image = "kindest/node:v1.32.1@sha256:6afef2b7f69d627ea7bf27ee6696b6868d18e03bf98167c420df486da4662db6"
21+
const Image = "kindest/node:v1.32.2@sha256:ec2582d73b2982e0c515f6630a6d3af5a599f5f8a830d2f65f09e61600314b88"

‎pkg/build/nodeimage/defaults.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ const DefaultImage = "kindest/node:latest"
2222
// DefaultBaseImage is the default base image used
2323
// TODO: come up with a reasonable solution to digest pinning
2424
// https://github.com/moby/moby/issues/43188
25-
const DefaultBaseImage = "docker.io/kindest/base:v20250117-f528b021"
25+
const DefaultBaseImage = "docker.io/kindest/base:v20250212-53ff1fb7"

0 commit comments

Comments
 (0)
0