Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
631ab898
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,发现更多精彩内容 >>
提交
631ab898
编写于
11月 13, 2018
作者:
A
Amit Rathi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use email on the account
上级
9d91d79c
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
25 addition
and
16 deletion
+25
-16
app/assets/javascripts/clusters/components/applications.vue
app/assets/javascripts/clusters/components/applications.vue
+0
-3
app/models/clusters/applications/cert_manager.rb
app/models/clusters/applications/cert_manager.rb
+15
-2
config/cert_manager/cluster_issuer.yaml
config/cert_manager/cluster_issuer.yaml
+2
-2
lib/gitlab/kubernetes/helm/install_command.rb
lib/gitlab/kubernetes/helm/install_command.rb
+5
-6
vendor/jupyter/values.yaml
vendor/jupyter/values.yaml
+3
-3
未找到文件。
app/assets/javascripts/clusters/components/applications.vue
浏览文件 @
631ab898
...
...
@@ -81,9 +81,6 @@ export default {
ingressInstalled
()
{
return
this
.
applications
.
ingress
.
status
===
APPLICATION_STATUS
.
INSTALLED
;
},
certManagerInstalled
()
{
return
this
.
applications
.
cert_manager
.
status
===
APPLICATION_STATUS
.
INSTALLED
;
},
ingressExternalIp
()
{
return
this
.
applications
.
ingress
.
externalIp
;
},
...
...
app/models/clusters/applications/cert_manager.rb
浏览文件 @
631ab898
...
...
@@ -33,10 +33,17 @@ module Clusters
rbac:
cluster
.
platform_kubernetes_rbac?
,
chart:
chart
,
files:
files
.
merge!
(
cluster_issuer_file
),
postinstall:
post_install_script
postinstall:
post_install_script
,
application_flags:
install_command_flags
)
end
def
install_command_flags
[
'--set'
,
'ingressShim.defaultIssuerName=letsencrypt-prod'
]
+
[
'--set'
,
'ingressShim.defaultIssuerKind=ClusterIssuer'
]
+
[
'--set'
,
'rbac.create=false'
]
end
private
def
post_install_script
...
...
@@ -45,10 +52,16 @@ module Clusters
def
cluster_issuer_file
{
'cluster_issuer.yaml'
:
File
.
read
(
cluster_issuer_file_path
)
'cluster_issuer.yaml'
:
cluster_issuer_yaml_content
}
end
def
cluster_issuer_yaml_content
data
=
YAML
.
load_file
(
cluster_issuer_file_path
)
data
[
"spec"
][
"acme"
][
"email"
]
=
self
.
email
YAML
.
dump
(
data
)
end
def
cluster_issuer_file_path
"
#{
Rails
.
root
}
/vendor/cert_manager/cluster_issuer.yaml"
end
...
...
config/cert_manager/cluster_issuer.yaml
浏览文件 @
631ab898
...
...
@@ -5,7 +5,7 @@ metadata:
spec
:
acme
:
server
:
https://acme-v02.api.letsencrypt.org/directory
email
:
hello@amirathi
.com
email
:
my-email@example
.com
privateKeySecretRef
:
name
:
letsencrypt-prod
http01
:
{}
\ No newline at end of file
http01
:
{}
lib/gitlab/kubernetes/helm/install_command.rb
浏览文件 @
631ab898
...
...
@@ -4,9 +4,9 @@ module Gitlab
class
InstallCommand
include
BaseCommand
attr_reader
:name
,
:files
,
:chart
,
:version
,
:repository
,
:preinstall
,
:postinstall
attr_reader
:name
,
:files
,
:chart
,
:version
,
:repository
,
:preinstall
,
:postinstall
,
:application_flags
def
initialize
(
name
:,
chart
:,
files
:,
rbac
:,
version:
nil
,
repository:
nil
,
preinstall:
nil
,
postinstall:
nil
)
def
initialize
(
name
:,
chart
:,
files
:,
rbac
:,
version:
nil
,
repository:
nil
,
preinstall:
nil
,
postinstall:
nil
,
application_flags:
[]
)
@name
=
name
@chart
=
chart
@version
=
version
...
...
@@ -15,6 +15,7 @@ module Gitlab
@repository
=
repository
@preinstall
=
preinstall
@postinstall
=
postinstall
@application_flags
=
application_flags
end
def
generate_script
...
...
@@ -64,16 +65,14 @@ module Gitlab
name_flag
=
[
'--name'
,
name
]
namespace_flag
=
[
'--namespace'
,
Gitlab
::
Kubernetes
::
Helm
::
NAMESPACE
]
value_flag
=
[
'-f'
,
"/data/helm/
#{
name
}
/config/values.yaml"
]
a
=
[
'--set'
,
'ingressShim.defaultIssuerName=letsencrypt-prod'
]
b
=
[
'--set'
,
'ingressShim.defaultIssuerKind=ClusterIssuer'
]
c
=
[
'--set'
,
'rbac.create=false'
]
name_flag
+
optional_tls_flags
+
optional_version_flag
+
optional_rbac_create_flag
+
namespace_flag
+
value_flag
+
a
+
b
+
c
value_flag
+
application_flags
end
def
optional_rbac_create_flag
...
...
vendor/jupyter/values.yaml
浏览文件 @
631ab898
...
...
@@ -19,6 +19,6 @@ singleuser:
command
:
[
"
sh"
,
"
-c"
,
"
git
clone
https://gitlab.com/gitlab-org/nurtch-demo.git
DevOps-Runbook-Demo
||
true"
]
ingress
:
enabled
:
true
annotations
:
kubernetes.io/ingress.class
:
"
nginx"
enabled
:
true
annotations
:
kubernetes.io/ingress.class
:
"
nginx"
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录