General cleanup

3 files changed, 1 insertions, 26 deletions

diff --git a/app/services/clusters/base_helm_service.rb b/app/services/clusters/base_helm_service.rb
index c7f7e2d0877..dd717a0bb58 100644
--- a/app/services/clusters/base_helm_service.rb
+++ b/app/services/clusters/base_helm_service.rb
@@ -17,7 +17,7 @@ module Clusters
     end
 
     def helm_api
-      @helm ||= Gitlab::Clusters::Helm.new(kubeclient)
+      @helm ||= Gitlab::Kubernetes::Helm.new(kubeclient)
     end
   end
 end
diff --git a/app/services/clusters/install_app_service.rb b/app/services/clusters/install_app_service.rb
index 496af2495fd..a72cfa0a17f 100644
--- a/app/services/clusters/install_app_service.rb
+++ b/app/services/clusters/install_app_service.rb
@@ -15,7 +15,6 @@ module Clusters
       rescue KubeException => ke
         app.make_errored!("Kubernetes error: #{ke.message}")
       rescue StandardError => e
-        Rails.logger.warn(e.message)
         app.make_errored!("Can't start installation process")
       end
     end
diff --git a/app/services/clusters/install_tiller_service.rb b/app/services/clusters/install_tiller_service.rb
deleted file mode 100644
index ac77a7ea3c2..00000000000
--- a/app/services/clusters/install_tiller_service.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-module Clusters
-  class InstallTillerService < BaseService
-    def execute
-      ensure_namespace
-      install
-    end
-
-    private
-
-    def kubernetes_service
-      return @kubernetes_service if defined?(@kubernetes_service)
-
-      @kubernetes_service = project&.kubernetes_service
-    end
-
-    def ensure_namespace
-      kubernetes_service&.ensure_namespace!
-    end
-
-    def install
-      kubernetes_service&.helm_client&.init!
-    end
-  end
-end