Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
3ffe2af1
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,发现更多精彩内容 >>
提交
3ffe2af1
编写于
7月 10, 2019
作者:
P
Priya Wadhwa
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Point docker daemon to minikube and rebuild docker image
上级
e6653b78
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
6 deletion
+14
-6
deploy/addons/gvisor/gvisor-pod.yaml.tmpl
deploy/addons/gvisor/gvisor-pod.yaml.tmpl
+1
-0
hack/jenkins/common.sh
hack/jenkins/common.sh
+0
-6
test/integration/functional_test.go
test/integration/functional_test.go
+13
-0
未找到文件。
deploy/addons/gvisor/gvisor-pod.yaml.tmpl
浏览文件 @
3ffe2af1
...
@@ -70,3 +70,4 @@ spec:
...
@@ -70,3 +70,4 @@ spec:
hostPath:
hostPath:
path: /tmp/gvisor
path: /tmp/gvisor
restartPolicy: Always
restartPolicy: Always
imagePullPolicy: IfNotPresent
hack/jenkins/common.sh
浏览文件 @
3ffe2af1
...
@@ -89,12 +89,6 @@ if [[ "${procs}" != "" ]]; then
...
@@ -89,12 +89,6 @@ if [[ "${procs}" != "" ]]; then
kill
-9
${
procs
}
||
true
kill
-9
${
procs
}
||
true
fi
fi
# Build and push gvisor image
echo
">> Building gvisor addon image locally."
export
GVISOR_ADDON_REPO
=
"gcr.io/k8s-minikube/integration/
${
MINIKUBE_LOCATION
}
"
docker build
-t
${
GVISOR_ADDON_REPO
}
/gvisor-addon:latest
-f
testdata/gvisor-addon-Dockerfile out
docker push
${
GVISOR_ADDON_REPO
}
/gvisor-addon:latest
# Cleanup stale test outputs.
# Cleanup stale test outputs.
echo
""
echo
""
echo
">> Cleaning up after previous test runs ..."
echo
">> Cleaning up after previous test runs ..."
...
...
test/integration/functional_test.go
浏览文件 @
3ffe2af1
...
@@ -19,6 +19,7 @@ limitations under the License.
...
@@ -19,6 +19,7 @@ limitations under the License.
package
integration
package
integration
import
(
import
(
"os/exec"
"strings"
"strings"
"testing"
"testing"
...
@@ -61,11 +62,23 @@ func TestFunctionalContainerd(t *testing.T) {
...
@@ -61,11 +62,23 @@ func TestFunctionalContainerd(t *testing.T) {
}
}
r
.
Start
(
"--container-runtime=containerd"
,
"--docker-opt containerd=/var/run/containerd/containerd.sock"
)
r
.
Start
(
"--container-runtime=containerd"
,
"--docker-opt containerd=/var/run/containerd/containerd.sock"
)
// Build the gvisor image in Minikube
buildGvisorImage
(
t
)
t
.
Run
(
"Gvisor"
,
testGvisor
)
t
.
Run
(
"Gvisor"
,
testGvisor
)
t
.
Run
(
"GvisorRestart"
,
testGvisorRestart
)
t
.
Run
(
"GvisorRestart"
,
testGvisorRestart
)
r
.
RunCommand
(
"delete"
,
true
)
r
.
RunCommand
(
"delete"
,
true
)
}
}
func
buildGvisorImage
(
t
*
testing
.
T
)
{
cmd
:=
exec
.
Command
(
"sh"
,
"-c"
,
"eval $(minikube docker-env) && docker build -t gcr.io/k8s-minikube/gvisor-addon:latest -f testdata/gvisor-addon-Dockerfile out"
)
output
,
err
:=
cmd
.
CombinedOutput
()
if
err
!=
nil
{
t
.
Fatalf
(
"error building gvisor addon image: %v
\n
%s"
,
err
,
string
(
output
))
}
}
// usingNoneDriver returns true if using the none driver
// usingNoneDriver returns true if using the none driver
func
usingNoneDriver
(
r
util
.
MinikubeRunner
)
bool
{
func
usingNoneDriver
(
r
util
.
MinikubeRunner
)
bool
{
return
strings
.
Contains
(
r
.
StartArgs
,
"--vm-driver=none"
)
return
strings
.
Contains
(
r
.
StartArgs
,
"--vm-driver=none"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录