Merge branch 'master' of github.com:kubernetes/minikube into prbot

Author: sharifelgamal

cmd/minikube/cmd/config/config.go

@@ -93,7 +93,7 @@ var settings = []Setting{
 	{
 		name:        "memory",
 		set:         SetString,
-		validations: []setFn{IsValidDiskSize},
+		validations: []setFn{IsValidMemory},
 		callbacks:   []setFn{RequiresRestartMsg},
 	},
 	{

cmd/minikube/cmd/config/configure.go

@@ -108,11 +108,12 @@ var addonsConfigureCmd = &cobra.Command{
 			}
 
 			cname := ClusterFlagValue()
+			namespace := "kube-system"
 
 			// Create ECR Secret
 			err := service.CreateSecret(
 				cname,
-				"kube-system",
+				namespace,
 				"registry-creds-ecr",
 				map[string]string{
 					"AWS_ACCESS_KEY_ID":     awsAccessID,
@@ -134,7 +135,7 @@ var addonsConfigureCmd = &cobra.Command{
 			// Create GCR Secret
 			err = service.CreateSecret(
 				cname,
-				"kube-system",
+				namespace,
 				"registry-creds-gcr",
 				map[string]string{
 					"application_default_credentials.json": gcrApplicationDefaultCredentials,
@@ -153,7 +154,7 @@ var addonsConfigureCmd = &cobra.Command{
 			// Create Docker Secret
 			err = service.CreateSecret(
 				cname,
-				"kube-system",
+				namespace,
 				"registry-creds-dpr",
 				map[string]string{
 					"DOCKER_PRIVATE_REGISTRY_SERVER":   dockerServer,
@@ -173,7 +174,7 @@ var addonsConfigureCmd = &cobra.Command{
 			// Create Azure Container Registry Secret
 			err = service.CreateSecret(
 				cname,
-				"kube-system",
+				namespace,
 				"registry-creds-acr",
 				map[string]string{
 					"ACR_URL":       acrURL,

cmd/minikube/cmd/config/set_test.go

@@ -39,7 +39,7 @@ func TestSetNotAllowed(t *testing.T) {
 		t.Fatalf("Set did not return error for unallowed value: %+v", err)
 	}
 	err = Set("memory", "10a")
-	if err == nil || err.Error() != "run validations for \"memory\" with value of \"10a\": [invalid disk size: invalid size: '10a']" {
+	if err == nil || err.Error() != "run validations for \"memory\" with value of \"10a\": [invalid memory size: invalid size: '10a']" {
 		t.Fatalf("Set did not return error for unallowed value: %+v", err)
 	}
 }

cmd/minikube/cmd/config/validations.go

@@ -53,6 +53,15 @@ func IsValidDiskSize(name string, disksize string) error {
 	return nil
 }
 
+// IsValidMemory checks if a string is a valid memory size
+func IsValidMemory(name string, memsize string) error {
+	_, err := units.FromHumanSize(memsize)
+	if err != nil {
+		return fmt.Errorf("invalid memory size: %v", err)
+	}
+	return nil
+}
+
 // IsValidURL checks if a location is a valid URL
 func IsValidURL(name string, location string) error {
 	_, err := url.Parse(location)

cmd/minikube/cmd/image.go

@@ -145,9 +145,28 @@ $ minikube image unload image busybox
 	},
 }
 
+var listImageCmd = &cobra.Command{
+	Use:   "list",
+	Short: "List images",
+	Example: `
+$ minikube image list
+`,
+	Aliases: []string{"ls"},
+	Run: func(cmd *cobra.Command, args []string) {
+		profile, err := config.LoadProfile(viper.GetString(config.ProfileName))
+		if err != nil {
+			exit.Error(reason.Usage, "loading profile", err)
+		}
+		if err := machine.ListImages(profile); err != nil {
+			exit.Error(reason.GuestImageList, "Failed to list images", err)
+		}
+	},
+}
+
 func init() {
 	imageCmd.AddCommand(loadImageCmd)
 	imageCmd.AddCommand(removeImageCmd)
 	loadImageCmd.Flags().BoolVar(&imgDaemon, "daemon", false, "Cache image from docker daemon")
 	loadImageCmd.Flags().BoolVar(&imgRemote, "remote", false, "Cache image from remote registry")
+	imageCmd.AddCommand(listImageCmd)
 }

cmd/minikube/cmd/start_flags.go

@@ -251,139 +251,8 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
 		cc = updateExistingConfigFromFlags(cmd, existing)
 	} else {
 		klog.Info("no existing cluster config was found, will generate one from the flags ")
-		sysLimit, containerLimit, err := memoryLimits(drvName)
-		if err != nil {
-			klog.Warningf("Unable to query memory limits: %+v", err)
-		}
-
-		mem := suggestMemoryAllocation(sysLimit, containerLimit, viper.GetInt(nodes))
-		if cmd.Flags().Changed(memory) {
-			var err error
-			mem, err = pkgutil.CalculateSizeInMB(viper.GetString(memory))
-			if err != nil {
-				exit.Message(reason.Usage, "Generate unable to parse memory '{{.memory}}': {{.error}}", out.V{"memory": viper.GetString(memory), "error": err})
-			}
-			if driver.IsKIC(drvName) && mem > containerLimit {
-				exit.Message(reason.Usage, "{{.driver_name}} has only {{.container_limit}}MB memory but you specified {{.specified_memory}}MB", out.V{"container_limit": containerLimit, "specified_memory": mem, "driver_name": driver.FullName(drvName)})
-			}
-		} else {
-			validateRequestedMemorySize(mem, drvName)
-			klog.Infof("Using suggested %dMB memory alloc based on sys=%dMB, container=%dMB", mem, sysLimit, containerLimit)
-		}
-
-		diskSize, err := pkgutil.CalculateSizeInMB(viper.GetString(humanReadableDiskSize))
-		if err != nil {
-			exit.Message(reason.Usage, "Generate unable to parse disk size '{{.diskSize}}': {{.error}}", out.V{"diskSize": viper.GetString(humanReadableDiskSize), "error": err})
-		}
-
-		repository := viper.GetString(imageRepository)
-		mirrorCountry := strings.ToLower(viper.GetString(imageMirrorCountry))
-		if strings.ToLower(repository) == "auto" || (mirrorCountry != "" && repository == "") {
-			found, autoSelectedRepository, err := selectImageRepository(mirrorCountry, semver.MustParse(strings.TrimPrefix(k8sVersion, version.VersionPrefix)))
-			if err != nil {
-				exit.Error(reason.InetRepo, "Failed to check main repository and mirrors for images", err)
-			}
-
-			if !found {
-				if autoSelectedRepository == "" {
-					exit.Message(reason.InetReposUnavailable, "None of the known repositories are accessible. Consider specifying an alternative image repository with --image-repository flag")
-				} else {
-					out.WarningT("None of the known repositories in your location are accessible. Using {{.image_repository_name}} as fallback.", out.V{"image_repository_name": autoSelectedRepository})
-				}
-			}
+		cc = generateNewConfigFromFlags(cmd, k8sVersion, drvName)
 
-			repository = autoSelectedRepository
-		}
-
-		if cmd.Flags().Changed(imageRepository) || cmd.Flags().Changed(imageMirrorCountry) {
-			out.Styled(style.Success, "Using image repository {{.name}}", out.V{"name": repository})
-		}
-
-		// Backwards compatibility with --enable-default-cni
-		chosenCNI := viper.GetString(cniFlag)
-		if viper.GetBool(enableDefaultCNI) && !cmd.Flags().Changed(cniFlag) {
-			klog.Errorf("Found deprecated --enable-default-cni flag, setting --cni=bridge")
-			chosenCNI = "bridge"
-		}
-		// networkPlugin cni deprecation warning
-		chosenNetworkPlugin := viper.GetString(networkPlugin)
-		if chosenNetworkPlugin == "cni" {
-			out.WarningT("With --network-plugin=cni, you will need to provide your own CNI. See --cni flag as a user-friendly alternative")
-		}
-
-		if !(driver.IsKIC(drvName) || driver.IsKVM(drvName)) && viper.GetString(network) != "" {
-			out.WarningT("--network flag is only valid with the docker/podman and KVM drivers, it will be ignored")
-		}
-
-		checkNumaCount(k8sVersion)
-
-		cc = config.ClusterConfig{
-			Name:                    ClusterFlagValue(),
-			KeepContext:             viper.GetBool(keepContext),
-			EmbedCerts:              viper.GetBool(embedCerts),
-			MinikubeISO:             viper.GetString(isoURL),
-			KicBaseImage:            viper.GetString(kicBaseImage),
-			Network:                 viper.GetString(network),
-			Memory:                  mem,
-			CPUs:                    viper.GetInt(cpus),
-			DiskSize:                diskSize,
-			Driver:                  drvName,
-			ListenAddress:           viper.GetString(listenAddress),
-			HyperkitVpnKitSock:      viper.GetString(vpnkitSock),
-			HyperkitVSockPorts:      viper.GetStringSlice(vsockPorts),
-			NFSShare:                viper.GetStringSlice(nfsShare),
-			NFSSharesRoot:           viper.GetString(nfsSharesRoot),
-			DockerEnv:               config.DockerEnv,
-			DockerOpt:               config.DockerOpt,
-			InsecureRegistry:        insecureRegistry,
-			RegistryMirror:          registryMirror,
-			HostOnlyCIDR:            viper.GetString(hostOnlyCIDR),
-			HypervVirtualSwitch:     viper.GetString(hypervVirtualSwitch),
-			HypervUseExternalSwitch: viper.GetBool(hypervUseExternalSwitch),
-			HypervExternalAdapter:   viper.GetString(hypervExternalAdapter),
-			KVMNetwork:              viper.GetString(kvmNetwork),
-			KVMQemuURI:              viper.GetString(kvmQemuURI),
-			KVMGPU:                  viper.GetBool(kvmGPU),
-			KVMHidden:               viper.GetBool(kvmHidden),
-			KVMNUMACount:            viper.GetInt(kvmNUMACount),
-			DisableDriverMounts:     viper.GetBool(disableDriverMounts),
-			UUID:                    viper.GetString(uuid),
-			NoVTXCheck:              viper.GetBool(noVTXCheck),
-			DNSProxy:                viper.GetBool(dnsProxy),
-			HostDNSResolver:         viper.GetBool(hostDNSResolver),
-			HostOnlyNicType:         viper.GetString(hostOnlyNicType),
-			NatNicType:              viper.GetString(natNicType),
-			StartHostTimeout:        viper.GetDuration(waitTimeout),
-			ExposedPorts:            viper.GetStringSlice(ports),
-			SSHIPAddress:            viper.GetString(sshIPAddress),
-			SSHUser:                 viper.GetString(sshSSHUser),
-			SSHKey:                  viper.GetString(sshSSHKey),
-			SSHPort:                 viper.GetInt(sshSSHPort),
-			KubernetesConfig: config.KubernetesConfig{
-				KubernetesVersion:      k8sVersion,
-				ClusterName:            ClusterFlagValue(),
-				Namespace:              viper.GetString(startNamespace),
-				APIServerName:          viper.GetString(apiServerName),
-				APIServerNames:         apiServerNames,
-				APIServerIPs:           apiServerIPs,
-				DNSDomain:              viper.GetString(dnsDomain),
-				FeatureGates:           viper.GetString(featureGates),
-				ContainerRuntime:       viper.GetString(containerRuntime),
-				CRISocket:              viper.GetString(criSocket),
-				NetworkPlugin:          chosenNetworkPlugin,
-				ServiceCIDR:            viper.GetString(serviceCIDR),
-				ImageRepository:        repository,
-				ExtraOptions:           config.ExtraOptions,
-				ShouldLoadCachedImages: viper.GetBool(cacheImages),
-				CNI:                    chosenCNI,
-				NodePort:               viper.GetInt(apiServerPort),
-			},
-			MultiNodeRequested: viper.GetInt(nodes) > 1,
-		}
-		cc.VerifyComponents = interpretWaitFlag(*cmd)
-		if viper.GetBool(createMount) && driver.IsKIC(drvName) {
-			cc.ContainerVolumeMounts = []string{viper.GetString(mountString)}
-		}
 		cnm, err := cni.New(cc)
 		if err != nil {
 			return cc, config.Node{}, errors.Wrap(err, "cni")
@@ -418,6 +287,147 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
 	return createNode(cc, kubeNodeName, existing)
 }
 
+// generateNewConfigFromFlags generate a config.ClusterConfig based on flags
+func generateNewConfigFromFlags(cmd *cobra.Command, k8sVersion string, drvName string) config.ClusterConfig {
+	var cc config.ClusterConfig
+
+	sysLimit, containerLimit, err := memoryLimits(drvName)
+	if err != nil {
+		klog.Warningf("Unable to query memory limits: %+v", err)
+	}
+
+	mem := suggestMemoryAllocation(sysLimit, containerLimit, viper.GetInt(nodes))
+	if cmd.Flags().Changed(memory) || viper.IsSet(memory) {
+		var err error
+		mem, err = pkgutil.CalculateSizeInMB(viper.GetString(memory))
+		if err != nil {
+			exit.Message(reason.Usage, "Generate unable to parse memory '{{.memory}}': {{.error}}", out.V{"memory": viper.GetString(memory), "error": err})
+		}
+		if driver.IsKIC(drvName) && mem > containerLimit {
+			exit.Message(reason.Usage, "{{.driver_name}} has only {{.container_limit}}MB memory but you specified {{.specified_memory}}MB", out.V{"container_limit": containerLimit, "specified_memory": mem, "driver_name": driver.FullName(drvName)})
+		}
+	} else {
+		validateRequestedMemorySize(mem, drvName)
+		klog.Infof("Using suggested %dMB memory alloc based on sys=%dMB, container=%dMB", mem, sysLimit, containerLimit)
+	}
+
+	diskSize, err := pkgutil.CalculateSizeInMB(viper.GetString(humanReadableDiskSize))
+	if err != nil {
+		exit.Message(reason.Usage, "Generate unable to parse disk size '{{.diskSize}}': {{.error}}", out.V{"diskSize": viper.GetString(humanReadableDiskSize), "error": err})
+	}
+
+	repository := viper.GetString(imageRepository)
+	mirrorCountry := strings.ToLower(viper.GetString(imageMirrorCountry))
+	if strings.ToLower(repository) == "auto" || (mirrorCountry != "" && repository == "") {
+		found, autoSelectedRepository, err := selectImageRepository(mirrorCountry, semver.MustParse(strings.TrimPrefix(k8sVersion, version.VersionPrefix)))
+		if err != nil {
+			exit.Error(reason.InetRepo, "Failed to check main repository and mirrors for images", err)
+		}
+
+		if !found {
+			if autoSelectedRepository == "" {
+				exit.Message(reason.InetReposUnavailable, "None of the known repositories are accessible. Consider specifying an alternative image repository with --image-repository flag")
+			} else {
+				out.WarningT("None of the known repositories in your location are accessible. Using {{.image_repository_name}} as fallback.", out.V{"image_repository_name": autoSelectedRepository})
+			}
+		}
+
+		repository = autoSelectedRepository
+	}
+
+	if cmd.Flags().Changed(imageRepository) || cmd.Flags().Changed(imageMirrorCountry) {
+		out.Styled(style.Success, "Using image repository {{.name}}", out.V{"name": repository})
+	}
+
+	// Backwards compatibility with --enable-default-cni
+	chosenCNI := viper.GetString(cniFlag)
+	if viper.GetBool(enableDefaultCNI) && !cmd.Flags().Changed(cniFlag) {
+		klog.Errorf("Found deprecated --enable-default-cni flag, setting --cni=bridge")
+		chosenCNI = "bridge"
+	}
+	// networkPlugin cni deprecation warning
+	chosenNetworkPlugin := viper.GetString(networkPlugin)
+	if chosenNetworkPlugin == "cni" {
+		out.WarningT("With --network-plugin=cni, you will need to provide your own CNI. See --cni flag as a user-friendly alternative")
+	}
+
+	if !(driver.IsKIC(drvName) || driver.IsKVM(drvName)) && viper.GetString(network) != "" {
+		out.WarningT("--network flag is only valid with the docker/podman and KVM drivers, it will be ignored")
+	}
+
+	checkNumaCount(k8sVersion)
+
+	cc = config.ClusterConfig{
+		Name:                    ClusterFlagValue(),
+		KeepContext:             viper.GetBool(keepContext),
+		EmbedCerts:              viper.GetBool(embedCerts),
+		MinikubeISO:             viper.GetString(isoURL),
+		KicBaseImage:            viper.GetString(kicBaseImage),
+		Network:                 viper.GetString(network),
+		Memory:                  mem,
+		CPUs:                    viper.GetInt(cpus),
+		DiskSize:                diskSize,
+		Driver:                  drvName,
+		ListenAddress:           viper.GetString(listenAddress),
+		HyperkitVpnKitSock:      viper.GetString(vpnkitSock),
+		HyperkitVSockPorts:      viper.GetStringSlice(vsockPorts),
+		NFSShare:                viper.GetStringSlice(nfsShare),
+		NFSSharesRoot:           viper.GetString(nfsSharesRoot),
+		DockerEnv:               config.DockerEnv,
+		DockerOpt:               config.DockerOpt,
+		InsecureRegistry:        insecureRegistry,
+		RegistryMirror:          registryMirror,
+		HostOnlyCIDR:            viper.GetString(hostOnlyCIDR),
+		HypervVirtualSwitch:     viper.GetString(hypervVirtualSwitch),
+		HypervUseExternalSwitch: viper.GetBool(hypervUseExternalSwitch),
+		HypervExternalAdapter:   viper.GetString(hypervExternalAdapter),
+		KVMNetwork:              viper.GetString(kvmNetwork),
+		KVMQemuURI:              viper.GetString(kvmQemuURI),
+		KVMGPU:                  viper.GetBool(kvmGPU),
+		KVMHidden:               viper.GetBool(kvmHidden),
+		KVMNUMACount:            viper.GetInt(kvmNUMACount),
+		DisableDriverMounts:     viper.GetBool(disableDriverMounts),
+		UUID:                    viper.GetString(uuid),
+		NoVTXCheck:              viper.GetBool(noVTXCheck),
+		DNSProxy:                viper.GetBool(dnsProxy),
+		HostDNSResolver:         viper.GetBool(hostDNSResolver),
+		HostOnlyNicType:         viper.GetString(hostOnlyNicType),
+		NatNicType:              viper.GetString(natNicType),
+		StartHostTimeout:        viper.GetDuration(waitTimeout),
+		ExposedPorts:            viper.GetStringSlice(ports),
+		SSHIPAddress:            viper.GetString(sshIPAddress),
+		SSHUser:                 viper.GetString(sshSSHUser),
+		SSHKey:                  viper.GetString(sshSSHKey),
+		SSHPort:                 viper.GetInt(sshSSHPort),
+		KubernetesConfig: config.KubernetesConfig{
+			KubernetesVersion:      k8sVersion,
+			ClusterName:            ClusterFlagValue(),
+			Namespace:              viper.GetString(startNamespace),
+			APIServerName:          viper.GetString(apiServerName),
+			APIServerNames:         apiServerNames,
+			APIServerIPs:           apiServerIPs,
+			DNSDomain:              viper.GetString(dnsDomain),
+			FeatureGates:           viper.GetString(featureGates),
+			ContainerRuntime:       viper.GetString(containerRuntime),
+			CRISocket:              viper.GetString(criSocket),
+			NetworkPlugin:          chosenNetworkPlugin,
+			ServiceCIDR:            viper.GetString(serviceCIDR),
+			ImageRepository:        repository,
+			ExtraOptions:           config.ExtraOptions,
+			ShouldLoadCachedImages: viper.GetBool(cacheImages),
+			CNI:                    chosenCNI,
+			NodePort:               viper.GetInt(apiServerPort),
+		},
+		MultiNodeRequested: viper.GetInt(nodes) > 1,
+	}
+	cc.VerifyComponents = interpretWaitFlag(*cmd)
+	if viper.GetBool(createMount) && driver.IsKIC(drvName) {
+		cc.ContainerVolumeMounts = []string{viper.GetString(mountString)}
+	}
+
+	return cc
+}
+
 // setCNIConfDir sets kubelet's '--cni-conf-dir' flag to custom CNI Config Directory path (same used also by CNI Deployment) to avoid conflicting CNI configs.
 // ref: https://github.com/kubernetes/minikube/issues/10984
 // Note: currently, this change affects only Kindnet CNI (and all multinodes using it), but it can be easily expanded to other/all CNIs if needed.