From ff115418ce874a05a93ccf18568f8cf8247aeed2 Mon Sep 17 00:00:00 2001 From: Dylan Griffith Date: Wed, 4 Jul 2018 17:05:37 +0200 Subject: Lock prometheus version independent of data in the database Because as we discovered in #6795 the prometheus install may have failed in the past and we therefore have an old version when trying to install. In future we'd like to address this in a better way by [handling upgrades](https://gitlab.com/gitlab-org/gitlab-ee/issues/6817) of prometheus versions but before then we need to [clean the data and correctly use this `version` column from the DB](https://gitlab.com/gitlab-org/gitlab-ee/issues/6816) --- app/models/clusters/applications/prometheus.rb | 2 +- changelogs/unreleased/6795-fix-prometheus-install.yml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/6795-fix-prometheus-install.yml diff --git a/app/models/clusters/applications/prometheus.rb b/app/models/clusters/applications/prometheus.rb index 48137c2ed68..4c00b139141 100644 --- a/app/models/clusters/applications/prometheus.rb +++ b/app/models/clusters/applications/prometheus.rb @@ -37,7 +37,7 @@ module Clusters Gitlab::Kubernetes::Helm::InstallCommand.new( name, chart: chart, - version: version, + version: VERSION, values: values ) end diff --git a/changelogs/unreleased/6795-fix-prometheus-install.yml b/changelogs/unreleased/6795-fix-prometheus-install.yml new file mode 100644 index 00000000000..324d2e18425 --- /dev/null +++ b/changelogs/unreleased/6795-fix-prometheus-install.yml @@ -0,0 +1,5 @@ +--- +title: Lock prometheus version independent of data in the database +merge_request: 20376 +author: +type: fixed -- cgit v1.2.1