From 6b29b784f2b87e6b47aff2080c6465d8cc14e147 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Thu, 4 Jun 2020 11:39:28 -0700
Subject: [PATCH] address review comments
---
pkg/minikube/driver/driver.go | 6 +++---
test/integration/main.go | 11 +++--------
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index 1bf5763aa4..f9ee03f918 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -131,13 +131,13 @@ func NeedsRoot(name string) bool {
// NeedsPortForward returns true if driver is unable provide direct IP connectivity
func NeedsPortForward(name string) bool {
// Docker for Desktop
- return IsKIC(name) && (runtime.GOOS == "darwin" || runtime.GOOS == "windows" || isMicrosoftWSL())
+ return IsKIC(name) && (runtime.GOOS == "darwin" || runtime.GOOS == "windows" || IsMicrosoftWSL())
}
-// isMicrosoftWSL will return true if process is running in WSL in windows
+// IsMicrosoftWSL will return true if process is running in WSL in windows
// checking for WSL env var based on this https://github.com/microsoft/WSL/issues/423#issuecomment-608237689
// also based on https://github.com/microsoft/vscode/blob/90a39ba0d49d75e9a4d7e62a6121ad946ecebc58/resources/win32/bin/code.sh#L24
-func isMicrosoftWSL() bool {
+func IsMicrosoftWSL() bool {
return os.Getenv("WSL_DISTRO_NAME") != "" || os.Getenv("WSLPATH") != "" || os.Getenv("WSLENV") != ""
}
diff --git a/test/integration/main.go b/test/integration/main.go
index aa38029977..0c1f2e70d9 100644
--- a/test/integration/main.go
+++ b/test/integration/main.go
@@ -24,6 +24,8 @@ import (
"strings"
"testing"
"time"
+
+ "k8s.io/minikube/pkg/minikube/driver"
)
// General configuration: used to set the VM Driver
@@ -93,14 +95,7 @@ func KicDriver() bool {
// NeedsPortForward returns access to endpoints with this driver needs port forwarding
// (Docker on non-Linux platforms requires ports to be forwarded to 127.0.0.1)
func NeedsPortForward() bool {
- return KicDriver() && (runtime.GOOS == "windows" || runtime.GOOS == "darwin") || isMicrosoftWSL()
-}
-
-// isMicrosoftWSL will return true if process is running in WSL in windows
-// checking for WSL env var based on this https://github.com/microsoft/WSL/issues/423#issuecomment-608237689
-// also based on https://github.com/microsoft/vscode/blob/90a39ba0d49d75e9a4d7e62a6121ad946ecebc58/resources/win32/bin/code.sh#L24
-func isMicrosoftWSL() bool {
- return os.Getenv("WSL_DISTRO_NAME") != "" || os.Getenv("WSLPATH") != "" || os.Getenv("WSLENV") != ""
+ return KicDriver() && (runtime.GOOS == "windows" || runtime.GOOS == "darwin") || driver.IsMicrosoftWSL()
}
// CanCleanup returns if cleanup is allowed