diff options
Diffstat (limited to 'app/models/clusters')
-rw-r--r-- | app/models/clusters/applications/prometheus.rb | 12 | ||||
-rw-r--r-- | app/models/clusters/applications/runner.rb | 4 | ||||
-rw-r--r-- | app/models/clusters/concerns/application_data.rb | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/app/models/clusters/applications/prometheus.rb b/app/models/clusters/applications/prometheus.rb index 26bf73f4dd8..f50adb4693d 100644 --- a/app/models/clusters/applications/prometheus.rb +++ b/app/models/clusters/applications/prometheus.rb @@ -52,24 +52,16 @@ module Clusters ) end - def upgrade_command(values) + def upgrade_command(replaced_values: nil) ::Gitlab::Kubernetes::Helm::UpgradeCommand.new( name, version: VERSION, chart: chart, rbac: cluster.platform_kubernetes_rbac?, - files: files_with_replaced_values(values) + files: replaced_values ? files_with_replaced_values(replaced_values) : files ) 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/models/clusters/applications/runner.rb b/app/models/clusters/applications/runner.rb index 2cf8d47bded..5b4a5ad8ba1 100644 --- a/app/models/clusters/applications/runner.rb +++ b/app/models/clusters/applications/runner.rb @@ -40,13 +40,13 @@ module Clusters ) end - def upgrade_command + def upgrade_command(replaced_values: nil) ::Gitlab::Kubernetes::Helm::UpgradeCommand.new( name, version: VERSION, rbac: cluster.platform_kubernetes_rbac?, chart: chart, - files: files, + files: replaced_values ? files_with_replaced_values(replaced_values) : files, repository: repository ) end diff --git a/app/models/clusters/concerns/application_data.rb b/app/models/clusters/concerns/application_data.rb index 52498f123ff..556bf14888b 100644 --- a/app/models/clusters/concerns/application_data.rb +++ b/app/models/clusters/concerns/application_data.rb @@ -24,6 +24,14 @@ module Clusters end 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 + private def certificate_files |