Properly check for firewallGroup in same namespace

Merge pull request 'Check for firewallGroup in same namespace if namespace is not defined' (#31 ) from feature/default-namespace-same-as-firewallpolicy-namespace-when-referring-firewallgroup into main
Reviewed-on: #31
2025-06-29 00:58:57 +02:00 · 2025-06-28 21:56:08 +00:00 · 2025-06-28 23:53:51 +02:00 · 2025-06-28 16:38:11 +00:00
1 changed files with 2 additions and 2 deletions
@@ -285,7 +285,7 @@ func (r *FirewallPolicyReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	// This will be used when running through all firewall groups and servics known, to see if a rule should be added.

 	for _, dest_group := range firewallPolicy.Spec.Destination.FirewallGroups {
-		namespace := defaultNs
+		namespace := firewallPolicy.Namespace
 		if len(dest_group.Namespace) > 0 {
 			namespace = dest_group.Namespace
 		}
@@ -310,7 +310,7 @@ func (r *FirewallPolicyReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	// Run through all firewall groups. Add them to the myFirewallGroups list if they either have an annotations or is specified in the resource.

 	for _, firewallGroup := range firewallGroupCRDs.Items {
-		if val, found := firewallGroup.Annotations["unifi.engen.priv.no/firewall-policy"]; found && ((strings.Contains(val, "/") && val == firewallPolicy.Namespace+"/"+firewallPolicy.Name) || (val == firewallPolicy.Name && firewallPolicy.Namespace == defaultNs)) {
+		if val, found := firewallGroup.Annotations["unifi.engen.priv.no/firewall-policy"]; found && ((strings.Contains(val, "/") && val == firewallPolicy.Namespace+"/"+firewallPolicy.Name) || (val == firewallPolicy.Name && firewallPolicy.Namespace == firewallGroup.Namespace)) {
 			myFirewallGroups = append(myFirewallGroups, firewallGroup)
 		} else if _, found := destination_groups[firewallGroup.Namespace+"/"+firewallGroup.Name]; found {
 			myFirewallGroups = append(myFirewallGroups, firewallGroup)
Author	SHA1	Message	Date
vegard	3a63034e26	Properly check for firewallGroup in same namespace Build project / build (push) Successful in 1m54s Details Publish / build (push) Successful in 2m0s Details	2025-06-29 00:58:57 +02:00
vegard	2e95d29373	Merge pull request 'Check for firewallGroup in same namespace if namespace is not defined' (#31 ) from feature/default-namespace-same-as-firewallpolicy-namespace-when-referring-firewallgroup into main Publish / build (push) Successful in 2m16s Details Reviewed-on: #31	2025-06-28 21:56:08 +00:00
vegard	990140ee1c	Check for firewallGroup in same namespace if namespace is not defined Build project / build (push) Successful in 1m51s Details	2025-06-28 23:53:51 +02:00
vegard	24c88264c9	Merge pull request 'Fix namespace matching for firewallgroups in firewallpolicies' (#30 ) from feature/default-namespace-same-as-firewallpolicy-namespace-when-referring-firewallgroup into main Publish / build (push) Successful in 2m1s Details Reviewed-on: #30	2025-06-28 16:38:11 +00:00