kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Convert instance level clusters enabled to class method

Browse source
This commit is contained in:
James Fargher 2019-05-03 10:15:23 +12:00
parent c40a99a058
commit 0aeef7335f
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/clusters/instance.rb
View file

@ -10,7 +10,7 @@ module Clusters
::Feature.enabled?(feature, default_enabled: true)
end
def instance_clusters_enabled?
def self.enabled?
::Feature.enabled?(:instance_clusters, default_enabled: true)
end
end

6
app/models/concerns/deployment_platform.rb
View file

@ -38,7 +38,7 @@ module DeploymentPlatform
end
def find_instance_cluster_platform_kubernetes_with_feature_guard(environment: nil)
return unless instance_clusters_enabled?
return unless Clusters::Instance.enabled?
find_instance_cluster_platform_kubernetes(environment: environment)
end
@ -49,10 +49,6 @@ module DeploymentPlatform
.first&.platform_kubernetes
end
def instance_clusters_enabled?
Feature.enabled?(:instance_clusters, default_enabled: true)
end
def find_kubernetes_service_integration
services.deployment.reorder(nil).find_by(active: true)
end

2
app/policies/clusters/instance_policy.rb
View file

@ -6,7 +6,7 @@ module Clusters
condition(:has_clusters, scope: :subject) { clusterable_has_clusters? }
condition(:can_have_multiple_clusters) { multiple_clusters_available? }
condition(:instance_clusters_enabled, scope: :subject) { @subject.instance_clusters_enabled? }
condition(:instance_clusters_enabled) { Instance.enabled? }
rule { admin & instance_clusters_enabled }.policy do
enable :read_cluster