Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
b4149014
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,发现更多精彩内容 >>
未验证
提交
b4149014
编写于
2月 08, 2021
作者:
M
Medya Ghazizadeh
提交者:
GitHub
2月 08, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #10381 from spowelljr/addTmpDirTests
Refactor tmp dir detection to improve testability
上级
de03a37a
f13ae5cd
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
77 addition
and
9 deletion
+77
-9
pkg/minikube/command/kic_runner.go
pkg/minikube/command/kic_runner.go
+23
-9
pkg/minikube/command/kic_runner_test.go
pkg/minikube/command/kic_runner_test.go
+54
-0
未找到文件。
pkg/minikube/command/kic_runner.go
浏览文件 @
b4149014
...
...
@@ -186,17 +186,13 @@ func (k *kicRunner) Copy(f assets.CopyableFile) error {
}
}
klog
.
Infof
(
"%s (temp): %s --> %s (%d bytes)"
,
k
.
ociBin
,
src
,
dst
,
f
.
GetLength
())
tmpFolder
:=
""
// Snap only allows an application to see its own files in /tmp, making Docker unable to copy memory assets
// https://github.com/kubernetes/minikube/issues/10020
if
isSnapBinary
()
{
home
,
err
:=
os
.
UserHomeDir
()
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"detecting home dir"
)
}
tmpFolder
=
home
isSnap
:=
isSnapBinary
()
tmpFolder
,
err
:=
tempDirectory
(
isSnap
)
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"determining temp directory"
)
}
tf
,
err
:=
ioutil
.
TempFile
(
tmpFolder
,
"tmpf-memory-asset"
)
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"creating temporary file"
)
...
...
@@ -209,6 +205,24 @@ func (k *kicRunner) Copy(f assets.CopyableFile) error {
return
k
.
copy
(
tf
.
Name
(),
dst
)
}
// tempDirectory returns the directory to use as the temp directory
// or an empty string if it should use the os default temp directory.
func
tempDirectory
(
isSnap
bool
)
(
string
,
error
)
{
if
!
isSnap
{
return
""
,
nil
}
// Snap only allows an application to see its own files in /tmp, making Docker unable to copy memory assets
// https://github.com/kubernetes/minikube/issues/10020
home
,
err
:=
os
.
UserHomeDir
()
if
err
!=
nil
{
return
""
,
errors
.
Wrap
(
err
,
"detecting home dir"
)
}
return
home
,
nil
}
// isSnapBinary returns true if the binary path includes "snap".
func
isSnapBinary
()
bool
{
ex
,
err
:=
os
.
Executable
()
if
err
!=
nil
{
...
...
pkg/minikube/command/kic_runner_test.go
0 → 100644
浏览文件 @
b4149014
/*
Copyright 2019 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package
command
import
(
"os"
"testing"
)
func
TestKICRunner
(
t
*
testing
.
T
)
{
t
.
Parallel
()
t
.
Run
(
"TestTempDirectory"
,
func
(
t
*
testing
.
T
)
{
t
.
Parallel
()
home
,
err
:=
os
.
UserHomeDir
()
if
err
!=
nil
{
t
.
Fatalf
(
"failed to get user home directory: %v"
,
err
)
}
tests
:=
[]
struct
{
in
bool
want
string
}{
{
false
,
""
},
{
true
,
home
},
}
for
_
,
tt
:=
range
tests
{
got
,
err
:=
tempDirectory
(
tt
.
in
)
if
err
!=
nil
{
t
.
Fatalf
(
"failed to get temp directory: %v"
,
err
)
}
if
got
!=
tt
.
want
{
t
.
Errorf
(
"tempDirectory(%t) = %s; want %s"
,
tt
.
in
,
got
,
tt
.
want
)
}
}
})
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录