Pushing WIP state for backup

2 files changed, 25 insertions, 8 deletions

diff --git a/lib/gitlab/kubernetes/helm/api.rb b/lib/gitlab/kubernetes/helm/api.rb
index e21bc531444..63f3d863c61 100644
--- a/lib/gitlab/kubernetes/helm/api.rb
+++ b/lib/gitlab/kubernetes/helm/api.rb
@@ -8,13 +8,26 @@ module Gitlab
         end
 
         def install(command)
-          namespace.ensure_exists!
-
-          create_service_account(command)
-          create_cluster_role_binding(command)
-          create_config_map(command)
-
-          kubeclient.create_pod(command.pod_resource)
+          begin
+            namespace.ensure_exists!
+
+            create_service_account(command)
+            create_cluster_role_binding(command)
+            Gitlab::AppLogger.info("---CREATING CONFIG MAP-----")
+            Gitlab::AppLogger.info(command)
+            create_config_map(command)
+            Gitlab::AppLogger.info("---CREATING K8s POD-----")
+
+            kubeclient.create_pod(command.pod_resource)
+          rescue StandardError => e
+            Gitlab::AppLogger.info('install_api_error------------------------------------------------')
+            Gitlab::AppLogger.error(e)
+            Gitlab::AppLogger.error(e.backtrace.join("\n"))
+          rescue Exception => e
+            Gitlab::AppLogger.info('install_api_exception--------------------------------------------------')
+            Gitlab::AppLogger.error(e)
+            Gitlab::AppLogger.error(e.backtrace.join("\n"))
+          end  
         end
 
         def update(command)
@@ -54,6 +67,7 @@ module Gitlab
 
         def create_config_map(command)
           command.config_map_resource.tap do |config_map_resource|
+            Gitlab::AppLogger.info(config_map_resource)
             kubeclient.create_config_map(config_map_resource)
           end
         end
diff --git a/lib/gitlab/kubernetes/helm/install_command.rb b/lib/gitlab/kubernetes/helm/install_command.rb
index 1be7924d6ac..fb8d61bc5db 100644
--- a/lib/gitlab/kubernetes/helm/install_command.rb
+++ b/lib/gitlab/kubernetes/helm/install_command.rb
@@ -47,13 +47,16 @@ 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
+            value_flag + a + b + c
         end
 
         def optional_rbac_create_flag