diff options
author | Stan Hu <stanhu@gmail.com> | 2019-02-19 22:50:54 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-02-19 22:50:54 +0300 |
commit | a6f882f3f204bebca36ddf613b82ea5573687fda (patch) | |
tree | e0f37837f19162827fa0aa3faf4c0570a9795e0b /app | |
parent | ab9f8785ebf5483e5d2cd02497b57fa05a47561e (diff) | |
parent | 13bb704d50cc885935bc7b0f850d47c1ace5cdd7 (diff) |
Merge branch 'move_ready_to_application_concern' into 'master'
Remove application `#ready?`
See merge request gitlab-org/gitlab-ce!25128
Diffstat (limited to 'app')
-rw-r--r-- | app/models/clusters/applications/prometheus.rb | 5 | ||||
-rw-r--r-- | app/services/prometheus/adapter_service.rb | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/app/models/clusters/applications/prometheus.rb b/app/models/clusters/applications/prometheus.rb index 52c440ffb2f..fa7ce363531 100644 --- a/app/models/clusters/applications/prometheus.rb +++ b/app/models/clusters/applications/prometheus.rb @@ -6,7 +6,6 @@ module Clusters include PrometheusAdapter VERSION = '6.7.3' - READY_STATUS = [:installed, :updating, :updated, :update_errored].freeze self.table_name = 'clusters_applications_prometheus' @@ -25,10 +24,6 @@ module Clusters end end - def ready? - READY_STATUS.include?(status_name) - end - def chart 'stable/prometheus' end diff --git a/app/services/prometheus/adapter_service.rb b/app/services/prometheus/adapter_service.rb index a791845ba20..3be958e1613 100644 --- a/app/services/prometheus/adapter_service.rb +++ b/app/services/prometheus/adapter_service.rb @@ -30,7 +30,7 @@ module Prometheus return unless deployment_platform.respond_to?(:cluster) cluster = deployment_platform.cluster - return unless cluster.application_prometheus&.ready? + return unless cluster.application_prometheus&.available? cluster.application_prometheus end |