Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
4572d063
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,发现更多精彩内容 >>
提交
4572d063
编写于
5月 02, 2020
作者:
M
Medya Gh
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
exit with usage if container type is windows
上级
ee9004f9
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
49 addition
and
1 deletion
+49
-1
cmd/minikube/cmd/start.go
cmd/minikube/cmd/start.go
+9
-0
pkg/drivers/kic/oci/errors.go
pkg/drivers/kic/oci/errors.go
+21
-0
pkg/drivers/kic/oci/oci.go
pkg/drivers/kic/oci/oci.go
+11
-0
pkg/minikube/node/start.go
pkg/minikube/node/start.go
+8
-1
未找到文件。
cmd/minikube/cmd/start.go
浏览文件 @
4572d063
...
...
@@ -156,6 +156,15 @@ func runStart(cmd *cobra.Command, args []string) {
ds
,
alts
,
specified
:=
selectDriver
(
existing
)
starter
,
err
:=
provisionWithDriver
(
cmd
,
ds
,
existing
)
if
err
!=
nil
{
if
errors
.
Is
(
err
,
oci
.
ErrWindowsContainers
)
{
out
.
ErrLn
(
""
)
out
.
ErrT
(
out
.
Conflict
,
"Your Docker Desktop container os type is Windows but Linux is required."
)
out
.
T
(
out
.
Warning
,
"Please change Docker settings to use Linux containers instead of Windows containers."
)
out
.
T
(
out
.
Documentation
,
"https://docs.docker.com/docker-for-windows/#switch-between-windows-and-linux-containers"
)
exit
.
UsageT
(
`You can verify your Docker container type by running:
{{.command}}
`
,
out
.
V
{
"command"
:
"docker info --format '{{.OSType}}'"
})
}
if
specified
{
// If the user specified a driver, don't fallback to anything else
exit
.
WithError
(
"error provisioning host"
,
err
)
...
...
pkg/drivers/kic/oci/errors.go
0 → 100644
浏览文件 @
4572d063
/*
Copyright 2020 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package
oci
import
"errors"
var
ErrWindowsContainers
=
errors
.
New
(
"Docker daemon's container type is windows"
)
\ No newline at end of file
pkg/drivers/kic/oci/oci.go
浏览文件 @
4572d063
...
...
@@ -104,6 +104,17 @@ func PrepareContainerNode(p CreateParams) error {
// CreateContainerNode creates a new container node
func
CreateContainerNode
(
p
CreateParams
)
error
{
// on windows os, if docker desktop is using Windows Containers. Exit early with error
if
p
.
OCIBinary
==
Docker
&&
runtime
.
GOOS
==
"windows"
{
info
,
err
:=
DaemonInfo
(
p
.
OCIBinary
)
if
info
.
OSType
==
"windows"
{
return
ErrWindowsContainers
}
if
err
!=
nil
{
return
err
}
}
runArgs
:=
[]
string
{
"-d"
,
// run the container detached
"-t"
,
// allocate a tty for entrypoint logs
...
...
pkg/minikube/node/start.go
浏览文件 @
4572d063
...
...
@@ -36,6 +36,7 @@ import (
"golang.org/x/sync/errgroup"
cmdcfg
"k8s.io/minikube/cmd/minikube/cmd/config"
"k8s.io/minikube/pkg/addons"
"k8s.io/minikube/pkg/drivers/kic/oci"
"k8s.io/minikube/pkg/minikube/bootstrapper"
"k8s.io/minikube/pkg/minikube/bootstrapper/images"
"k8s.io/minikube/pkg/minikube/cluster"
...
...
@@ -356,7 +357,6 @@ func startHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*hos
if
err
==
nil
{
return
host
,
exists
,
nil
}
out
.
ErrT
(
out
.
Embarrassed
,
"StartHost failed, but will try again: {{.error}}"
,
out
.
V
{
"error"
:
err
})
// NOTE: People get very cranky if you delete their prexisting VM. Only delete new ones.
if
!
exists
{
...
...
@@ -366,6 +366,13 @@ func startHost(api libmachine.API, cc config.ClusterConfig, n config.Node) (*hos
}
}
// don't try to re-create if container type is windows.
if
errors
.
Is
(
err
,
oci
.
ErrWindowsContainers
)
{
glog
.
Infof
(
"will skip retrying to create machine because error is not retriable: %v"
,
err
)
return
host
,
exists
,
err
}
out
.
ErrT
(
out
.
Embarrassed
,
"StartHost failed, but will try again: {{.error}}"
,
out
.
V
{
"error"
:
err
})
// Try again, but just once to avoid making the logs overly confusing
time
.
Sleep
(
5
*
time
.
Second
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录