1 files changed, 2 insertions, 21 deletions
diff --git a/app/models/concerns/deployment_platform.rb b/app/models/concerns/deployment_platform.rb
index 9ac0d612db3..945a9565e50 100644
--- a/app/models/concerns/deployment_platform.rb
+++ b/app/models/concerns/deployment_platform.rb
@@ -13,8 +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_instance_cluster_platform_kubernetes_with_feature_guard(environment: environment) ||
+      find_cluster_hierarchy_platform_kubernetes(environment: environment) ||
       find_kubernetes_service_integration ||
       build_cluster_and_deployment_platform
   end
@@ -25,30 +24,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)
+  def find_cluster_hierarchy_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
-      .first&.platform_kubernetes
-  end
-
   def find_kubernetes_service_integration
     services.deployment.reorder(nil).find_by(active: true)
   end