Upgrade Helm to 7.3.2 and Prometheus to 2.4.3pl-upgrade-helm-prometheus

6 files changed, 14 insertions, 7 deletions

diff --git a/app/models/clusters/applications/prometheus.rb b/app/models/clusters/applications/prometheus.rb
index 46d0388a464..38ca0a59c2a 100644
--- a/app/models/clusters/applications/prometheus.rb
+++ b/app/models/clusters/applications/prometheus.rb
@@ -5,7 +5,7 @@ module Clusters
     class Prometheus < ActiveRecord::Base
       include PrometheusAdapter
 
-      VERSION = '6.7.3'.freeze
+      VERSION = '7.3.2'.freeze
 
       self.table_name = 'clusters_applications_prometheus'
 
diff --git a/changelogs/unreleased/pl-upgrade-helm-prometheus.yml b/changelogs/unreleased/pl-upgrade-helm-prometheus.yml
new file mode 100644
index 00000000000..5c0ed6ec975
--- /dev/null
+++ b/changelogs/unreleased/pl-upgrade-helm-prometheus.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade Helm to 7.3.2 and Prometheus to 2.4.3
+merge_request: 22556
+author:
+type: changed
diff --git a/lib/gitlab/kubernetes/helm.rb b/lib/gitlab/kubernetes/helm.rb
index 4a1bdf34c3e..a53c2c9e5cb 100644
--- a/lib/gitlab/kubernetes/helm.rb
+++ b/lib/gitlab/kubernetes/helm.rb
@@ -1,7 +1,7 @@
 module Gitlab
   module Kubernetes
     module Helm
-      HELM_VERSION = '2.7.2'.freeze
+      HELM_VERSION = '2.11.0'.freeze
       NAMESPACE = 'gitlab-managed-apps'.freeze
       SERVICE_ACCOUNT = 'tiller'.freeze
       CLUSTER_ROLE_BINDING = 'tiller-admin'.freeze
diff --git a/spec/models/clusters/applications/prometheus_spec.rb b/spec/models/clusters/applications/prometheus_spec.rb
index f9776acd4c8..bf33fef7604 100644
--- a/spec/models/clusters/applications/prometheus_spec.rb
+++ b/spec/models/clusters/applications/prometheus_spec.rb
@@ -3,6 +3,8 @@ require 'rails_helper'
 describe Clusters::Applications::Prometheus do
   include KubernetesHelpers
 
+  let(:prometheus_helm_version) { '7.3.2' }
+
   include_examples 'cluster application core specs', :clusters_applications_prometheus
   include_examples 'cluster application status specs', :clusters_applications_prometheus
 
@@ -27,7 +29,7 @@ describe Clusters::Applications::Prometheus do
       let(:application) { create(:clusters_applications_prometheus, :scheduled, version: '6.7.2') }
 
       it 'updates the application version' do
-        expect(application.reload.version).to eq('6.7.3')
+        expect(application.reload.version).to eq(prometheus_helm_version)
       end
     end
   end
@@ -153,7 +155,7 @@ describe Clusters::Applications::Prometheus do
     it 'should be initialized with 3 arguments' do
       expect(subject.name).to eq('prometheus')
       expect(subject.chart).to eq('stable/prometheus')
-      expect(subject.version).to eq('6.7.3')
+      expect(subject.version).to eq(prometheus_helm_version)
       expect(subject).not_to be_rbac
       expect(subject.files).to eq(prometheus.files)
     end
@@ -170,7 +172,7 @@ describe Clusters::Applications::Prometheus do
       let(:prometheus) { create(:clusters_applications_prometheus, :errored, version: '2.0.0') }
 
       it 'should be initialized with the locked version' do
-        expect(subject.version).to eq('6.7.3')
+        expect(subject.version).to eq(prometheus_helm_version)
       end
     end
   end
diff --git a/spec/support/shared_examples/helm_generated_script.rb b/spec/support/shared_examples/helm_generated_script.rb
index ef9bb7f5533..933d84255fc 100644
--- a/spec/support/shared_examples/helm_generated_script.rb
+++ b/spec/support/shared_examples/helm_generated_script.rb
@@ -7,7 +7,7 @@ shared_examples 'helm commands' do
          echo http://mirror.clarkson.edu/alpine/v$ALPINE_VERSION/main >> /etc/apk/repositories
          echo http://mirror1.hs-esslingen.de/pub/Mirrors/alpine/v$ALPINE_VERSION/main >> /etc/apk/repositories
          apk add -U wget ca-certificates openssl >/dev/null
-         wget -q -O - https://kubernetes-helm.storage.googleapis.com/helm-v2.7.2-linux-amd64.tar.gz | tar zxC /tmp >/dev/null
+         wget -q -O - https://kubernetes-helm.storage.googleapis.com/helm-v2.11.0-linux-amd64.tar.gz | tar zxC /tmp >/dev/null
          mv /tmp/linux-amd64/helm /usr/bin/
       EOS
     end
diff --git a/vendor/prometheus/values.yaml b/vendor/prometheus/values.yaml
index c432be72163..3b544d3acaa 100644
--- a/vendor/prometheus/values.yaml
+++ b/vendor/prometheus/values.yaml
@@ -16,7 +16,7 @@ rbac:
 server:
   fullnameOverride: "prometheus-prometheus-server"
   image:
-    tag: v2.1.0
+    tag: v2.4.3
 
 serverFiles:
   alerts: {}