3 files changed, 17 insertions, 6 deletions
diff --git a/app/models/clusters/applications/prometheus.rb b/app/models/clusters/applications/prometheus.rb
index 26bf73f4dd8..52c440ffb2f 100644
--- a/app/models/clusters/applications/prometheus.rb
+++ b/app/models/clusters/applications/prometheus.rb
@@ -53,11 +53,11 @@ module Clusters
       end
 
       def upgrade_command(values)
-        ::Gitlab::Kubernetes::Helm::UpgradeCommand.new(
-          name,
+        ::Gitlab::Kubernetes::Helm::InstallCommand.new(
+          name: name,
           version: VERSION,
-          chart: chart,
           rbac: cluster.platform_kubernetes_rbac?,
+          chart: chart,
           files: files_with_replaced_values(values)
         )
       end
diff --git a/app/models/clusters/concerns/application_status.rb b/app/models/clusters/concerns/application_status.rb
index a556dd5ad8b..6fe7b4a6bd7 100644
--- a/app/models/clusters/concerns/application_status.rb
+++ b/app/models/clusters/concerns/application_status.rb
@@ -20,7 +20,7 @@ module Clusters
           state :update_errored, value: 6
 
           event :make_scheduled do
-            transition [:installable, :errored] => :scheduled
+            transition [:installable, :errored, :installed, :updated, :update_errored] => :scheduled
           end
 
           event :make_installing do
@@ -29,16 +29,19 @@ module Clusters
 
           event :make_installed do
             transition [:installing] => :installed
+            transition [:updating] => :updated
           end
 
           event :make_errored do
-            transition any => :errored
+            transition any - [:updating] => :errored
+            transition [:updating] => :update_errored
           end
 
           event :make_updating do
-            transition [:installed, :updated, :update_errored] => :updating
+            transition [:installed, :updated, :update_errored, :scheduled] => :updating
           end
 
+          # Deprecated
           event :make_updated do
             transition [:updating] => :updated
           end
@@ -74,6 +77,10 @@ module Clusters
         end
       end
 
+      def updateable?
+        installed? || updated? || update_errored?
+      end
+
       def available?
         installed? || updated?
       end
diff --git a/app/models/clusters/concerns/application_version.rb b/app/models/clusters/concerns/application_version.rb
index e355de23df6..db94e8e08c9 100644
--- a/app/models/clusters/concerns/application_version.rb
+++ b/app/models/clusters/concerns/application_version.rb
@@ -12,6 +12,10 @@ module Clusters
           end
         end
       end
+
+      def update_available?
+        version != self.class.const_get(:VERSION)
+      end
     end
   end
 end