Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
b6c96eef
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,发现更多精彩内容 >>
提交
b6c96eef
编写于
3月 05, 2020
作者:
T
tstromberg
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Skip ISO checksum validation if custom URL is specified
上级
ba199678
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
5 deletion
+11
-5
cmd/minikube/cmd/start.go
cmd/minikube/cmd/start.go
+1
-1
pkg/minikube/download/iso.go
pkg/minikube/download/iso.go
+6
-3
test/integration/version_upgrade_test.go
test/integration/version_upgrade_test.go
+4
-1
未找到文件。
cmd/minikube/cmd/start.go
浏览文件 @
b6c96eef
...
...
@@ -322,7 +322,7 @@ func runStart(cmd *cobra.Command, args []string) {
}
if
!
driver
.
BareMetal
(
driverName
)
&&
!
driver
.
IsKIC
(
driverName
)
{
url
,
err
:=
download
.
ISO
(
viper
.
GetStringSlice
(
isoURL
))
url
,
err
:=
download
.
ISO
(
viper
.
GetStringSlice
(
isoURL
)
,
cmd
.
Flags
()
.
Changed
(
isoURL
)
)
if
err
!=
nil
{
exit
.
WithError
(
"Failed to cache ISO"
,
err
)
}
...
...
pkg/minikube/download/iso.go
浏览文件 @
b6c96eef
...
...
@@ -78,12 +78,12 @@ func localISOPath(u *url.URL) string {
}
// ISO downloads and returns the path to the downloaded ISO
func
ISO
(
urls
[]
string
)
(
string
,
error
)
{
func
ISO
(
urls
[]
string
,
skipChecksum
bool
)
(
string
,
error
)
{
out
.
T
(
out
.
ISODownload
,
"Downloading VM boot image ..."
)
errs
:=
map
[
string
]
string
{}
for
_
,
url
:=
range
urls
{
err
:=
downloadISO
(
url
)
err
:=
downloadISO
(
url
,
skipChecksum
)
if
err
!=
nil
{
glog
.
Errorf
(
"Unable to download %s: %v"
,
url
,
err
)
errs
[
url
]
=
err
.
Error
()
...
...
@@ -102,7 +102,7 @@ func ISO(urls []string) (string, error) {
}
// downloadISO downloads an ISO URL
func
downloadISO
(
isoURL
string
)
error
{
func
downloadISO
(
isoURL
string
,
skipChecksum
bool
)
error
{
u
,
err
:=
url
.
Parse
(
isoURL
)
if
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"url.parse %q"
,
isoURL
)
...
...
@@ -129,6 +129,9 @@ func downloadISO(isoURL string) error {
}
urlWithChecksum
:=
isoURL
+
"?checksum=file:"
+
isoURL
+
".sha256"
if
skipChecksum
{
urlWithChecksum
=
isoURL
}
// Predictable temp destination so that resume can function
tmpDst
:=
dst
+
".download"
...
...
test/integration/version_upgrade_test.go
浏览文件 @
b6c96eef
...
...
@@ -65,7 +65,10 @@ func TestVersionUpgrade(t *testing.T) {
}
}
args
:=
append
([]
string
{
"start"
,
"-p"
,
profile
,
fmt
.
Sprintf
(
"--kubernetes-version=%s"
,
constants
.
OldestKubernetesVersion
),
"--alsologtostderr"
,
"-v=1"
},
StartArgs
()
...
)
// Assert that --iso-url works without a sha checksum, and that we can upgrade from old ISO's
// Some day, this will break an implicit assumption that a tool is available in the ISO :)
oldISO
:=
"https://storage.googleapis.com/minikube/iso/integration-test-v1.7.0.iso"
args
:=
append
([]
string
{
"start"
,
"-p"
,
profile
,
fmt
.
Sprintf
(
"--iso-url=%s"
,
oldISO
),
fmt
.
Sprintf
(
"--kubernetes-version=%s"
,
constants
.
OldestKubernetesVersion
),
"--alsologtostderr"
,
"-v=1"
},
StartArgs
()
...
)
rr
:=
&
RunResult
{}
r
:=
func
()
error
{
rr
,
err
=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
tf
.
Name
(),
args
...
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录