Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
20113067
M
minikube
项目概览
Chu Peng 楚鹏
/
minikube
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
minikube
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
20113067
编写于
6月 04, 2020
作者:
M
Medya Ghazizadeh
提交者:
GitHub
6月 04, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #8368 from medyagh/detect_wsl
add support for microsoft wsl for docker driver
上级
025ba11b
6b29b784
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
2 deletion
+11
-2
pkg/minikube/driver/driver.go
pkg/minikube/driver/driver.go
+8
-1
test/integration/main.go
test/integration/main.go
+3
-1
未找到文件。
pkg/minikube/driver/driver.go
浏览文件 @
20113067
...
...
@@ -131,7 +131,14 @@ 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"
)
return
IsKIC
(
name
)
&&
(
runtime
.
GOOS
==
"darwin"
||
runtime
.
GOOS
==
"windows"
||
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"
)
!=
""
}
// HasResourceLimits returns true if driver can set resource limits such as memory size or CPU count.
...
...
test/integration/main.go
浏览文件 @
20113067
...
...
@@ -24,6 +24,8 @@ import (
"strings"
"testing"
"time"
"k8s.io/minikube/pkg/minikube/driver"
)
// General configuration: used to set the VM Driver
...
...
@@ -93,7 +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"
)
return
KicDriver
()
&&
(
runtime
.
GOOS
==
"windows"
||
runtime
.
GOOS
==
"darwin"
)
||
driver
.
IsMicrosoftWSL
()
}
// CanCleanup returns if cleanup is allowed
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录