Skip to content

Commit 6786da8

Browse files
Merge pull request #10217 from pkalever/nbd-iso
iso: enable Network Block Device support
2 parents d508638 + 6bac9bf commit 6786da8

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
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-1616464260-10647
26+
ISO_VERSION ?= v1.18.0-1617380636-10217
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/board/coreos/minikube/linux_defconfig

+1
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ CONFIG_DEVTMPFS_MOUNT=y
311311
CONFIG_DEBUG_DEVRES=y
312312
CONFIG_CONNECTOR=y
313313
CONFIG_BLK_DEV_LOOP=y
314+
CONFIG_BLK_DEV_NBD=m
314315
CONFIG_VIRTIO_BLK=y
315316
CONFIG_BLK_DEV_RBD=m
316317
CONFIG_VMWARE_BALLOON=m

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-builds/iso/10647"
43+
isoBucket := "minikube-builds/iso/10217"
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

+2-2
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-builds/iso/10647/minikube-v1.18.0-1616464260-10647.iso,https://github.com/kubernetes/minikube/releases/download/v1.18.0-1616464260-10647/minikube-v1.18.0-1616464260-10647.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.18.0-1616464260-10647.iso])
67+
--iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/10217/minikube-v1.18.0-1617380636-10217.iso,https://github.com/kubernetes/minikube/releases/download/v1.18.0-1617380636-10217/minikube-v1.18.0-1617380636-10217.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.18.0-1617380636-10217.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
@@ -111,7 +111,7 @@ minikube start [flags]
111111
-h, --help
112112
--log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0)
113113
--log_dir string If non-empty, write log files in this directory
114-
--log_file string If non-empty, use this log file
114+
--log_file string If non-empty, use this log file (default "")
115115
--log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800)
116116
--logtostderr log to standard error instead of files
117117
--one_output If true, only write logs to their native severity level (vs also writing to each lower severity level)

0 commit comments

Comments
 (0)