Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
8a0a2107
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,发现更多精彩内容 >>
未验证
提交
8a0a2107
编写于
4月 23, 2020
作者:
M
Medya Gh
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
convert more funcs to use cli runner
上级
c6e1445c
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
8 addition
and
12 deletion
+8
-12
pkg/drivers/kic/oci/oci.go
pkg/drivers/kic/oci/oci.go
+8
-12
未找到文件。
pkg/drivers/kic/oci/oci.go
浏览文件 @
8a0a2107
...
...
@@ -286,14 +286,12 @@ func ContainerExists(ociBin string, name string) (bool, error) {
// IsCreatedByMinikube returns true if the container was created by minikube
// with default assumption that it is not created by minikube when we don't know for sure
func
IsCreatedByMinikube
(
ociBinary
string
,
nameOrID
string
)
bool
{
cmd
:=
exec
.
Command
(
ociBinary
,
"inspect"
,
nameOrID
,
"--format"
,
"{{.Config.Labels}}"
)
out
,
err
:=
cmd
.
CombinedOutput
()
rr
,
err
:=
cli
.
RunCmd
(
exec
.
Command
(
ociBinary
,
"inspect"
,
nameOrID
,
"--format"
,
"{{.Config.Labels}}"
))
if
err
!=
nil
{
return
false
}
if
strings
.
Contains
(
string
(
out
),
fmt
.
Sprintf
(
"%s:true"
,
CreatedByLabelKey
))
{
if
strings
.
Contains
(
rr
.
Stdout
.
String
(
),
fmt
.
Sprintf
(
"%s:true"
,
CreatedByLabelKey
))
{
return
true
}
...
...
@@ -307,14 +305,13 @@ func ListOwnedContainers(ociBinary string) ([]string, error) {
// inspect return low-level information on containers
func
inspect
(
ociBinary
string
,
containerNameOrID
,
format
string
)
([]
string
,
error
)
{
cmd
:=
exec
.
Command
(
ociBinary
,
"inspect"
,
"-f"
,
format
,
containerNameOrID
)
// ... against the "node" container
var
buff
bytes
.
Buffer
cmd
.
Stdout
=
&
buff
cmd
.
Stderr
=
&
buff
err
:=
cmd
.
Run
(
)
_
,
err
:=
cli
.
RunCmd
(
cmd
)
scanner
:=
bufio
.
NewScanner
(
&
buff
)
var
lines
[]
string
for
scanner
.
Scan
()
{
...
...
@@ -375,8 +372,8 @@ func isUsernsRemapEnabled(ociBinary string) bool {
var
buff
bytes
.
Buffer
cmd
.
Stdout
=
&
buff
cmd
.
Stderr
=
&
buff
err
:=
cmd
.
Run
()
if
err
!=
nil
{
if
_
,
err
:=
cli
.
RunCmd
(
cmd
);
err
!=
nil
{
return
false
}
...
...
@@ -488,13 +485,12 @@ func ContainerStatus(ociBin string, name string) (state.State, error) {
}
}
// Shut
d
own will run command to shut down the container
// Shut
D
own will run command to shut down the container
// to ensure the containers process and networking bindings are all closed
// to avoid containers getting stuck before delete https://github.com/kubernetes/minikube/issues/7657
func
ShutDown
(
ociBin
string
,
name
string
)
error
{
cmd
:=
exec
.
Command
(
ociBin
,
"exec"
,
"--privileged"
,
"-t"
,
name
,
"/bin/bash"
,
"-c"
,
"sudo init 0"
)
if
out
,
err
:=
cmd
.
CombinedOutput
();
err
!=
nil
{
glog
.
Infof
(
"error shutdown %s output %q : %v"
,
name
,
out
,
err
)
if
_
,
err
:=
cli
.
RunCmd
(
exec
.
Command
(
ociBin
,
"exec"
,
"--privileged"
,
"-t"
,
name
,
"/bin/bash"
,
"-c"
,
"sudo init 0"
));
err
!=
nil
{
glog
.
Infof
(
"error shutdown %s: %v"
,
name
,
err
)
}
// helps with allowing docker realize the container is exited and report its status correctly.
time
.
Sleep
(
time
.
Second
*
1
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录