1 files changed, 20 insertions, 14 deletions
diff --git a/app/services/clusters/applications/upgrade_service.rb b/app/services/clusters/applications/upgrade_service.rb
index a0ece1d2635..ac68e64af38 100644
--- a/app/services/clusters/applications/upgrade_service.rb
+++ b/app/services/clusters/applications/upgrade_service.rb
@@ -6,22 +6,28 @@ module Clusters
       def execute
         return unless app.scheduled?
 
-        begin
-          app.make_updating!
+        app.make_updating!
 
-          # install_command works with upgrades too
-          # as it basically does `helm upgrade --install`
-          helm_api.update(install_command)
+        upgrade
+      end
+
+      private
+
+      def upgrade
+        # install_command works with upgrades too
+        # as it basically does `helm upgrade --install`
+        log_event(:begin_upgrade)
+        helm_api.update(install_command)
 
-          ClusterWaitForAppInstallationWorker.perform_in(
-            ClusterWaitForAppInstallationWorker::INTERVAL, app.name, app.id)
-        rescue Kubeclient::HttpError => e
-          log_error(e)
-          app.make_update_errored!("Kubernetes error: #{e.error_code}")
-        rescue StandardError => e
-          log_error(e)
-          app.make_update_errored!("Can't start upgrade process.")
-        end
+        log_event(:schedule_wait_for_upgrade)
+        ClusterWaitForAppInstallationWorker.perform_in(
+          ClusterWaitForAppInstallationWorker::INTERVAL, app.name, app.id)
+      rescue Kubeclient::HttpError => e
+        log_error(e)
+        app.make_errored!(_('Kubernetes error: %{error_code}') % { error_code: e.error_code })
+      rescue StandardError => e
+        log_error(e)
+        app.make_errored!(_('Failed to upgrade.'))
       end
     end
   end