From 8296ff580c2bb1b2a9ee07193f79f66fd6444de0 Mon Sep 17 00:00:00 2001
From: Thong Kuah <tkuah@gitlab.com>
Date: Wed, 19 Dec 2018 21:50:12 +1300
Subject: Port generic upgrade functionality to CE

Port from EE generic upgrade related functionality used to upgrade Helm
applications

Remove memoization which could be incorrect

It looks like we are memoizing without regard to the method's argument
so this could result in an incorrect upgrade_command

Remove `const_get` indirection now we are no longer in EE
---
 app/models/clusters/applications/prometheus.rb     | 28 +++++++++++++++++++++-
 .../clusters/applications/base_helm_service.rb     |  4 ++++
 2 files changed, 31 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/models/clusters/applications/prometheus.rb b/app/models/clusters/applications/prometheus.rb
index e25be522d68..7a97760536a 100644
--- a/app/models/clusters/applications/prometheus.rb
+++ b/app/models/clusters/applications/prometheus.rb
@@ -25,13 +25,21 @@ module Clusters
       end
 
       def ready_status
-        [:installed]
+        [:installed, :updating, :updated, :update_errored]
       end
 
       def ready?
         ready_status.include?(status_name)
       end
 
+      def update_in_progress?
+        status_name == :updating
+      end
+
+      def update_errored?
+        status_name == :update_errored
+      end
+
       def chart
         'stable/prometheus'
       end
@@ -55,6 +63,24 @@ module Clusters
         )
       end
 
+      def upgrade_command(values)
+        ::Gitlab::Kubernetes::Helm::UpgradeCommand.new(
+          name,
+          version: VERSION,
+          chart: chart,
+          rbac: cluster.platform_kubernetes_rbac?,
+          files: files_with_replaced_values(values)
+        )
+      end
+
+      # Returns a copy of files where the values of 'values.yaml'
+      # are replaced by the argument.
+      #
+      # See #values for the data format required
+      def files_with_replaced_values(replaced_values)
+        files.merge('values.yaml': replaced_values)
+      end
+
       def prometheus_client
         return unless kube_client
 
diff --git a/app/services/clusters/applications/base_helm_service.rb b/app/services/clusters/applications/base_helm_service.rb
index e86ca8cf1d0..8a71730d5ec 100644
--- a/app/services/clusters/applications/base_helm_service.rb
+++ b/app/services/clusters/applications/base_helm_service.rb
@@ -45,6 +45,10 @@ module Clusters
       def install_command
         @install_command ||= app.install_command
       end
+
+      def upgrade_command(new_values = "")
+        app.upgrade_command(new_values)
+      end
     end
   end
 end
-- 
cgit v1.2.1