Skip to content

Commit 025fae0

Browse files
authored
Merge pull request #10704 from nixpanic/iso/add-losetup
install losetup from util-linux in the ISO to enable support for VolumeMode=Block PVCs
2 parents 97a8f7d + d299be9 commit 025fae0

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

Diff for: Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co
2323
KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2)
2424

2525
# Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
26-
ISO_VERSION ?= v1.18.0
26+
ISO_VERSION ?= v1.18.0-1615350772-10704
2727
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
2828
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
2929
DEB_REVISION ?= 0

Diff for: deploy/iso/minikube-iso/configs/minikube_defconfig

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ BR2_PACKAGE_PSMISC=y
5858
BR2_PACKAGE_SYSTEMD_LOGIND=y
5959
BR2_PACKAGE_SYSTEMD_MACHINED=y
6060
BR2_PACKAGE_TAR=y
61+
BR2_PACKAGE_UTIL_LINUX_LOSETUP=y
6162
BR2_PACKAGE_UTIL_LINUX_NSENTER=y
6263
BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y
6364
BR2_TARGET_ROOTFS_CPIO_GZIP=y

Diff for: pkg/minikube/download/iso.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const fileScheme = "file"
4040
// DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
4141
func DefaultISOURLs() []string {
4242
v := version.GetISOVersion()
43-
isoBucket := "minikube/iso"
43+
isoBucket := "minikube-builds/iso/10704"
4444
return []string{
4545
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s.iso", isoBucket, v),
4646
fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s.iso", v, v),

Diff for: site/content/en/docs/commands/start.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ minikube start [flags]
6464
--insecure-registry strings Insecure Docker registries to pass to the Docker daemon. The default service CIDR range will automatically be added.
6565
--install-addons If set, install addons. Defaults to true. (default true)
6666
--interactive Allow user prompts for more information (default true)
67-
--iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.18.0.iso,https://github.com/kubernetes/minikube/releases/download/v1.18.0/minikube-v1.18.0.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.18.0.iso])
67+
--iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/10704/minikube-v1.18.0-1615350772-10704.iso,https://github.com/kubernetes/minikube/releases/download/v1.18.0-1615350772-10704/minikube-v1.18.0-1615350772-10704.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.18.0-1615350772-10704.iso])
6868
--keep-context This will keep the existing kubectl context and will create a minikube context.
6969
--kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.20.2, 'latest' for v1.20.5-rc.0). Defaults to 'stable'.
7070
--kvm-gpu Enable experimental NVIDIA GPU support in minikube

0 commit comments

Comments
 (0)