Merge branch 'uefi2' of github.com:klaases/minikube into iso-arm64
Sharif Elgamal
commit
5f29ddfe07
6
Makefile
6
Makefile
|
|
@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co
|
|||
KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2)
|
||||
|
||||
# Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
|
||||
ISO_VERSION ?= v1.25.2
|
||||
ISO_VERSION ?= v1.25.0-1645046644-13612
|
||||
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
|
||||
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
|
||||
DEB_REVISION ?= 0
|
||||
|
|
@ -292,7 +292,7 @@ minikube_iso: deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/b
|
|||
$(MAKE) BR2_EXTERNAL=../../deploy/iso/minikube-iso minikube_defconfig -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS)
|
||||
$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) host-python
|
||||
$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS)
|
||||
mv $(BUILD_DIR)/buildroot/output/images/rootfs.iso9660 $(BUILD_DIR)/minikube.iso
|
||||
mv $(BUILD_DIR)/buildroot/output/images/boot.iso $(BUILD_DIR)/minikube.iso
|
||||
|
||||
# Change buildroot configuration for the minikube ISO
|
||||
.PHONY: iso-menuconfig
|
||||
|
|
@ -322,7 +322,7 @@ iso_in_docker:
|
|||
$(ISO_BUILD_IMAGE) /bin/bash
|
||||
|
||||
test-iso:
|
||||
go test -v $(INTEGRATION_TESTS_TO_RUN) --tags=iso --minikube-start-args="--iso-url=file://$(shell pwd)/out/buildroot/output/images/rootfs.iso9660"
|
||||
go test -v $(INTEGRATION_TESTS_TO_RUN) --tags=iso --minikube-start-args="--iso-url=file://$(shell pwd)/out/buildroot/output/images/boot.iso"
|
||||
|
||||
.PHONY: test-pkg
|
||||
test-pkg/%: ## Trigger packaging test
|
||||
|
|
|
|||
|
|
@ -2,3 +2,5 @@ insmod iso9660
|
|||
insmod udf
|
||||
|
||||
search --no-floppy --label EFIBOOTISO --set root
|
||||
|
||||
# used to find the cd
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@ set default="0"
|
|||
set timeout="5"
|
||||
|
||||
menuentry "Buildroot" {
|
||||
linux /boot/vmlinuz console=tty0 rw
|
||||
initrd /boot/initrd.img
|
||||
linux /boot/vmlinuz console=tty0 rw # kernel
|
||||
initrd /boot/initrd.img # rootfs
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ support/scripts/genimage.sh -c "$GENIMAGE_CFG"
|
|||
|
||||
cd "$BINARIES_DIR"
|
||||
mkdir -p root/boot
|
||||
cp bzImage root/boot/vmlinuz
|
||||
cp rootfs.cpio.gz root/boot/initrd.img
|
||||
cp bzImage root/boot/bzimage
|
||||
cp rootfs.cpio.gz root/boot/initrd
|
||||
mkdir -p root/EFI/BOOT
|
||||
cp efi-part/EFI/BOOT/* root/EFI/BOOT/
|
||||
cp efiboot.img root/EFI/BOOT/
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
|
|||
|
||||
# System
|
||||
BR2_SYSTEM_DHCP="eth0"
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="tty1"
|
||||
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
|
||||
|
||||
# Required tools to create bootable media
|
||||
BR2_PACKAGE_HOST_DOSFSTOOLS=y
|
||||
|
|
@ -34,6 +36,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
|||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.202"
|
||||
BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
|
||||
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
|
||||
BR2_LINUX_KERNEL_INSTALL_TARGET=y
|
||||
|
||||
BR2_CCACHE=y
|
||||
|
||||
|
|
@ -102,9 +105,6 @@ BR2_PACKAGE_UTIL_LINUX_LOSETUP=y
|
|||
BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
|
||||
BR2_PACKAGE_UTIL_LINUX_NSENTER=y
|
||||
BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y
|
||||
BR2_TARGET_ROOTFS_ISO9660=y
|
||||
BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/isolinux.cfg"
|
||||
BR2_TARGET_SYSLINUX=y
|
||||
BR2_PACKAGE_HOST_E2TOOLS=y
|
||||
BR2_PACKAGE_HOST_PYTHON=y
|
||||
BR2_PACKAGE_LIBFUSE=y
|
||||
|
|
|
|||
|
|
@ -40,15 +40,17 @@ const domainTmpl = `
|
|||
{{end}}
|
||||
</cpu>
|
||||
<os>
|
||||
<type>hvm</type>
|
||||
<type machine="q35">hvm</type>
|
||||
<loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
|
||||
<nvram>/usr/share/OVMF/OVMF_VARS.fd</nvram>s
|
||||
<boot dev='cdrom'/>
|
||||
<boot dev='hd'/>
|
||||
<bootmenu enable='no'/>
|
||||
<bootmenu enable='yes'/>
|
||||
</os>
|
||||
<devices>
|
||||
<disk type='file' device='cdrom'>
|
||||
<source file='{{.ISO}}'/>
|
||||
<target dev='hdc' bus='scsi'/>
|
||||
<target dev='sdc' bus='sata'/>
|
||||
<readonly/>
|
||||
</disk>
|
||||
<disk type='file' device='disk'>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ const fileScheme = "file"
|
|||
// DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
|
||||
func DefaultISOURLs() []string {
|
||||
v := version.GetISOVersion()
|
||||
isoBucket := "minikube/iso"
|
||||
isoBucket := "minikube-builds/iso/13612"
|
||||
return []string{
|
||||
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s.iso", isoBucket, v),
|
||||
fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s.iso", v, v),
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ minikube start [flags]
|
|||
--insecure-registry strings Insecure Docker registries to pass to the Docker daemon. The default service CIDR range will automatically be added.
|
||||
--install-addons If set, install addons. Defaults to true. (default true)
|
||||
--interactive Allow user prompts for more information (default true)
|
||||
--iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.25.2.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2/minikube-v1.25.2.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2.iso])
|
||||
--iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13612/minikube-v1.25.0-1645046644-13612.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.0-1645046644-13612/minikube-v1.25.0-1645046644-13612.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.0-1645046644-13612.iso])
|
||||
--keep-context This will keep the existing kubectl context and will create a minikube context.
|
||||
--kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.23.3, 'latest' for v1.23.4-rc.0). Defaults to 'stable'.
|
||||
--kvm-gpu Enable experimental NVIDIA GPU support in minikube
|
||||
|
|
|
|||
Loading…
Reference in New Issue