diff options
author | James Fargher <proglottis@gmail.com> | 2019-05-03 10:15:23 +1200 |
---|---|---|
committer | James Fargher <proglottis@gmail.com> | 2019-05-07 08:37:04 +1200 |
commit | 0aeef7335f5adcaf345e24377e63b2221721b346 (patch) | |
tree | 2b74f22a61a1661b3d9508ce35799d8372420384 /app/models | |
parent | c40a99a05842d0976dd1bca532fbc67c0ccee04d (diff) | |
download | gitlab-ce-0aeef7335f5adcaf345e24377e63b2221721b346.tar.gz |
Convert instance level clusters enabled to class method
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/clusters/instance.rb | 2 | ||||
-rw-r--r-- | app/models/concerns/deployment_platform.rb | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/app/models/clusters/instance.rb b/app/models/clusters/instance.rb index e83c2baad74..d8a888d53ba 100644 --- a/app/models/clusters/instance.rb +++ b/app/models/clusters/instance.rb @@ -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 diff --git a/app/models/concerns/deployment_platform.rb b/app/models/concerns/deployment_platform.rb index c2dafec1a54..9ac0d612db3 100644 --- a/app/models/concerns/deployment_platform.rb +++ b/app/models/concerns/deployment_platform.rb @@ -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 |