Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ba4a2c54
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
ba4a2c54
编写于
2月 20, 2017
作者:
N
Nick Thomas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add KUBE_CA_PEM_FILE, deprecate KUBE_CA_PEM
上级
df63d9db
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
18 addition
and
2 deletion
+18
-2
app/models/project_services/kubernetes_service.rb
app/models/project_services/kubernetes_service.rb
+6
-1
changelogs/unreleased/add-kube-ca-pem-file-deprecate-kube-ca-pem.yml
...unreleased/add-kube-ca-pem-file-deprecate-kube-ca-pem.yml
+4
-0
doc/user/project/integrations/kubernetes.md
doc/user/project/integrations/kubernetes.md
+2
-1
spec/models/project_services/kubernetes_service_spec.rb
spec/models/project_services/kubernetes_service_spec.rb
+6
-0
未找到文件。
app/models/project_services/kubernetes_service.rb
浏览文件 @
ba4a2c54
...
...
@@ -94,7 +94,12 @@ class KubernetesService < DeploymentService
{
key:
'KUBE_TOKEN'
,
value:
token
,
public:
false
},
{
key:
'KUBE_NAMESPACE'
,
value:
namespace
,
public:
true
}
]
variables
<<
{
key:
'KUBE_CA_PEM'
,
value:
ca_pem
,
public:
true
}
if
ca_pem
.
present?
if
ca_pem
.
present?
variables
<<
{
key:
'KUBE_CA_PEM'
,
value:
ca_pem
,
public:
true
}
variables
<<
{
key:
'KUBE_CA_PEM_FILE'
,
value:
ca_pem
,
public:
true
,
file:
true
}
end
variables
end
...
...
changelogs/unreleased/add-kube-ca-pem-file-deprecate-kube-ca-pem.yml
0 → 100644
浏览文件 @
ba4a2c54
---
title
:
Add KUBE_CA_PEM_FILE, deprecate KUBE_CA_PEM
merge_request
:
9398
author
:
doc/user/project/integrations/kubernetes.md
浏览文件 @
ba4a2c54
...
...
@@ -49,7 +49,8 @@ GitLab CI build environment:
-
`KUBE_URL`
- equal to the API URL
-
`KUBE_TOKEN`
-
`KUBE_NAMESPACE`
-
`KUBE_CA_PEM`
- only if a custom CA bundle was specified
-
`KUBE_CA_PEM_FILE`
- only present if a custom CA bundle was specified. Path to a file containing PEM data.
-
`KUBE_CA_PEM`
(deprecated)- only if a custom CA bundle was specified. Raw PEM data.
## Web terminals
...
...
spec/models/project_services/kubernetes_service_spec.rb
浏览文件 @
ba4a2c54
...
...
@@ -163,6 +163,12 @@ describe KubernetesService, models: true, caching: true do
{
key:
'KUBE_CA_PEM'
,
value:
'CA PEM DATA'
,
public:
true
}
)
end
it
'sets KUBE_CA_PEM_FILE'
do
expect
(
subject
.
predefined_variables
).
to
include
(
{
key:
'KUBE_CA_PEM_FILE'
,
value:
'CA PEM DATA'
,
public:
true
,
file:
true
}
)
end
end
describe
'#terminals'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录