Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
29df4260
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,发现更多精彩内容 >>
未验证
提交
29df4260
编写于
4月 22, 2020
作者:
M
Medya Gh
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
make all oci volume calls go through runner
上级
915058ef
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
11 deletion
+10
-11
pkg/drivers/kic/oci/cli_runner.go
pkg/drivers/kic/oci/cli_runner.go
+0
-0
pkg/drivers/kic/oci/volumes.go
pkg/drivers/kic/oci/volumes.go
+10
-11
未找到文件。
pkg/drivers/kic/oci/runner.go
→
pkg/drivers/kic/oci/
cli_
runner.go
浏览文件 @
29df4260
文件已移动
pkg/drivers/kic/oci/volumes.go
浏览文件 @
29df4260
...
...
@@ -65,9 +65,8 @@ func PruneAllVolumesByLabel(ociBin string, label string) []error {
// allVolumesByLabel returns name of all docker volumes by a specific label
// will not return error if there is no volume found.
func
allVolumesByLabel
(
ociBin
string
,
label
string
)
([]
string
,
error
)
{
cmd
:=
exec
.
Command
(
ociBin
,
"volume"
,
"ls"
,
"--filter"
,
"label="
+
label
,
"--format"
,
"{{.Name}}"
)
stdout
,
err
:=
cmd
.
Output
()
s
:=
bufio
.
NewScanner
(
bytes
.
NewReader
(
stdout
))
rr
,
err
:=
cli
.
RunCmd
(
exec
.
Command
(
ociBin
,
"volume"
,
"ls"
,
"--filter"
,
"label="
+
label
,
"--format"
,
"{{.Name}}"
))
s
:=
bufio
.
NewScanner
(
bytes
.
NewReader
(
rr
.
Stdout
.
Bytes
()))
var
vols
[]
string
for
s
.
Scan
()
{
v
:=
strings
.
TrimSpace
(
s
.
Text
())
...
...
@@ -81,10 +80,10 @@ func allVolumesByLabel(ociBin string, label string) ([]string, error) {
// ExtractTarballToVolume runs a docker image imageName which extracts the tarball at tarballPath
// to the volume named volumeName
func
ExtractTarballToVolume
(
tarballPath
,
volumeName
,
imageName
string
)
error
{
cmd
:=
exec
.
Command
(
Docker
,
"run"
,
"--rm"
,
"--entrypoint"
,
"/usr/bin/tar"
,
"-v"
,
fmt
.
Sprintf
(
"%s:/preloaded.tar:ro"
,
tarballPath
),
"-v"
,
fmt
.
Sprintf
(
"%s:/extractDir"
,
volumeName
),
imageName
,
"-I"
,
"lz4"
,
"-xvf"
,
"/preloaded.tar"
,
"-C"
,
"/extractDir"
)
glog
.
Infof
(
"execut
ing: %s"
,
cmd
.
Args
)
if
out
,
err
:=
cmd
.
CombinedOutput
();
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"output
%s"
,
string
(
out
))
rr
,
err
:=
cli
.
RunCmd
(
exec
.
Command
(
Docker
,
"run"
,
"--rm"
,
"--entrypoint"
,
"/usr/bin/tar"
,
"-v"
,
fmt
.
Sprintf
(
"%s:/preloaded.tar:ro"
,
tarballPath
),
"-v"
,
fmt
.
Sprintf
(
"%s:/extractDir"
,
volumeName
),
imageName
,
"-I"
,
"lz4"
,
"-xvf"
,
"/preloaded.tar"
,
"-C"
,
"/extractDir"
)
)
glog
.
Infof
(
"execut
ed: %s"
,
rr
.
Command
()
)
if
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"output
: %s"
,
rr
.
Output
(
))
}
return
nil
}
...
...
@@ -93,10 +92,10 @@ func ExtractTarballToVolume(tarballPath, volumeName, imageName string) error {
// Caution ! if volume already exists does NOT return an error and will not apply the minikube labels on it.
// TODO: this should be fixed as a part of https://github.com/kubernetes/minikube/issues/6530
func
createDockerVolume
(
profile
string
,
nodeName
string
)
error
{
cmd
:=
exec
.
Command
(
Docker
,
"volume"
,
"create"
,
nodeName
,
"--label"
,
fmt
.
Sprintf
(
"%s=%s"
,
ProfileLabelKey
,
profile
),
"--label"
,
fmt
.
Sprintf
(
"%s=%s"
,
CreatedByLabelKey
,
"true"
))
glog
.
Infof
(
"execut
ing: %s"
,
cmd
.
Args
)
if
out
,
err
:=
cmd
.
CombinedOutput
();
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"output
%s"
,
string
(
out
))
rr
,
err
:=
cli
.
RunCmd
(
exec
.
Command
(
Docker
,
"volume"
,
"create"
,
nodeName
,
"--label"
,
fmt
.
Sprintf
(
"%s=%s"
,
ProfileLabelKey
,
profile
),
"--label"
,
fmt
.
Sprintf
(
"%s=%s"
,
CreatedByLabelKey
,
"true"
)
))
glog
.
Infof
(
"execut
ed: %s"
,
rr
.
Command
()
)
if
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"output
: %s"
,
rr
.
Output
(
))
}
return
nil
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录