From 60e60ba5991b009a8d30f4a2400746c9f0777438 Mon Sep 17 00:00:00 2001 From: Michael Grosser Date: Fri, 3 Jan 2025 16:37:39 -0800 Subject: [PATCH] add namespaceSelector for ClusterPropagationPolicy --- pkg/detector/compare.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkg/detector/compare.go b/pkg/detector/compare.go index 80c30b239456..7d94a9e6f6e4 100644 --- a/pkg/detector/compare.go +++ b/pkg/detector/compare.go @@ -33,12 +33,20 @@ func getHighestPriorityPropagationPolicy(policies []*policyv1alpha1.PropagationP var matchedPolicy *policyv1alpha1.PropagationPolicy for _, policy := range policies { + // namespace matches ? + if policy.Spec.NamespaceSelectors != nil { + if !util.ResourceMatchSelectors(GetNamespace(resource.GetNamespace()), policy.Spec.NamespaceSelectors) { + continue + } + } + + // resource matches ? implicitPriority := util.ResourceMatchSelectorsPriority(resource, policy.Spec.ResourceSelectors...) if implicitPriority <= util.PriorityMisMatch { continue } - explicitPriority := policy.ExplicitPriority() + explicitPriority := policy.ExplicitPriority() if matchedPolicyExplicitPriority < explicitPriority { matchedPolicyImplicitPriority = implicitPriority matchedPolicyExplicitPriority = explicitPriority