Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
6dda43d6
Commit
6dda43d6
authored
Nov 13, 2018
by
Amit Rathi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup
parent
27ce6140
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
39 deletions
+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
No files found.
app/assets/javascripts/clusters/components/applications.vue
View file @
6dda43d6
...
@@ -317,6 +317,7 @@ export default {
...
@@ -317,6 +317,7 @@ export default {
</application-row>
</application-row>
<application-row
<application-row
id=
"prometheus"
id=
"prometheus"
v-if=
"isProjectCluster"
:logo-url=
"prometheusLogo"
:logo-url=
"prometheusLogo"
:title=
"applications.prometheus.title"
:title=
"applications.prometheus.title"
:manage-link=
"managePrometheusPath"
:manage-link=
"managePrometheusPath"
...
...
app/models/clusters/applications/cert_manager.rb
View file @
6dda43d6
...
@@ -27,32 +27,14 @@ module Clusters
...
@@ -27,32 +27,14 @@ module Clusters
end
end
def
install_command
def
install_command
Gitlab
::
AppLogger
.
info
'----- INSTALLING CLUSTER ISSUER-v2 ----'
Gitlab
::
Kubernetes
::
Helm
::
InstallCommand
.
new
(
begin
name:
'certmanager'
,
Gitlab
::
Kubernetes
::
Helm
::
InstallCommand
.
new
(
version:
VERSION
,
name:
'certmanager'
,
rbac:
cluster
.
platform_kubernetes_rbac?
,
version:
VERSION
,
chart:
chart
,
rbac:
cluster
.
platform_kubernetes_rbac?
,
files:
files
.
merge!
(
cluster_issuer_file
),
chart:
chart
,
postinstall:
post_install_script
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'
))
end
end
private
private
...
...
app/services/clusters/applications/check_installation_progress_service.rb
View file @
6dda43d6
...
@@ -28,11 +28,9 @@ module Clusters
...
@@ -28,11 +28,9 @@ module Clusters
end
end
def
on_failed
def
on_failed
Gitlab
::
AppLogger
.
info
(
"Installation FAILED!!"
)
app
.
make_errored!
(
'Installation failed'
)
app
.
make_errored!
(
'Installation failed'
)
ensure
ensure
Gitlab
::
AppLogger
.
info
(
"SKIP CLEARING POD!"
)
remove_installation_pod
# remove_installation_pod
end
end
def
check_timeout
def
check_timeout
...
...
app/services/clusters/applications/install_service.rb
View file @
6dda43d6
...
@@ -4,11 +4,9 @@ module Clusters
...
@@ -4,11 +4,9 @@ module Clusters
module
Applications
module
Applications
class
InstallService
<
BaseHelmService
class
InstallService
<
BaseHelmService
def
execute
def
execute
Gitlab
::
AppLogger
.
info
(
'---- IN execute installing ----'
)
return
unless
app
.
scheduled?
return
unless
app
.
scheduled?
begin
begin
app
.
make_installing!
app
.
make_installing!
helm_api
.
install
(
install_command
)
helm_api
.
install
(
install_command
)
...
...
app/workers/cluster_install_app_worker.rb
View file @
6dda43d6
...
@@ -7,7 +7,6 @@ class ClusterInstallAppWorker
...
@@ -7,7 +7,6 @@ class ClusterInstallAppWorker
def
perform
(
app_name
,
app_id
)
def
perform
(
app_name
,
app_id
)
find_application
(
app_name
,
app_id
)
do
|
app
|
find_application
(
app_name
,
app_id
)
do
|
app
|
Clusters
::
Applications
::
InstallService
.
new
(
app
).
execute
Clusters
::
Applications
::
InstallService
.
new
(
app
).
execute
end
end
end
end
...
...
db/migrate/20181101191341_create_clusters_applications_cert_manager.rb
View file @
6dda43d6
# frozen_string_literal: true
# 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
class
CreateClustersApplicationsCertManager
<
ActiveRecord
::
Migration
include
Gitlab
::
Database
::
MigrationHelpers
include
Gitlab
::
Database
::
MigrationHelpers
# Set this constant to true if this migration requires downtime.
DOWNTIME
=
false
DOWNTIME
=
false
def
change
def
change
...
...
lib/gitlab/kubernetes/helm/api.rb
View file @
6dda43d6
...
@@ -9,8 +9,6 @@ module Gitlab
...
@@ -9,8 +9,6 @@ module Gitlab
def
install
(
command
)
def
install
(
command
)
begin
begin
Gitlab
::
AppLogger
.
info
(
"---INSTALLING---------"
)
Gitlab
::
AppLogger
.
info
(
command
)
namespace
.
ensure_exists!
namespace
.
ensure_exists!
create_service_account
(
command
)
create_service_account
(
command
)
...
...
vendor/cert_manager/cluster_issuer.yaml
View file @
6dda43d6
...
@@ -8,4 +8,4 @@ spec:
...
@@ -8,4 +8,4 @@ spec:
email
:
my-email@example.com
email
:
my-email@example.com
privateKeySecretRef
:
privateKeySecretRef
:
name
:
letsencrypt-prod
name
:
letsencrypt-prod
http01
:
{}
http01
:
{}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment