diff options
author | Stan Hu <stanhu@gmail.com> | 2019-06-28 02:01:08 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-06-28 02:01:08 +0300 |
commit | 36451a753ac442250c1ed5a6427383817434d1ec (patch) | |
tree | fa19d4a05b104c516961dd8bd0289846ccbc213f /app/models/concerns | |
parent | 62a40c5170cbecfc77dcb5fc97a23f3e93898a53 (diff) | |
parent | 8152efbe2fc486520ec5cd11d54a49fbf7e554bf (diff) |
Merge branch 'remove_group_and_instance_clusters_feature_flag' into 'master'
Remove group and instance clusters feature flag
Closes #63383
See merge request gitlab-org/gitlab-ce!30124
Diffstat (limited to 'app/models/concerns')
-rw-r--r-- | app/models/concerns/deployment_platform.rb | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/app/models/concerns/deployment_platform.rb b/app/models/concerns/deployment_platform.rb index 1bd8a799f0d..5a358ae2ef6 100644 --- a/app/models/concerns/deployment_platform.rb +++ b/app/models/concerns/deployment_platform.rb @@ -13,8 +13,8 @@ module DeploymentPlatform def find_deployment_platform(environment) find_cluster_platform_kubernetes(environment: environment) || - find_group_cluster_platform_kubernetes_with_feature_guard(environment: environment) || - find_instance_cluster_platform_kubernetes_with_feature_guard(environment: environment) + find_group_cluster_platform_kubernetes(environment: environment) || + find_instance_cluster_platform_kubernetes(environment: environment) end # EE would override this and utilize environment argument @@ -23,24 +23,12 @@ module DeploymentPlatform .last&.platform_kubernetes end - def find_group_cluster_platform_kubernetes_with_feature_guard(environment: nil) - return unless group_clusters_enabled? - - find_group_cluster_platform_kubernetes(environment: environment) - end - # EE would override this and utilize environment argument def find_group_cluster_platform_kubernetes(environment: nil) Clusters::Cluster.enabled.default_environment.ancestor_clusters_for_clusterable(self) .first&.platform_kubernetes end - def find_instance_cluster_platform_kubernetes_with_feature_guard(environment: nil) - return unless Clusters::Instance.enabled? - - find_instance_cluster_platform_kubernetes(environment: environment) - end - # EE would override this and utilize environment argument def find_instance_cluster_platform_kubernetes(environment: nil) Clusters::Instance.new.clusters.enabled.default_environment |