From a29adcd55529c735f0848f33bbcdb2ec39e116a1 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 23 Mar 2022 18:23:55 +0000 Subject: [PATCH] Updating ISO to v1.25.2-1648055164-13807 --- site/content/en/docs/commands/start.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index cbf2d6a5ea..1136cc82d3 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -69,11 +69,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) -<<<<<<< HEAD --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13791/minikube-v1.25.2-1652310010-13791-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1652310010-13791/minikube-v1.25.2-1652310010-13791-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1652310010-13791-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/13791/minikube-v1.25.2-1652310010-13791.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1652310010-13791/minikube-v1.25.2-1652310010-13791.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1652310010-13791.iso]) -======= - --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13807/minikube-v1.25.2-1648002791-13807.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1648002791-13807/minikube-v1.25.2-1648002791-13807.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1648002791-13807.iso]) ->>>>>>> eed46033b (Updating ISO to v1.25.2-1648002791-13807) --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.5, 'latest' for v1.23.6-rc.0). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube