Commit 6dda43d6 authored by Amit Rathi's avatar Amit Rathi

Cleanup

parent 27ce6140
......@@ -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"
......
......@@ -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
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
# 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
......
......@@ -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)
......
......@@ -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% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment