Merge pull request #6512 from tstromberg/gvisor-fixes

gvisor fixes for v1.7.0
kubernetes · Feb 5, 2020 · 950fc79 · 950fc79
2 parents 4e9e37b + 77f74d8
commit 950fc79
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go
@@ -174,7 +174,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
@@ -202,9 +203,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
 	}

diff --git 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",
 	}
 )