Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
e783af2b
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,体验更适合开发者的 AI 搜索 >>
提交
e783af2b
编写于
8月 03, 2020
作者:
M
Medya Gh
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fill up cpu memory if config is missing
上级
e87400db
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
18 addition
and
6 deletion
+18
-6
cmd/minikube/cmd/start_flags.go
cmd/minikube/cmd/start_flags.go
+18
-6
未找到文件。
cmd/minikube/cmd/start_flags.go
浏览文件 @
e783af2b
...
...
@@ -392,9 +392,6 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC
cc
:=
*
existing
// validate the memory size in case user changed their system memory limits (example change docker desktop or upgraded memory.)
validateMemorySize
(
cc
.
Memory
,
cc
.
Driver
)
if
cmd
.
Flags
()
.
Changed
(
containerRuntime
)
{
cc
.
KubernetesConfig
.
ContainerRuntime
=
viper
.
GetString
(
containerRuntime
)
}
...
...
@@ -411,19 +408,34 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC
cc
.
MinikubeISO
=
viper
.
GetString
(
isoURL
)
}
if
cc
.
Memory
==
0
{
glog
.
Info
(
"Existing config file was missing memory. (could be an old minikube config), will use the default value"
)
memInMB
,
err
:=
pkgutil
.
CalculateSizeInMB
(
viper
.
GetString
(
memory
))
if
err
!=
nil
{
glog
.
Warningf
(
"error calculate memory size in mb : %v"
,
err
)
}
cc
.
Memory
=
memInMB
}
if
cmd
.
Flags
()
.
Changed
(
memory
)
{
memInMB
,
err
:=
pkgutil
.
CalculateSizeInMB
(
viper
.
GetString
(
memory
))
if
err
!=
nil
{
glog
.
Warningf
(
"error calculate memory size in mb : %v"
,
err
)
}
if
memInMB
!=
existing
.
Memory
{
if
memInMB
!=
cc
.
Memory
{
out
.
WarningT
(
"You cannot change the memory size for an exiting minikube cluster. Please first delete the cluster."
)
}
}
// validate the memory size in case user changed their system memory limits (example change docker desktop or upgraded memory.)
validateMemorySize
(
cc
.
Memory
,
cc
.
Driver
)
if
cc
.
CPUs
==
0
{
glog
.
Info
(
"Existing config file was missing cpu. (could be an old minikube config), will use the default value"
)
cc
.
CPUs
=
viper
.
GetInt
(
cpus
)
}
if
cmd
.
Flags
()
.
Changed
(
cpus
)
{
if
viper
.
GetInt
(
cpus
)
!=
existing
.
CPUs
{
if
viper
.
GetInt
(
cpus
)
!=
cc
.
CPUs
{
out
.
WarningT
(
"You cannot change the CPUs for an existing minikube cluster. Please first delete the cluster."
)
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录