Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
634f0ae0
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,发现更多精彩内容 >>
未验证
提交
634f0ae0
编写于
12月 10, 2020
作者:
L
Ling Samuel
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove verbose options
上级
ead11c65
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
5 addition
and
5 deletion
+5
-5
hack/preload-images/generate.go
hack/preload-images/generate.go
+1
-1
pkg/drivers/kic/oci/volumes.go
pkg/drivers/kic/oci/volumes.go
+1
-1
pkg/minikube/cruntime/containerd.go
pkg/minikube/cruntime/containerd.go
+1
-1
pkg/minikube/cruntime/crio.go
pkg/minikube/cruntime/crio.go
+1
-1
pkg/minikube/cruntime/docker.go
pkg/minikube/cruntime/docker.go
+1
-1
未找到文件。
hack/preload-images/generate.go
浏览文件 @
634f0ae0
...
...
@@ -181,7 +181,7 @@ func createImageTarball(tarballFilename, containerRuntime string) error {
dirs
=
append
(
dirs
,
"./lib/containers"
)
}
args
:=
[]
string
{
"exec"
,
profile
,
"sudo"
,
"tar"
,
"-I"
,
"lz4"
,
"-C"
,
"/var"
,
"-c
v
f"
,
tarballFilename
}
args
:=
[]
string
{
"exec"
,
profile
,
"sudo"
,
"tar"
,
"-I"
,
"lz4"
,
"-C"
,
"/var"
,
"-cf"
,
tarballFilename
}
args
=
append
(
args
,
dirs
...
)
cmd
:=
exec
.
Command
(
"docker"
,
args
...
)
cmd
.
Stdout
=
os
.
Stdout
...
...
pkg/drivers/kic/oci/volumes.go
浏览文件 @
634f0ae0
...
...
@@ -90,7 +90,7 @@ func ExtractTarballToVolume(ociBin string, tarballPath, volumeName, imageName st
if
ociBin
==
Podman
&&
runtime
.
GOOS
==
"linux"
{
cmdArgs
=
append
(
cmdArgs
,
"--security-opt"
,
"label=disable"
)
}
cmdArgs
=
append
(
cmdArgs
,
"-v"
,
fmt
.
Sprintf
(
"%s:/preloaded.tar:ro"
,
tarballPath
),
"-v"
,
fmt
.
Sprintf
(
"%s:/extractDir"
,
volumeName
),
imageName
,
"-I"
,
"lz4"
,
"-x
v
f"
,
"/preloaded.tar"
,
"-C"
,
"/extractDir"
)
cmdArgs
=
append
(
cmdArgs
,
"-v"
,
fmt
.
Sprintf
(
"%s:/preloaded.tar:ro"
,
tarballPath
),
"-v"
,
fmt
.
Sprintf
(
"%s:/extractDir"
,
volumeName
),
imageName
,
"-I"
,
"lz4"
,
"-xf"
,
"/preloaded.tar"
,
"-C"
,
"/extractDir"
)
cmd
:=
exec
.
Command
(
ociBin
,
cmdArgs
...
)
if
_
,
err
:=
runCmd
(
cmd
);
err
!=
nil
{
return
err
...
...
pkg/minikube/cruntime/containerd.go
浏览文件 @
634f0ae0
...
...
@@ -346,7 +346,7 @@ func (r *Containerd) Preload(cfg config.KubernetesConfig) error {
t
=
time
.
Now
()
// extract the tarball to /var in the VM
if
rr
,
err
:=
r
.
Runner
.
RunCmd
(
exec
.
Command
(
"sudo"
,
"tar"
,
"-I"
,
"lz4"
,
"-C"
,
"/var"
,
"-x
v
f"
,
dest
));
err
!=
nil
{
if
rr
,
err
:=
r
.
Runner
.
RunCmd
(
exec
.
Command
(
"sudo"
,
"tar"
,
"-I"
,
"lz4"
,
"-C"
,
"/var"
,
"-xf"
,
dest
));
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"extracting tarball: %s"
,
rr
.
Output
())
}
klog
.
Infof
(
"Took %f seconds t extract the tarball"
,
time
.
Since
(
t
)
.
Seconds
())
...
...
pkg/minikube/cruntime/crio.go
浏览文件 @
634f0ae0
...
...
@@ -264,7 +264,7 @@ func (r *CRIO) Preload(cfg config.KubernetesConfig) error {
t
=
time
.
Now
()
// extract the tarball to /var in the VM
if
rr
,
err
:=
r
.
Runner
.
RunCmd
(
exec
.
Command
(
"sudo"
,
"tar"
,
"-I"
,
"lz4"
,
"-C"
,
"/var"
,
"-x
v
f"
,
dest
));
err
!=
nil
{
if
rr
,
err
:=
r
.
Runner
.
RunCmd
(
exec
.
Command
(
"sudo"
,
"tar"
,
"-I"
,
"lz4"
,
"-C"
,
"/var"
,
"-xf"
,
dest
));
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"extracting tarball: %s"
,
rr
.
Output
())
}
klog
.
Infof
(
"Took %f seconds t extract the tarball"
,
time
.
Since
(
t
)
.
Seconds
())
...
...
pkg/minikube/cruntime/docker.go
浏览文件 @
634f0ae0
...
...
@@ -347,7 +347,7 @@ func (r *Docker) Preload(cfg config.KubernetesConfig) error {
klog
.
Infof
(
"Took %f seconds to copy over tarball"
,
time
.
Since
(
t
)
.
Seconds
())
// extract the tarball to /var in the VM
if
rr
,
err
:=
r
.
Runner
.
RunCmd
(
exec
.
Command
(
"sudo"
,
"tar"
,
"-I"
,
"lz4"
,
"-C"
,
"/var"
,
"-x
v
f"
,
dest
));
err
!=
nil
{
if
rr
,
err
:=
r
.
Runner
.
RunCmd
(
exec
.
Command
(
"sudo"
,
"tar"
,
"-I"
,
"lz4"
,
"-C"
,
"/var"
,
"-xf"
,
dest
));
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"extracting tarball: %s"
,
rr
.
Output
())
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录