1 files changed, 65 insertions, 7 deletions
diff --git a/app/workers/cluster_wait_for_app_installation_worker.rb b/app/workers/cluster_wait_for_app_installation_worker.rb
index e8d7e52f70f..03d83008a6e 100644
--- a/app/workers/cluster_wait_for_app_installation_worker.rb
+++ b/app/workers/cluster_wait_for_app_installation_worker.rb
@@ -1,16 +1,74 @@
 # frozen_string_literal: true
 
-class ClusterWaitForAppInstallationWorker
-  include ApplicationWorker
-  include ClusterQueue
-  include ClusterApplications
-
+class ClusterWaitForAppInstallationWorker < ClusterApplicationBaseWorker
   INTERVAL = 10.seconds
   TIMEOUT = 20.minutes
 
   def perform(app_name, app_id)
-    find_application(app_name, app_id) do |app|
-      Clusters::Applications::CheckInstallationProgressService.new(app).execute
+    super
+    execute
+  end
+
+  def execute
+    return unless operation_in_progress?
+
+    case installation_phase
+    when Gitlab::Kubernetes::Pod::SUCCEEDED
+      on_success
+    when Gitlab::Kubernetes::Pod::FAILED
+      on_failed
+    else
+      check_timeout
     end
+  rescue Kubeclient::HttpError => e
+    log_error(e)
+
+    app.make_errored!("Kubernetes error: #{e.error_code}")
+  end
+
+  private
+
+  def operation_in_progress?
+    app.installing? || app.updating?
+  end
+
+  def on_success
+    app.make_installed!
+  ensure
+    remove_installation_pod
+  end
+
+  def on_failed
+    app.make_errored!("Operation failed. Check pod logs for #{pod_name} for more details.")
+  end
+
+  def check_timeout
+    if timeouted?
+      begin
+        app.make_errored!("Operation timed out. Check pod logs for #{pod_name} for more details.")
+      end
+    else
+      ClusterWaitForAppInstallationWorker.perform_in(INTERVAL, app.name, app.id)
+    end
+  end
+
+  def pod_name
+    install_command.pod_name
+  end
+
+  def timeouted?
+    Time.now.utc - app.updated_at.to_time.utc > TIMEOUT
+  end
+
+  def remove_installation_pod
+    helm_api.delete_pod!(pod_name)
+  end
+
+  def installation_phase
+    helm_api.status(pod_name)
+  end
+
+  def installation_errors
+    helm_api.log(pod_name)
   end
 end