Merge pull request #6696 from priyawadhwa/install-addons

Fix bug in --install-addons flag
kubernetes · Feb 20, 2020 · 0af5734 · 0af5734
2 parents a5c76f8 + 5ad4d6e
commit 0af5734
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
@@ -328,9 +328,12 @@ func runStart(cmd *cobra.Command, args []string) {
 		ssh.SetDefaultClient(ssh.External)
 	}
 
-	existingAddons := map[string]bool{}
-	if existing != nil && existing.Addons != nil {
-		existingAddons = existing.Addons
+	var existingAddons map[string]bool
+	if viper.GetBool(installAddons) {
+		existingAddons = map[string]bool{}
+		if existing != nil && existing.Addons != nil {
+			existingAddons = existing.Addons
+		}
 	}
 	kubeconfig, err := node.Start(mc, n, true, existingAddons)
 	if err != nil {

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
@@ -74,11 +74,9 @@ func Start(mc config.MachineConfig, n config.Node, primary bool, existingAddons
 	configureMounts()
 
 	// enable addons, both old and new!
-	ea := map[string]bool{}
 	if existingAddons != nil {
-		ea = existingAddons
+		addons.Start(viper.GetString(config.MachineProfile), existingAddons, AddonList)
 	}
-	addons.Start(viper.GetString(config.MachineProfile), ea, AddonList)
 
 	if err = CacheAndLoadImagesInConfig(); err != nil {
 		out.T(out.FailureType, "Unable to load cached images from config file.")