From d1921afaf96b220ca5d171afd057efa94a33624d Mon Sep 17 00:00:00 2001 From: Tiger Date: Wed, 7 Aug 2019 12:19:17 +1000 Subject: Only look up Kubernetes namespaces by project ID Also finding by cluster_project_id is redundant --- app/finders/clusters/kubernetes_namespace_finder.rb | 6 ++---- 1 file 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 -- cgit v1.2.1