Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-03-29 22:24:10 +0300
committerMatija Čupić <matteeyah@gmail.com>2018-03-29 22:24:10 +0300
commit982e5436e1ef9b309f8ee3a205f1e168273386b3 (patch)
tree4038eae5223df2e2135f3cb99b631796436524dc /app/models/clusters
parenta5f9e49f1317345d1b72566ecff188dff5f74913 (diff)
Add installed scope to cluster applications
Diffstat (limited to 'app/models/clusters')
-rw-r--r--app/models/clusters/applications/helm.rb2
-rw-r--r--app/models/clusters/applications/ingress.rb2
-rw-r--r--app/models/clusters/applications/prometheus.rb2
-rw-r--r--app/models/clusters/applications/runner.rb2
4 files changed, 8 insertions, 0 deletions
diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
index 58de3448577..f7dfae56df6 100644
--- a/app/models/clusters/applications/helm.rb
+++ b/app/models/clusters/applications/helm.rb
@@ -8,6 +8,8 @@ module Clusters
default_value_for :version, Gitlab::Kubernetes::Helm::HELM_VERSION
+ scope :installed, -> { where(status: ::Clusters::Applications::Helm.state_machines[:status].states[:installed].value) }
+
def set_initial_status
return unless not_installable?
diff --git a/app/models/clusters/applications/ingress.rb b/app/models/clusters/applications/ingress.rb
index 27fc3b85465..8cd88e8aeaf 100644
--- a/app/models/clusters/applications/ingress.rb
+++ b/app/models/clusters/applications/ingress.rb
@@ -11,6 +11,8 @@ module Clusters
default_value_for :ingress_type, :nginx
default_value_for :version, :nginx
+ scope :installed, -> { where(status: ::Clusters::Applications::Ingress.state_machines[:status].states[:installed].value) }
+
enum ingress_type: {
nginx: 1
}
diff --git a/app/models/clusters/applications/prometheus.rb b/app/models/clusters/applications/prometheus.rb
index 7b25d8c4089..2ae3e006047 100644
--- a/app/models/clusters/applications/prometheus.rb
+++ b/app/models/clusters/applications/prometheus.rb
@@ -13,6 +13,8 @@ module Clusters
default_value_for :version, VERSION
+ scope :installed, -> { where(status: ::Clusters::Applications::Prometheus.state_machines[:status].states[:installed].value) }
+
state_machine :status do
after_transition any => [:installed] do |application|
application.cluster.projects.each do |project|
diff --git a/app/models/clusters/applications/runner.rb b/app/models/clusters/applications/runner.rb
index 16efe90fa27..6dc51d1baa4 100644
--- a/app/models/clusters/applications/runner.rb
+++ b/app/models/clusters/applications/runner.rb
@@ -14,6 +14,8 @@ module Clusters
default_value_for :version, VERSION
+ scope :installed, -> { where(status: ::Clusters::Applications::Runner.state_machines[:status].states[:installed].value) }
+
def chart
"#{name}/gitlab-runner"
end