Remove group_clusters feature flag

Now we have terminals for instance and group clusters we can remove the
FF now. Deploying to group clusters has been working without complaints
too.

5 files changed, 2 insertions, 22 deletions

diff --git a/app/controllers/groups/clusters_controller.rb b/app/controllers/groups/clusters_controller.rb
index b846fb21266..92602fd8096 100644
--- a/app/controllers/groups/clusters_controller.rb
+++ b/app/controllers/groups/clusters_controller.rb
@@ -4,7 +4,6 @@ class Groups::ClustersController < Clusters::ClustersController
   include ControllerWithCrossProjectAccessCheck
 
   prepend_before_action :group
-  prepend_before_action :check_group_clusters_feature_flag!
   requires_cross_project_access
 
   layout 'group'
@@ -18,12 +17,4 @@ class Groups::ClustersController < Clusters::ClustersController
   def group
     @group ||= find_routable!(Group, params[:group_id] || params[:id])
   end
-
-  def check_group_clusters_feature_flag!
-    render_404 unless group_clusters_enabled?
-  end
-
-  def group_clusters_enabled?
-    group.group_clusters_enabled?
-  end
 end
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb
index a3f53ca8dd6..5aed7e313e6 100644
--- a/app/helpers/groups_helper.rb
+++ b/app/helpers/groups_helper.rb
@@ -142,7 +142,7 @@ module GroupsHelper
       can?(current_user, "read_group_#{resource}".to_sym, @group)
     end
 
-    if can?(current_user, :read_cluster, @group) && @group.group_clusters_enabled?
+    if can?(current_user, :read_cluster, @group)
       links << :kubernetes
     end
 
diff --git a/app/models/concerns/deployment_platform.rb b/app/models/concerns/deployment_platform.rb
index 1bd8a799f0d..0e9ddbe433b 100644
--- a/app/models/concerns/deployment_platform.rb
+++ b/app/models/concerns/deployment_platform.rb
@@ -13,7 +13,7 @@ module DeploymentPlatform
 
   def find_deployment_platform(environment)
     find_cluster_platform_kubernetes(environment: environment) ||
-      find_group_cluster_platform_kubernetes_with_feature_guard(environment: environment) ||
+      find_group_cluster_platform_kubernetes(environment: environment) ||
       find_instance_cluster_platform_kubernetes_with_feature_guard(environment: environment)
   end
 
@@ -23,12 +23,6 @@ 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)
diff --git a/app/models/group.rb b/app/models/group.rb
index dbec211935d..8e89c7ecfb1 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -410,10 +410,6 @@ class Group < Namespace
     ensure_runners_token!
   end
 
-  def group_clusters_enabled?
-    Feature.enabled?(:group_clusters, root_ancestor, default_enabled: true)
-  end
-
   def project_creation_level
     super || ::Gitlab::CurrentSettings.default_project_creation
   end
diff --git a/app/models/project.rb b/app/models/project.rb
index c642b65f674..b102e0580e7 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -306,7 +306,6 @@ class Project < ApplicationRecord
   delegate :add_guest, :add_reporter, :add_developer, :add_maintainer, :add_role, to: :team
   delegate :add_master, to: :team # @deprecated
   delegate :group_runners_enabled, :group_runners_enabled=, :group_runners_enabled?, to: :ci_cd_settings
-  delegate :group_clusters_enabled?, to: :group, allow_nil: true
   delegate :root_ancestor, to: :namespace, allow_nil: true
   delegate :last_pipeline, to: :commit, allow_nil: true
   delegate :external_dashboard_url, to: :metrics_setting, allow_nil: true, prefix: true