Only look up Kubernetes namespaces by project ID52494-separate-namespace-per-project-environment-slug

Also finding by cluster_project_id is redundant

1 files changed, 2 insertions, 4 deletions

diff --git a/app/finders/clusters/kubernetes_namespace_finder.rb b/app/finders/clusters/kubernetes_namespace_finder.rb
index 73567c2472a..e947796c1e7 100644
--- a/app/finders/clusters/kubernetes_namespace_finder.rb
+++ b/app/finders/clusters/kubernetes_namespace_finder.rb
@@ -20,11 +20,9 @@ module Clusters
     attr_reader :allow_blank_token
 
     def find_namespace(with_environment:)
-      attributes = { project: project }
-      attributes[:cluster_project] = cluster.cluster_project if cluster.project_type?
-
       relation = with_environment ? namespaces.with_environment_slug(environment_slug) : namespaces
-      relation.find_by(attributes) # rubocop: disable CodeReuse/ActiveRecord
+
+      relation.find_by_project_id(project.id)
     end
 
     def namespaces