From 6f756a7481a42a8d3e9fec586b7bbd5ef13344f0 Mon Sep 17 00:00:00 2001 From: Matt Rickard Date: Thu, 8 Dec 2016 15:06:57 -0800 Subject: [PATCH] Make iso-url configurable through config command --- cmd/minikube/cmd/config/config.go | 5 +++++ cmd/minikube/cmd/config/validations.go | 9 +++++++++ docs/minikube_config.md | 1 + 3 files changed, 15 insertions(+) diff --git a/cmd/minikube/cmd/config/config.go b/cmd/minikube/cmd/config/config.go index 5eaad578ca..d43ca68e42 100644 --- a/cmd/minikube/cmd/config/config.go +++ b/cmd/minikube/cmd/config/config.go @@ -92,6 +92,11 @@ var settings = []Setting{ name: "kubernetes-version", set: SetString, }, + { + name: "iso-url", + set: SetString, + validations: []setFn{IsValidURL}, + }, { name: config.WantUpdateNotification, set: SetBool, diff --git a/cmd/minikube/cmd/config/validations.go b/cmd/minikube/cmd/config/validations.go index a4f1e9ddec..c887ba3157 100644 --- a/cmd/minikube/cmd/config/validations.go +++ b/cmd/minikube/cmd/config/validations.go @@ -19,6 +19,7 @@ package config import ( "fmt" "net" + "net/url" "os" "strconv" @@ -50,6 +51,14 @@ func IsValidDiskSize(name string, disksize string) error { return nil } +func IsValidURL(name string, location string) error { + _, err := url.Parse(location) + if err != nil { + return fmt.Errorf("%s is not a valid URL", location) + } + return nil +} + func IsPositive(name string, val string) error { i, err := strconv.Atoi(val) if err != nil { diff --git a/docs/minikube_config.md b/docs/minikube_config.md index 8c7b708a67..aef9be71cb 100644 --- a/docs/minikube_config.md +++ b/docs/minikube_config.md @@ -17,6 +17,7 @@ Configurable fields: * show-libmachine-logs * log_dir * kubernetes-version + * iso-url * WantUpdateNotification * ReminderWaitPeriodInHours * WantReportError