Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6dda43d6
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,发现更多精彩内容 >>
提交
6dda43d6
编写于
11月 13, 2018
作者:
A
Amit Rathi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Cleanup
上级
27ce6140
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
11 addition
and
39 deletion
+11
-39
app/assets/javascripts/clusters/components/applications.vue
app/assets/javascripts/clusters/components/applications.vue
+1
-0
app/models/clusters/applications/cert_manager.rb
app/models/clusters/applications/cert_manager.rb
+8
-26
app/services/clusters/applications/check_installation_progress_service.rb
...sters/applications/check_installation_progress_service.rb
+1
-3
app/services/clusters/applications/install_service.rb
app/services/clusters/applications/install_service.rb
+0
-2
app/workers/cluster_install_app_worker.rb
app/workers/cluster_install_app_worker.rb
+0
-1
db/migrate/20181101191341_create_clusters_applications_cert_manager.rb
...181101191341_create_clusters_applications_cert_manager.rb
+0
-4
lib/gitlab/kubernetes/helm/api.rb
lib/gitlab/kubernetes/helm/api.rb
+0
-2
vendor/cert_manager/cluster_issuer.yaml
vendor/cert_manager/cluster_issuer.yaml
+1
-1
未找到文件。
app/assets/javascripts/clusters/components/applications.vue
浏览文件 @
6dda43d6
...
...
@@ -317,6 +317,7 @@ export default {
</application-row>
<application-row
id=
"prometheus"
v-if=
"isProjectCluster"
:logo-url=
"prometheusLogo"
:title=
"applications.prometheus.title"
:manage-link=
"managePrometheusPath"
...
...
app/models/clusters/applications/cert_manager.rb
浏览文件 @
6dda43d6
...
...
@@ -27,32 +27,14 @@ module Clusters
end
def
install_command
Gitlab
::
AppLogger
.
info
'----- INSTALLING CLUSTER ISSUER-v2 ----'
begin
Gitlab
::
Kubernetes
::
Helm
::
InstallCommand
.
new
(
name:
'certmanager'
,
version:
VERSION
,
rbac:
cluster
.
platform_kubernetes_rbac?
,
chart:
chart
,
files:
files
.
merge!
(
cluster_issuer_file
),
postinstall:
post_install_script
)
#res = YAML.load_file(Rails.root.join('config', 'cert_manager', 'cluster_issuer.yaml'))
#Gitlab::AppLogger.info(res)
#Gitlab::Kubernetes::ClusterIssuer(res).generate()
rescue
StandardError
=>
e
Gitlab
::
AppLogger
.
info
(
'install_command_eror------------------------------------------------'
)
Gitlab
::
AppLogger
.
error
(
e
)
Gitlab
::
AppLogger
.
error
(
e
.
backtrace
.
join
(
"
\n
"
))
rescue
Exception
=>
e
Gitlab
::
AppLogger
.
info
(
'install_command_exception--------------------------------------------------'
)
Gitlab
::
AppLogger
.
error
(
e
)
Gitlab
::
AppLogger
.
error
(
e
.
backtrace
.
join
(
"
\n
"
))
end
end
def
cluster_issuer_resource_definition
YAML
.
load_file
(
Rails
.
root
.
join
(
'config'
,
'cert_manager'
,
'cluster_issuer.yaml'
))
Gitlab
::
Kubernetes
::
Helm
::
InstallCommand
.
new
(
name:
'certmanager'
,
version:
VERSION
,
rbac:
cluster
.
platform_kubernetes_rbac?
,
chart:
chart
,
files:
files
.
merge!
(
cluster_issuer_file
),
postinstall:
post_install_script
)
end
private
...
...
app/services/clusters/applications/check_installation_progress_service.rb
浏览文件 @
6dda43d6
...
...
@@ -28,11 +28,9 @@ module Clusters
end
def
on_failed
Gitlab
::
AppLogger
.
info
(
"Installation FAILED!!"
)
app
.
make_errored!
(
'Installation failed'
)
ensure
Gitlab
::
AppLogger
.
info
(
"SKIP CLEARING POD!"
)
# remove_installation_pod
remove_installation_pod
end
def
check_timeout
...
...
app/services/clusters/applications/install_service.rb
浏览文件 @
6dda43d6
...
...
@@ -4,11 +4,9 @@ module Clusters
module
Applications
class
InstallService
<
BaseHelmService
def
execute
Gitlab
::
AppLogger
.
info
(
'---- IN execute installing ----'
)
return
unless
app
.
scheduled?
begin
app
.
make_installing!
helm_api
.
install
(
install_command
)
...
...
app/workers/cluster_install_app_worker.rb
浏览文件 @
6dda43d6
...
...
@@ -7,7 +7,6 @@ class ClusterInstallAppWorker
def
perform
(
app_name
,
app_id
)
find_application
(
app_name
,
app_id
)
do
|
app
|
Clusters
::
Applications
::
InstallService
.
new
(
app
).
execute
end
end
...
...
db/migrate/20181101191341_create_clusters_applications_cert_manager.rb
浏览文件 @
6dda43d6
# frozen_string_literal: true
# See http://doc.gitlab.com/ce/development/migration_style_guide.html
# for more information on how to write migrations for GitLab.
class
CreateClustersApplicationsCertManager
<
ActiveRecord
::
Migration
include
Gitlab
::
Database
::
MigrationHelpers
# Set this constant to true if this migration requires downtime.
DOWNTIME
=
false
def
change
...
...
lib/gitlab/kubernetes/helm/api.rb
浏览文件 @
6dda43d6
...
...
@@ -9,8 +9,6 @@ module Gitlab
def
install
(
command
)
begin
Gitlab
::
AppLogger
.
info
(
"---INSTALLING---------"
)
Gitlab
::
AppLogger
.
info
(
command
)
namespace
.
ensure_exists!
create_service_account
(
command
)
...
...
vendor/cert_manager/cluster_issuer.yaml
浏览文件 @
6dda43d6
...
...
@@ -8,4 +8,4 @@ spec:
email
:
my-email@example.com
privateKeySecretRef
:
name
:
letsencrypt-prod
http01
:
{}
\ No newline at end of file
http01
:
{}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录