Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump base image with statically linked plugins, improve new push-node.sh, adopt 1.32.2 #3861

Merged
merged 3 commits into from
Feb 14, 2025
Merged

bump base image with statically linked plugins, improve new push-node.sh, adopt 1.32.2 #3861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1989db5
bump base image with statically linked plugins
BenTheElder Feb 13, 2025
673b942
enhance push-node script
BenTheElder Feb 13, 2025
b258ce2
update default node image to 1.32.2
BenTheElder Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion hack/release/push-node.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/config/defaults/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion pkg/build/nodeimage/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Loading