From 5b2655f1f38ccea421cce8fe1e402df0f4a0bdc7 Mon Sep 17 00:00:00 2001 From: Gerd Aschemann Date: Fri, 22 Jul 2016 01:38:17 +0200 Subject: [PATCH 1/3] Add insecure-registry option to minikube start (cf. kubernetes/minikube#385) --- cmd/minikube/cmd/start.go | 3 +++ docs/minikube_start.md | 1 + pkg/minikube/cluster/cluster.go | 2 ++ 3 files changed, 6 insertions(+) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index 0248fe0392..3750d94a83 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -41,6 +41,7 @@ var ( disk = newUnitValue(20 * units.GB) vmDriver string dockerEnv []string + insecureRegistry []string ) // startCmd represents the start command @@ -64,6 +65,7 @@ func runStart(cmd *cobra.Command, args []string) { DiskSize: int(*disk / units.MB), VMDriver: vmDriver, DockerEnv: dockerEnv, + InsecureRegistry: insecureRegistry, } var host *host.Host @@ -163,5 +165,6 @@ func init() { diskFlag.DefValue = constants.DefaultDiskSize startCmd.Flags().StringSliceVar(&dockerEnv, "docker-env", nil, "Environment variables to pass to the Docker daemon. (format: key=value)") + startCmd.Flags().StringSliceVar(&insecureRegistry, "insecure-registry", nil, "Insecure Docker registries to pass to the Docker daemon") RootCmd.AddCommand(startCmd) } diff --git a/docs/minikube_start.md b/docs/minikube_start.md index 5aa16f8011..15e4ee3dc9 100644 --- a/docs/minikube_start.md +++ b/docs/minikube_start.md @@ -18,6 +18,7 @@ minikube start --cpus=1: Number of CPUs allocated to the minikube VM --disk-size=20g: Disk size allocated to the minikube VM (format: [], where unit = b, k, m or g) --docker-env=[]: Environment variables to pass to the Docker daemon. (format: key=value) + --insecure-registry=[]: Enable Docker insecure registry/-ies --iso-url="https://storage.googleapis.com/minikube/minikube-0.5.iso": Location of the minikube iso --memory=1024: Amount of RAM allocated to the minikube VM --vm-driver="virtualbox": VM driver is one of: [virtualbox vmwarefusion kvm xhyve] diff --git a/pkg/minikube/cluster/cluster.go b/pkg/minikube/cluster/cluster.go index caa8eb75b0..89b15ed6a7 100644 --- a/pkg/minikube/cluster/cluster.go +++ b/pkg/minikube/cluster/cluster.go @@ -171,6 +171,7 @@ type MachineConfig struct { DiskSize int VMDriver string DockerEnv []string // Each entry is formatted as KEY=VALUE. + InsecureRegistry []string } // StartCluster starts a k8s cluster on the specified Host. @@ -287,6 +288,7 @@ func engineOptions(config MachineConfig) *engine.Options { o := engine.Options{ Env: config.DockerEnv, + InsecureRegistry: config.InsecureRegistry, } return &o } From 82f5cb0a08dfef3a8ffb27bb679465c8f417bd77 Mon Sep 17 00:00:00 2001 From: Gerd Aschemann Date: Fri, 22 Jul 2016 10:00:48 +0200 Subject: [PATCH 2/3] Fix source code formatting via gofmt (kubernetes/minikube#385) --- cmd/minikube/cmd/start.go | 24 ++++++++++++------------ pkg/minikube/cluster/cluster.go | 14 +++++++------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index 3750d94a83..19cd9c9274 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -35,12 +35,12 @@ import ( ) var ( - minikubeISO string - memory int - cpus int - disk = newUnitValue(20 * units.GB) - vmDriver string - dockerEnv []string + minikubeISO string + memory int + cpus int + disk = newUnitValue(20 * units.GB) + vmDriver string + dockerEnv []string insecureRegistry []string ) @@ -59,12 +59,12 @@ func runStart(cmd *cobra.Command, args []string) { defer api.Close() config := cluster.MachineConfig{ - MinikubeISO: minikubeISO, - Memory: memory, - CPUs: cpus, - DiskSize: int(*disk / units.MB), - VMDriver: vmDriver, - DockerEnv: dockerEnv, + MinikubeISO: minikubeISO, + Memory: memory, + CPUs: cpus, + DiskSize: int(*disk / units.MB), + VMDriver: vmDriver, + DockerEnv: dockerEnv, InsecureRegistry: insecureRegistry, } diff --git a/pkg/minikube/cluster/cluster.go b/pkg/minikube/cluster/cluster.go index 89b15ed6a7..2a08b28793 100644 --- a/pkg/minikube/cluster/cluster.go +++ b/pkg/minikube/cluster/cluster.go @@ -165,12 +165,12 @@ type sshAble interface { // MachineConfig contains the parameters used to start a cluster. type MachineConfig struct { - MinikubeISO string - Memory int - CPUs int - DiskSize int - VMDriver string - DockerEnv []string // Each entry is formatted as KEY=VALUE. + MinikubeISO string + Memory int + CPUs int + DiskSize int + VMDriver string + DockerEnv []string // Each entry is formatted as KEY=VALUE. InsecureRegistry []string } @@ -287,7 +287,7 @@ func SetupCerts(d drivers.Driver) error { func engineOptions(config MachineConfig) *engine.Options { o := engine.Options{ - Env: config.DockerEnv, + Env: config.DockerEnv, InsecureRegistry: config.InsecureRegistry, } return &o From aa76240b31238c8b329fc54499a2f195b57520fb Mon Sep 17 00:00:00 2001 From: Gerd Aschemann Date: Fri, 22 Jul 2016 10:29:28 +0200 Subject: [PATCH 3/3] Fix documentation (aligh with usage output, kubernetes/minikube#385) --- docs/minikube_start.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/minikube_start.md b/docs/minikube_start.md index 15e4ee3dc9..3e086524e5 100644 --- a/docs/minikube_start.md +++ b/docs/minikube_start.md @@ -18,7 +18,7 @@ minikube start --cpus=1: Number of CPUs allocated to the minikube VM --disk-size=20g: Disk size allocated to the minikube VM (format: [], where unit = b, k, m or g) --docker-env=[]: Environment variables to pass to the Docker daemon. (format: key=value) - --insecure-registry=[]: Enable Docker insecure registry/-ies + --insecure-registry=[]: Insecure Docker registries to pass to the Docker daemon --iso-url="https://storage.googleapis.com/minikube/minikube-0.5.iso": Location of the minikube iso --memory=1024: Amount of RAM allocated to the minikube VM --vm-driver="virtualbox": VM driver is one of: [virtualbox vmwarefusion kvm xhyve]