Merge branch 'ee-55544-port-upgrade-command' into 'master'

Port generic Helm upgrade functionality to CE

See merge request gitlab-org/gitlab-ee!8920

app/models/clusters/applications/prometheus.rb

@@ -5,7 +5,8 @@ module Clusters
     class Prometheus < ActiveRecord::Base
       include PrometheusAdapter
 
-      VERSION = '6.7.3'.freeze
+      VERSION = '6.7.3'
+      READY_STATUS = [:installed, :updating, :updated, :update_errored].freeze
 
       self.table_name = 'clusters_applications_prometheus'
 
@@ -24,12 +25,8 @@ module Clusters
         end
       end
 
-      def ready_status
-        [:installed]
-      end
-
       def ready?
-        ready_status.include?(status_name)
+        READY_STATUS.include?(status_name)
       end
 
       def chart
@@ -55,6 +52,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
 

app/models/clusters/concerns/application_status.rb

@@ -77,6 +77,10 @@ module Clusters
       def available?
         installed? || updated?
       end
+
+      def update_in_progress?
+        updating?
+      end
     end
   end
 end

app/services/clusters/applications/base_helm_service.rb

@@ -45,8 +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
-
-Clusters::Applications::BaseHelmService.prepend(EE::Clusters::Applications::BaseHelmService)

ee/app/models/ee/clusters/applications/prometheus.rb

@@ -21,42 +21,12 @@ module EE
           end
         end
 
-        def ready_status
-          super + [:updating, :updated, :update_errored]
-        end
-
         def updated_since?(timestamp)
           last_update_started_at &&
             last_update_started_at > timestamp &&
             !update_errored?
         end
 
-        def update_in_progress?
-          status_name == :updating
-        end
-
-        def update_errored?
-          status_name == :update_errored
-        end
-
-        def upgrade_command(values)
-          ::Gitlab::Kubernetes::Helm::UpgradeCommand.new(
-            name,
-            version: self.class.const_get(: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 generate_alert_manager_token!
           unless alert_manager_token.present?
             update!(alert_manager_token: generate_token)

ee/app/services/ee/clusters/applications/base_helm_service.rb

-# frozen_string_literal: true
-
-module EE
-  module Clusters
-    module Applications
-      module BaseHelmService
-        protected
-
-        def upgrade_command(new_values = "")
-          @upgrade_command ||= app.upgrade_command(new_values)
-        end
-      end
-    end
-  end
-end

ee/spec/models/ee/clusters/applications/prometheus_spec.rb

@@ -26,29 +26,6 @@ describe Clusters::Applications::Prometheus do
     end
   end
 
-  describe '#ready' do
-    let(:project) { create(:project) }
-    let(:cluster) { create(:cluster, projects: [project]) }
-
-    it 'returns true when updating' do
-      application = build(:clusters_applications_prometheus, :updating, cluster: cluster)
-
-      expect(application).to be_ready
-    end
-
-    it 'returns true when updated' do
-      application = build(:clusters_applications_prometheus, :updated, cluster: cluster)
-
-      expect(application).to be_ready
-    end
-
-    it 'returns true when errored' do
-      application = build(:clusters_applications_prometheus, :update_errored, cluster: cluster)
-
-      expect(application).to be_ready
-    end
-  end
-
   context '#updated_since?' do
     let(:cluster) { create(:cluster) }
     let(:prometheus_app) { build(:clusters_applications_prometheus, cluster: cluster) }
@@ -81,85 +58,6 @@ describe Clusters::Applications::Prometheus do
     end
   end
 
-  describe '#update_in_progress?' do
-    context 'when app is updating' do
-      it 'returns true' do
-        cluster = create(:cluster)
-        prometheus_app = build(:clusters_applications_prometheus, :updating, cluster: cluster)
-
-        expect(prometheus_app.update_in_progress?).to be true
-      end
-    end
-  end
-
-  describe '#update_errored?' do
-    context 'when app errored' do
-      it 'returns true' do
-        cluster = create(:cluster)
-        prometheus_app = build(:clusters_applications_prometheus, :update_errored, cluster: cluster)
-
-        expect(prometheus_app.update_errored?).to be true
-      end
-    end
-  end
-
-  describe '#upgrade_command' do
-    let(:prometheus) { build(:clusters_applications_prometheus) }
-    let(:values) { prometheus.values }
-
-    it 'returns an instance of Gitlab::Kubernetes::Helm::GetCommand' do
-      expect(prometheus.upgrade_command(values)).to be_an_instance_of(::Gitlab::Kubernetes::Helm::UpgradeCommand)
-    end
-
-    it 'should be initialized with 3 arguments' do
-      command = prometheus.upgrade_command(values)
-
-      expect(command.name).to eq('prometheus')
-      expect(command.chart).to eq('stable/prometheus')
-      expect(command.version).to eq('6.7.3')
-      expect(command.files).to eq(prometheus.files)
-    end
-  end
-
-  describe '#files_with_replaced_values' do
-    let(:application) { build(:clusters_applications_prometheus) }
-    let(:files) { application.files }
-
-    subject { application.files_with_replaced_values({ hello: :world }) }
-
-    it 'does not modify #files' do
-      expect(subject[:'values.yaml']).not_to eq(files)
-      expect(files[:'values.yaml']).to eq(application.values)
-    end
-
-    it 'returns values.yaml with replaced values' do
-      expect(subject[:'values.yaml']).to eq({ hello: :world })
-    end
-
-    it 'should include cert files' do
-      expect(subject[:'ca.pem']).to be_present
-      expect(subject[:'ca.pem']).to eq(application.cluster.application_helm.ca_cert)
-
-      expect(subject[:'cert.pem']).to be_present
-      expect(subject[:'key.pem']).to be_present
-
-      cert = OpenSSL::X509::Certificate.new(subject[:'cert.pem'])
-      expect(cert.not_after).to be < 60.minutes.from_now
-    end
-
-    context 'when the helm application does not have a ca_cert' do
-      before do
-        application.cluster.application_helm.ca_cert = nil
-      end
-
-      it 'should not include cert files' do
-        expect(subject[:'ca.pem']).not_to be_present
-        expect(subject[:'cert.pem']).not_to be_present
-        expect(subject[:'key.pem']).not_to be_present
-      end
-    end
-  end
-
   describe 'alert manager token' do
     subject { create(:clusters_applications_prometheus) }
 

spec/models/clusters/applications/prometheus_spec.rb

@@ -90,6 +90,24 @@ describe Clusters::Applications::Prometheus do
 
       expect(application).not_to be_ready
     end
+
+    it 'returns true when updating' do
+      application = build(:clusters_applications_prometheus, :updating, cluster: cluster)
+
+      expect(application).to be_ready
+    end
+
+    it 'returns true when updated' do
+      application = build(:clusters_applications_prometheus, :updated, cluster: cluster)
+
+      expect(application).to be_ready
+    end
+
+    it 'returns true when errored' do
+      application = build(:clusters_applications_prometheus, :update_errored, cluster: cluster)
+
+      expect(application).to be_ready
+    end
   end
 
   describe '#prometheus_client' do
@@ -197,6 +215,46 @@ describe Clusters::Applications::Prometheus do
     end
   end
 
+  describe '#upgrade_command' do
+    let(:prometheus) { build(:clusters_applications_prometheus) }
+    let(:values) { prometheus.values }
+
+    it 'returns an instance of Gitlab::Kubernetes::Helm::GetCommand' do
+      expect(prometheus.upgrade_command(values)).to be_an_instance_of(::Gitlab::Kubernetes::Helm::UpgradeCommand)
+    end
+
+    it 'should be initialized with 3 arguments' do
+      command = prometheus.upgrade_command(values)
+
+      expect(command.name).to eq('prometheus')
+      expect(command.chart).to eq('stable/prometheus')
+      expect(command.version).to eq('6.7.3')
+      expect(command.files).to eq(prometheus.files)
+    end
+  end
+
+  describe '#update_in_progress?' do
+    context 'when app is updating' do
+      it 'returns true' do
+        cluster = create(:cluster)
+        prometheus_app = build(:clusters_applications_prometheus, :updating, cluster: cluster)
+
+        expect(prometheus_app.update_in_progress?).to be true
+      end
+    end
+  end
+
+  describe '#update_errored?' do
+    context 'when app errored' do
+      it 'returns true' do
+        cluster = create(:cluster)
+        prometheus_app = build(:clusters_applications_prometheus, :update_errored, cluster: cluster)
+
+        expect(prometheus_app.update_errored?).to be true
+      end
+    end
+  end
+
   describe '#files' do
     let(:application) { create(:clusters_applications_prometheus) }
     let(:values) { subject[:'values.yaml'] }
@@ -211,4 +269,43 @@ describe Clusters::Applications::Prometheus do
       expect(values).to include('serverFiles')
     end
   end
+
+  describe '#files_with_replaced_values' do
+    let(:application) { build(:clusters_applications_prometheus) }
+    let(:files) { application.files }
+
+    subject { application.files_with_replaced_values({ hello: :world }) }
+
+    it 'does not modify #files' do
+      expect(subject[:'values.yaml']).not_to eq(files)
+      expect(files[:'values.yaml']).to eq(application.values)
+    end
+
+    it 'returns values.yaml with replaced values' do
+      expect(subject[:'values.yaml']).to eq({ hello: :world })
+    end
+
+    it 'should include cert files' do
+      expect(subject[:'ca.pem']).to be_present
+      expect(subject[:'ca.pem']).to eq(application.cluster.application_helm.ca_cert)
+
+      expect(subject[:'cert.pem']).to be_present
+      expect(subject[:'key.pem']).to be_present
+
+      cert = OpenSSL::X509::Certificate.new(subject[:'cert.pem'])
+      expect(cert.not_after).to be < 60.minutes.from_now
+    end
+
+    context 'when the helm application does not have a ca_cert' do
+      before do
+        application.cluster.application_helm.ca_cert = nil
+      end
+
+      it 'should not include cert files' do
+        expect(subject[:'ca.pem']).not_to be_present
+        expect(subject[:'cert.pem']).not_to be_present
+        expect(subject[:'key.pem']).not_to be_present
+      end
+    end
+  end
 end