From 61ca90e0b462bfe69e0b400dfe403bd95281b90f Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 13 Oct 2022 09:37:59 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .../clusters/applications/destroy_service.rb       | 23 -----------------
 .../clusters/applications/uninstall_service.rb     | 29 ----------------------
 2 files changed, 52 deletions(-)
 delete mode 100644 app/services/clusters/applications/destroy_service.rb
 delete mode 100644 app/services/clusters/applications/uninstall_service.rb

(limited to 'app/services/clusters')

diff --git a/app/services/clusters/applications/destroy_service.rb b/app/services/clusters/applications/destroy_service.rb
deleted file mode 100644
index d666682487b..00000000000
--- a/app/services/clusters/applications/destroy_service.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Clusters
-  module Applications
-    class DestroyService < ::Clusters::Applications::BaseService
-      def execute(_request)
-        instantiate_application.tap do |application|
-          break unless application.can_uninstall?
-
-          application.make_scheduled!
-
-          Clusters::Applications::UninstallWorker.perform_async(application.name, application.id)
-        end
-      end
-
-      private
-
-      def builder
-        cluster.public_send(application_class.association_name) # rubocop:disable GitlabSecurity/PublicSend
-      end
-    end
-  end
-end
diff --git a/app/services/clusters/applications/uninstall_service.rb b/app/services/clusters/applications/uninstall_service.rb
deleted file mode 100644
index 50c8d806c14..00000000000
--- a/app/services/clusters/applications/uninstall_service.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Clusters
-  module Applications
-    class UninstallService < BaseHelmService
-      def execute
-        return unless app.scheduled?
-
-        app.make_uninstalling!
-        uninstall
-      end
-
-      private
-
-      def uninstall
-        helm_api.uninstall(app.uninstall_command)
-
-        Clusters::Applications::WaitForUninstallAppWorker.perform_in(
-          Clusters::Applications::WaitForUninstallAppWorker::INTERVAL, app.name, app.id)
-      rescue Kubeclient::HttpError => e
-        log_error(e)
-        app.make_errored!("Kubernetes error: #{e.error_code}")
-      rescue StandardError => e
-        log_error(e)
-        app.make_errored!('Failed to uninstall.')
-      end
-    end
-  end
-end
-- 
cgit v1.2.1