Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
5ac8520a
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,发现更多精彩内容 >>
提交
5ac8520a
编写于
2月 20, 2020
作者:
P
Priya Wadhwa
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
skip transferring binaries and transferring imagse if using preloaded volume
上级
b0f685c0
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
25 addition
and
8 deletion
+25
-8
pkg/drivers/kic/kic.go
pkg/drivers/kic/kic.go
+1
-2
pkg/drivers/kic/oci/volumes.go
pkg/drivers/kic/oci/volumes.go
+1
-1
pkg/drivers/kic/preload/preload.go
pkg/drivers/kic/preload/preload.go
+7
-0
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+7
-2
pkg/minikube/node/start.go
pkg/minikube/node/start.go
+9
-3
未找到文件。
pkg/drivers/kic/kic.go
浏览文件 @
5ac8520a
...
...
@@ -95,9 +95,8 @@ func (d *Driver) Create() error {
if
err
!=
nil
{
glog
.
Infof
(
"Unable to create preloaded images volume: %v"
,
err
)
}
glog
.
Infof
(
"Finished creating preloaded images volume in %
d
seconds"
,
time
.
Since
(
t
)
.
Seconds
())
glog
.
Infof
(
"Finished creating preloaded images volume in %
f
seconds"
,
time
.
Since
(
t
)
.
Seconds
())
params
.
PreloadedVolume
=
volumeName
fmt
.
Println
(
"Setting params.preloadedvolume = "
,
volumeName
)
err
=
oci
.
CreateContainerNode
(
params
)
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"create kic node"
)
...
...
pkg/drivers/kic/oci/volumes.go
浏览文件 @
5ac8520a
...
...
@@ -131,7 +131,7 @@ func extractTarballToVolume(tarballPath, volumeName, imageName string) error {
if
err
:=
PointToHostDockerDaemon
();
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"point host docker-daemon"
)
}
cmd
:=
exec
.
Command
(
Docker
,
"run"
,
"--rm"
,
"--entrypoint"
,
"/
bin/bash"
,
"-v"
,
fmt
.
Sprintf
(
"%s:/preloaded.tar:ro"
,
tarballPath
),
"-v"
,
fmt
.
Sprintf
(
"%s:/extractDir"
,
volumeName
),
imageName
,
"tar"
,
"-I"
,
"lz4"
,
"-xvf"
,
"/preloaded.tar"
,
"-C"
,
"/extractDir"
)
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"
)
fmt
.
Println
(
cmd
.
Args
)
if
out
,
err
:=
cmd
.
CombinedOutput
();
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"output %s"
,
string
(
out
))
...
...
pkg/drivers/kic/preload/preload.go
浏览文件 @
5ac8520a
...
...
@@ -46,3 +46,10 @@ func CacheTarball(k8sVersion string) error {
glog
.
Infof
(
"Downloading %s to %s"
,
url
,
targetFilepath
)
return
download
.
ToFile
(
url
,
targetFilepath
,
download
.
FileOptions
{
Mkdirs
:
download
.
MkdirAll
})
}
// UsingPreloadedVolume returns true if the preloaded tarball exists
func
UsingPreloadedVolume
(
k8sVersion
string
)
bool
{
path
:=
TarballPath
(
k8sVersion
)
_
,
err
:=
os
.
Stat
(
path
)
return
err
==
nil
}
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
浏览文件 @
5ac8520a
...
...
@@ -40,6 +40,7 @@ import (
kconst
"k8s.io/kubernetes/cmd/kubeadm/app/constants"
"k8s.io/minikube/pkg/drivers/kic"
"k8s.io/minikube/pkg/drivers/kic/oci"
"k8s.io/minikube/pkg/drivers/kic/preload"
"k8s.io/minikube/pkg/kapi"
"k8s.io/minikube/pkg/minikube/bootstrapper"
"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil"
...
...
@@ -436,9 +437,13 @@ func (k *Bootstrapper) UpdateCluster(cfg config.MachineConfig) error {
glog
.
Warningf
(
"unable to stop kubelet: %s command: %q output: %q"
,
err
,
rr
.
Command
(),
rr
.
Output
())
}
// Skip transfer if using preloaded kic volume
skipTransfer
:=
driver
.
IsKIC
(
cfg
.
Driver
)
&&
preload
.
UsingPreloadedVolume
(
cfg
.
KubernetesConfig
.
KubernetesVersion
)
if
!
skipTransfer
{
if
err
:=
bsutil
.
TransferBinaries
(
cfg
.
KubernetesConfig
,
k
.
c
);
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"downloading binaries"
)
}
}
var
cniFile
[]
byte
if
cfg
.
KubernetesConfig
.
EnableDefaultCNI
{
...
...
pkg/minikube/node/start.go
浏览文件 @
5ac8520a
...
...
@@ -22,6 +22,7 @@ import (
"github.com/spf13/viper"
"golang.org/x/sync/errgroup"
"k8s.io/minikube/pkg/addons"
"k8s.io/minikube/pkg/drivers/kic/preload"
"k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/driver"
"k8s.io/minikube/pkg/minikube/exit"
...
...
@@ -34,9 +35,16 @@ import (
// Start spins up a guest and starts the kubernetes node.
func
Start
(
mc
config
.
MachineConfig
,
n
config
.
Node
,
primary
bool
,
existingAddons
map
[
string
]
bool
)
(
*
kubeconfig
.
Settings
,
error
)
{
k8sVersion
:=
mc
.
KubernetesConfig
.
KubernetesVersion
driverName
:=
mc
.
Driver
// Now that the ISO is downloaded, pull images in the background while the VM boots.
var
cacheGroup
errgroup
.
Group
beginCacheRequiredImages
(
&
cacheGroup
,
mc
.
KubernetesConfig
.
ImageRepository
,
n
.
KubernetesVersion
)
if
!
preload
.
UsingPreloadedVolume
(
k8sVersion
)
&&
driver
.
IsKIC
(
driverName
)
{
beginCacheRequiredImages
(
&
cacheGroup
,
mc
.
KubernetesConfig
.
ImageRepository
,
k8sVersion
)
}
else
{
mc
.
KubernetesConfig
.
ShouldLoadCachedImages
=
false
}
// Abstraction leakage alert: startHost requires the config to be saved, to satistfy pkg/provision/buildroot.
// Hence, saveConfig must be called before startHost, and again afterwards when we know the IP.
...
...
@@ -44,8 +52,6 @@ func Start(mc config.MachineConfig, n config.Node, primary bool, existingAddons
exit
.
WithError
(
"Failed to save config"
,
err
)
}
k8sVersion
:=
mc
.
KubernetesConfig
.
KubernetesVersion
driverName
:=
mc
.
Driver
// exits here in case of --download-only option.
handleDownloadOnly
(
&
cacheGroup
,
k8sVersion
,
driverName
)
mRunner
,
preExists
,
machineAPI
,
host
:=
startMachine
(
&
mc
,
&
n
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录