Resolve "Unable to install Prometheus on Clusters: 'Error: Chart incompatible with Tiller v2.7.0'"

2 files changed, 40 insertions, 30 deletions

diff --git a/spec/lib/gitlab/kubernetes/helm/api_spec.rb b/spec/lib/gitlab/kubernetes/helm/api_spec.rb
index 740466ea5cb..aa7e43dfb16 100644
--- a/spec/lib/gitlab/kubernetes/helm/api_spec.rb
+++ b/spec/lib/gitlab/kubernetes/helm/api_spec.rb
@@ -7,13 +7,7 @@ describe Gitlab::Kubernetes::Helm::Api do
   let(:namespace) { Gitlab::Kubernetes::Namespace.new(gitlab_namespace, client) }
   let(:application) { create(:clusters_applications_prometheus) }
 
-  let(:command) do
-    Gitlab::Kubernetes::Helm::InstallCommand.new(
-      application.name,
-      chart: application.chart,
-      values: application.values
-    )
-  end
+  let(:command) { application.install_command }
 
   subject { helm }
 
diff --git a/spec/lib/gitlab/kubernetes/helm/install_command_spec.rb b/spec/lib/gitlab/kubernetes/helm/install_command_spec.rb
index 547f3f1752c..25c6fa3b9a3 100644
--- a/spec/lib/gitlab/kubernetes/helm/install_command_spec.rb
+++ b/spec/lib/gitlab/kubernetes/helm/install_command_spec.rb
@@ -3,44 +3,60 @@ require 'rails_helper'
 describe Gitlab::Kubernetes::Helm::InstallCommand do
   let(:application) { create(:clusters_applications_prometheus) }
   let(:namespace) { Gitlab::Kubernetes::Helm::NAMESPACE }
-
-  let(:install_command) do
-    described_class.new(
-      application.name,
-      chart: application.chart,
-      values: application.values
-    )
-  end
+  let(:install_command) { application.install_command }
 
   subject { install_command }
 
-  it_behaves_like 'helm commands' do
-    let(:commands) do
-      <<~EOS
+  context 'for ingress' do
+    let(:application) { create(:clusters_applications_ingress) }
+
+    it_behaves_like 'helm commands' do
+      let(:commands) do
+        <<~EOS
          helm init --client-only >/dev/null
          helm install #{application.chart} --name #{application.name} --namespace #{namespace} -f /data/helm/#{application.name}/config/values.yaml >/dev/null
-      EOS
+        EOS
+      end
+    end
+  end
+
+  context 'for prometheus' do
+    let(:application) { create(:clusters_applications_prometheus) }
+
+    it_behaves_like 'helm commands' do
+      let(:commands) do
+        <<~EOS
+         helm init --client-only >/dev/null
+         helm install #{application.chart} --name #{application.name} --version #{application.version} --namespace #{namespace} -f /data/helm/#{application.name}/config/values.yaml >/dev/null
+        EOS
+      end
     end
   end
 
-  context 'with an application with a repository' do
+  context 'for runner' do
     let(:ci_runner) { create(:ci_runner) }
     let(:application) { create(:clusters_applications_runner, runner: ci_runner) }
-    let(:install_command) do
-      described_class.new(
-        application.name,
-        chart: application.chart,
-        values: application.values,
-        repository: application.repository
-      )
+
+    it_behaves_like 'helm commands' do
+      let(:commands) do
+        <<~EOS
+         helm init --client-only >/dev/null
+         helm repo add #{application.name} #{application.repository}
+         helm install #{application.chart} --name #{application.name} --namespace #{namespace} -f /data/helm/#{application.name}/config/values.yaml >/dev/null
+        EOS
+      end
     end
+  end
+
+  context 'for jupyter' do
+    let(:application) { create(:clusters_applications_jupyter) }
 
     it_behaves_like 'helm commands' do
       let(:commands) do
         <<~EOS
-           helm init --client-only >/dev/null
-           helm repo add #{application.name} #{application.repository}
-           helm install #{application.chart} --name #{application.name} --namespace #{namespace} -f /data/helm/#{application.name}/config/values.yaml >/dev/null
+         helm init --client-only >/dev/null
+         helm repo add #{application.name} #{application.repository}
+         helm install #{application.chart} --name #{application.name} --namespace #{namespace} -f /data/helm/#{application.name}/config/values.yaml >/dev/null
         EOS
       end
     end