Skip to content

Commit a5b6072

Browse files
nirsminikube-bot
andauthored
iso: Fix minikube stop with vfkit and krunkit drivers (#21089)
* iso: Minimal kernel for arm64 Create default arm64 config and disable stuff that we cannot use in a VM. This chagne was generated by: 1. Create defualt arm64 config cd out/buildroot/output-aarch64/build/linux-6.6.95 make ARCH=arm64 defconfig make ARCH=arm64 menuconfig (exit saving changes) 2. Disable features that we don't need in the minikube VM: - Platform suppport - all platforms - Device drivers - Multimedia support - Sound support 3. Updated our linux defconfig cd out/buildroot/output-aarch64 make linux-update-defconfig 4. Normalize the config make linux-menuconfig-aarch64 (exit saving changes) With this config qemu, vfkit, and krunkit boot with --no-kubernetes, and graceful shutdown works in vfkit and krunkit (using --restful-uri). We cannot start kubernetes yet since some features are not available in the default architecture config. * iso: Add configs removed by defualt config This restores the configs removed by updating from the default architecture config. These configs are required for kubernetes support. After adding the removed configs, run `make linux-menuconfig-aarch64` to normalize the config and remove multimedia and sound card support again. * iso: Unbreak go packages build Adding go.work seems to break podman build. The workspace is needed only for running the update commands so let's disable it when building the iso. We may need much bigger change to ensur that the workspace is used only when running the update go commands, or remove it. This change fixes only the iso build. * Updating ISO to v1.36.0-1752940814-21089 --------- Co-authored-by: minikube-bot <[email protected]>
1 parent 2d7f291 commit a5b6072

File tree

3 files changed

+242
-45
lines changed

3 files changed

+242
-45
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \"
2424
HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2)
2525

2626
# Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
27-
ISO_VERSION ?= v1.36.0-1752142514-21053
27+
ISO_VERSION ?= v1.36.0-1752940814-21089
2828

2929
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
3030
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
@@ -49,7 +49,7 @@ KVM_GO_VERSION ?= $(GO_VERSION:.0=)
4949
INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
5050
BUILDROOT_BRANCH ?= 2025.02
5151
# the go version on the line below is for the ISO
52-
GOLANG_OPTIONS = GO_VERSION=1.23.4 GO_HASH_FILE=$(PWD)/deploy/iso/minikube-iso/go.hash
52+
GOLANG_OPTIONS = GOWORK=off GO_VERSION=1.23.4 GO_HASH_FILE=$(PWD)/deploy/iso/minikube-iso/go.hash
5353
BUILDROOT_OPTIONS = BR2_EXTERNAL=../../deploy/iso/minikube-iso $(GOLANG_OPTIONS)
5454
REGISTRY ?= gcr.io/k8s-minikube
5555

0 commit comments

Comments
 (0)