Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
0c7bddab
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,发现更多精彩内容 >>
未验证
提交
0c7bddab
编写于
3月 21, 2020
作者:
T
Thomas Strömberg
提交者:
GitHub
3月 21, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #7130 from govargo/feature/helm-tiller-2.16.3
bumpup helm-tiller v2.16.1 → v2.16.3
上级
d78f0b18
eca69790
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
45 addition
and
2 deletion
+45
-2
deploy/addons/helm-tiller/helm-tiller-dp.tmpl
deploy/addons/helm-tiller/helm-tiller-dp.tmpl
+1
-1
test/integration/addons_test.go
test/integration/addons_test.go
+44
-1
未找到文件。
deploy/addons/helm-tiller/helm-tiller-dp.tmpl
浏览文件 @
0c7bddab
...
...
@@ -46,7 +46,7 @@ spec:
value: kube-system
- name: TILLER_HISTORY_MAX
value: "0"
image: gcr.io/kubernetes-helm/tiller:v2.16.
1
image: gcr.io/kubernetes-helm/tiller:v2.16.
3
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
...
...
test/integration/addons_test.go
浏览文件 @
0c7bddab
...
...
@@ -40,7 +40,7 @@ func TestAddons(t *testing.T) {
ctx
,
cancel
:=
context
.
WithTimeout
(
context
.
Background
(),
Minutes
(
40
))
defer
CleanupWithLogs
(
t
,
profile
,
cancel
)
args
:=
append
([]
string
{
"start"
,
"-p"
,
profile
,
"--wait=false"
,
"--memory=2600"
,
"--alsologtostderr"
,
"-v=1"
,
"--addons=ingress"
,
"--addons=registry"
,
"--addons=metrics-server"
},
StartArgs
()
...
)
args
:=
append
([]
string
{
"start"
,
"-p"
,
profile
,
"--wait=false"
,
"--memory=2600"
,
"--alsologtostderr"
,
"-v=1"
,
"--addons=ingress"
,
"--addons=registry"
,
"--addons=metrics-server"
,
"--addons=helm-tiller"
},
StartArgs
()
...
)
rr
,
err
:=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
Target
(),
args
...
))
if
err
!=
nil
{
t
.
Fatalf
(
"%s failed: %v"
,
rr
.
Args
,
err
)
...
...
@@ -55,6 +55,7 @@ func TestAddons(t *testing.T) {
{
"Registry"
,
validateRegistryAddon
},
{
"Ingress"
,
validateIngressAddon
},
{
"MetricsServer"
,
validateMetricsServerAddon
},
{
"HelmTiller"
,
validateHelmTillerAddon
},
}
for
_
,
tc
:=
range
tests
{
tc
:=
tc
...
...
@@ -249,3 +250,45 @@ func validateMetricsServerAddon(ctx context.Context, t *testing.T, profile strin
t
.
Errorf
(
"%s failed: %v"
,
rr
.
Args
,
err
)
}
}
func
validateHelmTillerAddon
(
ctx
context
.
Context
,
t
*
testing
.
T
,
profile
string
)
{
client
,
err
:=
kapi
.
Client
(
profile
)
if
err
!=
nil
{
t
.
Fatalf
(
"kubernetes client: %v"
,
client
)
}
start
:=
time
.
Now
()
if
err
:=
kapi
.
WaitForDeploymentToStabilize
(
client
,
"kube-system"
,
"tiller-deploy"
,
Minutes
(
6
));
err
!=
nil
{
t
.
Errorf
(
"waiting for tiller-deploy deployment to stabilize: %v"
,
err
)
}
t
.
Logf
(
"tiller-deploy stabilized in %s"
,
time
.
Since
(
start
))
if
_
,
err
:=
PodWait
(
ctx
,
t
,
profile
,
"kube-system"
,
"app=helm"
,
Minutes
(
6
));
err
!=
nil
{
t
.
Fatalf
(
"wait: %v"
,
err
)
}
want
:=
"Server: &version.Version"
// Test from inside the cluster (`helm version` use pod.list permission. we use tiller serviceaccount in kube-system to list pod)
checkHelmTiller
:=
func
()
error
{
rr
,
err
:=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
"kubectl"
,
"--context"
,
profile
,
"run"
,
"--rm"
,
"helm-test"
,
"--restart=Never"
,
"--image=alpine/helm:2.16.3"
,
"-it"
,
"--namespace=kube-system"
,
"--serviceaccount=tiller"
,
"--"
,
"version"
))
if
err
!=
nil
{
return
err
}
if
rr
.
Stderr
.
String
()
!=
""
{
t
.
Logf
(
"%v: unexpected stderr: %s"
,
rr
.
Args
,
rr
.
Stderr
)
}
if
!
strings
.
Contains
(
rr
.
Stdout
.
String
(),
want
)
{
return
fmt
.
Errorf
(
"%v stdout = %q, want %q"
,
rr
.
Args
,
rr
.
Stdout
,
want
)
}
return
nil
}
if
err
:=
retry
.
Expo
(
checkHelmTiller
,
500
*
time
.
Millisecond
,
Minutes
(
2
));
err
!=
nil
{
t
.
Errorf
(
err
.
Error
())
}
rr
,
err
:=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
Target
(),
"-p"
,
profile
,
"addons"
,
"disable"
,
"helm-tiller"
,
"--alsologtostderr"
,
"-v=1"
))
if
err
!=
nil
{
t
.
Errorf
(
"%s failed: %v"
,
rr
.
Args
,
err
)
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录