From 0feb68c3500515b468470359348139e8b995232c Mon Sep 17 00:00:00 2001 From: tstromberg Date: Wed, 5 Feb 2020 14:40:54 -0800 Subject: [PATCH 1/3] Add /tmp/gvisor to list of required paths --- pkg/minikube/cluster/start.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/minikube/cluster/start.go b/pkg/minikube/cluster/start.go index 64632c0677c9..d89ec2d757a3 100644 --- a/pkg/minikube/cluster/start.go +++ b/pkg/minikube/cluster/start.go @@ -54,6 +54,7 @@ var ( vmpath.GuestCertsDir, path.Join(vmpath.GuestPersistentDir, "images"), path.Join(vmpath.GuestPersistentDir, "binaries"), + "/tmp/gvisor", } ) From d66bcad56cac6b5e646b6636aaf242da8853b3ac Mon Sep 17 00:00:00 2001 From: tstromberg Date: Wed, 5 Feb 2020 14:41:05 -0800 Subject: [PATCH 2/3] Only run kubectl apply on YAML files --- pkg/addons/addons.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go index 4fffa7e7ff0b..ac204b2c3dfb 100644 --- a/pkg/addons/addons.go +++ b/pkg/addons/addons.go @@ -175,6 +175,8 @@ func isAddonAlreadySet(addon *assets.Addon, enable bool, profile string) (bool, func enableOrDisableAddonInternal(addon *assets.Addon, cmd command.Runner, data interface{}, enable bool, profile string) error { files := []string{} + deployFiles := []string{} + for _, addon := range addon.Assets { var f assets.CopyableFile var err error @@ -203,8 +205,12 @@ func enableOrDisableAddonInternal(addon *assets.Addon, cmd command.Runner, data }() } files = append(files, fPath) + if strings.HasSuffix(fPath, ".yaml") { + deployFiles = append(deployFiles, fPath) + } } - command, err := kubectlCommand(profile, files, enable) + + command, err := kubectlCommand(profile, deployFiles, enable) if err != nil { return err } From 77f74d82d76cb93398d77bf56714c0b4e07ea7cd Mon Sep 17 00:00:00 2001 From: tstromberg Date: Wed, 5 Feb 2020 14:53:02 -0800 Subject: [PATCH 3/3] Remove unused files var --- pkg/addons/addons.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go index ac204b2c3dfb..d7897046387a 100644 --- a/pkg/addons/addons.go +++ b/pkg/addons/addons.go @@ -174,7 +174,6 @@ func isAddonAlreadySet(addon *assets.Addon, enable bool, profile string) (bool, } func enableOrDisableAddonInternal(addon *assets.Addon, cmd command.Runner, data interface{}, enable bool, profile string) error { - files := []string{} deployFiles := []string{} for _, addon := range addon.Assets { @@ -204,7 +203,6 @@ func enableOrDisableAddonInternal(addon *assets.Addon, cmd command.Runner, data } }() } - files = append(files, fPath) if strings.HasSuffix(fPath, ".yaml") { deployFiles = append(deployFiles, fPath) }