diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-17 00:09:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-17 00:09:09 +0300 |
| commit | cffe2c2c348d86d67298fa6516d49c36d696ab2d (patch) | |
| tree | 9511c62edd677012325946d19e4d2df4a9733aa1 /app/models/clusters | |
| parent | 7ff36fc6e9f0f5dffb41bfc79b4f07b2ce93e1c7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/clusters')
| -rw-r--r-- | app/models/clusters/applications/prometheus.rb | 1 | ||||
| -rw-r--r-- | app/models/clusters/cluster.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/app/models/clusters/applications/prometheus.rb b/app/models/clusters/applications/prometheus.rb index 21f7e410843..d1e169a1f78 100644 --- a/app/models/clusters/applications/prometheus.rb +++ b/app/models/clusters/applications/prometheus.rb @@ -18,7 +18,6 @@ module Clusters default_value_for :version, VERSION scope :preload_cluster_platform, -> { preload(cluster: [:platform_kubernetes]) } - scope :with_clusters_with_cilium, -> { joins(:cluster).merge(Clusters::Cluster.with_available_cilium) } attr_encrypted :alert_manager_token, mode: :per_attribute_iv, diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb index 87afa9f9491..014f7530357 100644 --- a/app/models/clusters/cluster.rb +++ b/app/models/clusters/cluster.rb @@ -137,7 +137,6 @@ module Clusters scope :aws_installed, -> { aws_provided.joins(:provider_aws).merge(Clusters::Providers::Aws.with_status(:created)) } scope :with_available_elasticstack, -> { joins(:application_elastic_stack).merge(::Clusters::Applications::ElasticStack.available) } - scope :with_available_cilium, -> { joins(:application_cilium).merge(::Clusters::Applications::Cilium.available) } scope :distinct_with_deployed_environments, -> { joins(:environments).merge(::Deployment.success).distinct } scope :managed, -> { where(managed: true) } |