Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
8700f8a1
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,发现更多精彩内容 >>
未验证
提交
8700f8a1
编写于
2月 19, 2020
作者:
M
Medya Ghazizadeh
提交者:
GitHub
2月 19, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #6700 from medyagh/resource_limit
fix inverted logic for resource logic
上级
5169325c
7ada4f5c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
68 addition
and
57 deletion
+68
-57
cmd/minikube/cmd/start.go
cmd/minikube/cmd/start.go
+1
-1
pkg/minikube/driver/driver.go
pkg/minikube/driver/driver.go
+1
-1
test/integration/functional_test.go
test/integration/functional_test.go
+66
-55
未找到文件。
cmd/minikube/cmd/start.go
浏览文件 @
8700f8a1
...
...
@@ -668,7 +668,7 @@ func validateFlags(cmd *cobra.Command, drvName string) {
validateDiskSize
()
validateMemorySize
()
if
!
driver
.
HasResourceLimits
(
drvName
)
{
// both podman and none need root and they both cant specify resources
if
!
driver
.
HasResourceLimits
(
drvName
)
{
if
cmd
.
Flags
()
.
Changed
(
cpus
)
{
out
.
WarningT
(
"The '{{.name}}' driver does not respect the --cpus flag"
,
out
.
V
{
"name"
:
drvName
})
}
...
...
pkg/minikube/driver/driver.go
浏览文件 @
8700f8a1
...
...
@@ -115,7 +115,7 @@ func NeedsRoot(name string) bool {
// HasResourceLimits returns true if driver can set resource limits such as memory size or CPU count.
func
HasResourceLimits
(
name
string
)
bool
{
return
name
==
None
||
name
==
Podman
return
!
(
name
==
None
||
name
==
Podman
)
}
// FlagHints are hints for what default options should be used for this driver
...
...
test/integration/functional_test.go
浏览文件 @
8700f8a1
...
...
@@ -494,68 +494,79 @@ func validateLogsCmd(ctx context.Context, t *testing.T, profile string) {
// validateProfileCmd asserts "profile" command functionality
func
validateProfileCmd
(
ctx
context
.
Context
,
t
*
testing
.
T
,
profile
string
)
{
// Profile command should not create a nonexistent profile
nonexistentProfile
:=
"lis"
rr
,
err
:=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
Target
(),
"profile"
,
nonexistentProfile
))
rr
,
err
=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
Target
(),
"profile"
,
"list"
,
"--output"
,
"json"
))
if
err
!=
nil
{
t
.
Errorf
(
"%s failed: %v"
,
rr
.
Args
,
err
)
}
var
profileJson
map
[
string
][]
map
[
string
]
interface
{}
err
=
json
.
Unmarshal
(
rr
.
Stdout
.
Bytes
(),
&
profileJson
)
if
err
!=
nil
{
t
.
Errorf
(
"%s failed: %v"
,
rr
.
Args
,
err
)
}
for
profileK
:=
range
profileJson
{
for
_
,
p
:=
range
profileJson
[
profileK
]
{
var
name
=
p
[
"Name"
]
if
(
name
==
nonexistentProfile
)
{
t
.
Errorf
(
"minikube profile %s should not exist"
,
nonexistentProfile
)
t
.
Run
(
"profile_not_create"
,
func
(
t
*
testing
.
T
)
{
// Profile command should not create a nonexistent profile
nonexistentProfile
:=
"lis"
rr
,
err
:=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
Target
(),
"profile"
,
nonexistentProfile
))
if
err
!=
nil
{
t
.
Errorf
(
"%s failed: %v"
,
rr
.
Args
,
err
)
}
rr
,
err
=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
Target
(),
"profile"
,
"list"
,
"--output"
,
"json"
))
if
err
!=
nil
{
t
.
Errorf
(
"%s failed: %v"
,
rr
.
Args
,
err
)
}
var
profileJSON
map
[
string
][]
map
[
string
]
interface
{}
err
=
json
.
Unmarshal
(
rr
.
Stdout
.
Bytes
(),
&
profileJSON
)
if
err
!=
nil
{
t
.
Errorf
(
"%s failed: %v"
,
rr
.
Args
,
err
)
}
for
profileK
:=
range
profileJSON
{
for
_
,
p
:=
range
profileJSON
[
profileK
]
{
var
name
=
p
[
"Name"
]
if
name
==
nonexistentProfile
{
t
.
Errorf
(
"minikube profile %s should not exist"
,
nonexistentProfile
)
}
}
}
}
}
)
// List profiles
rr
,
err
=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
Target
(),
"profile"
,
"list"
))
if
err
!=
nil
{
t
.
Errorf
(
"%s failed: %v"
,
rr
.
Args
,
err
)
}
t
.
Run
(
"profile_list"
,
func
(
t
*
testing
.
T
)
{
// List profiles
rr
,
err
:=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
Target
(),
"profile"
,
"list"
))
if
err
!=
nil
{
t
.
Errorf
(
"%s failed: %v"
,
rr
.
Args
,
err
)
}
// Table output
listLines
:=
strings
.
Split
(
strings
.
TrimSpace
(
rr
.
Stdout
.
String
()),
"
\n
"
)
profileExists
:=
false
for
i
:=
3
;
i
<
(
len
(
listLines
)
-
1
);
i
++
{
profileLine
:=
listLines
[
i
]
if
strings
.
Contains
(
profileLine
,
profile
)
{
profileExists
=
true
break
// Table output
listLines
:=
strings
.
Split
(
strings
.
TrimSpace
(
rr
.
Stdout
.
String
()),
"
\n
"
)
profileExists
:=
false
for
i
:=
3
;
i
<
(
len
(
listLines
)
-
1
);
i
++
{
profileLine
:=
listLines
[
i
]
if
strings
.
Contains
(
profileLine
,
profile
)
{
profileExists
=
true
break
}
}
if
!
profileExists
{
t
.
Errorf
(
"%s failed: Missing profile '%s'. Got '
\n
%s
\n
'"
,
rr
.
Args
,
profile
,
rr
.
Stdout
.
String
())
}
}
if
!
profileExists
{
t
.
Errorf
(
"%s failed: Missing profile '%s'. Got '
\n
%s
\n
'"
,
rr
.
Args
,
profile
,
rr
.
Stdout
.
String
())
}
// Json output
rr
,
err
=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
Target
(),
"profile"
,
"list"
,
"--output"
,
"json"
))
if
err
!=
nil
{
t
.
Errorf
(
"%s failed: %v"
,
rr
.
Args
,
err
)
}
var
jsonObject
map
[
string
][]
map
[
string
]
interface
{}
err
=
json
.
Unmarshal
(
rr
.
Stdout
.
Bytes
(),
&
jsonObject
)
if
err
!=
nil
{
t
.
Errorf
(
"%s failed: %v"
,
rr
.
Args
,
err
)
}
validProfiles
:=
jsonObject
[
"valid"
]
profileExists
=
false
for
_
,
profileObject
:=
range
validProfiles
{
if
profileObject
[
"Name"
]
==
profile
{
profileExists
=
true
break
})
t
.
Run
(
"profile_json_output"
,
func
(
t
*
testing
.
T
)
{
// Json output
rr
,
err
:=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
Target
(),
"profile"
,
"list"
,
"--output"
,
"json"
))
if
err
!=
nil
{
t
.
Errorf
(
"%s failed: %v"
,
rr
.
Args
,
err
)
}
}
if
!
profileExists
{
t
.
Errorf
(
"%s failed: Missing profile '%s'. Got '
\n
%s
\n
'"
,
rr
.
Args
,
profile
,
rr
.
Stdout
.
String
())
}
var
jsonObject
map
[
string
][]
map
[
string
]
interface
{}
err
=
json
.
Unmarshal
(
rr
.
Stdout
.
Bytes
(),
&
jsonObject
)
if
err
!=
nil
{
t
.
Errorf
(
"%s failed: %v"
,
rr
.
Args
,
err
)
}
validProfiles
:=
jsonObject
[
"valid"
]
profileExists
:=
false
for
_
,
profileObject
:=
range
validProfiles
{
if
profileObject
[
"Name"
]
==
profile
{
profileExists
=
true
break
}
}
if
!
profileExists
{
t
.
Errorf
(
"%s failed: Missing profile '%s'. Got '
\n
%s
\n
'"
,
rr
.
Args
,
profile
,
rr
.
Stdout
.
String
())
}
})
}
// validateServiceCmd asserts basic "service" command functionality
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录