Check for firewallGroup in same namespace if namespace is not defined

Fix namespace matching for firewallgroups in firewallpolicies
Merge pull request 'feature/add-namespace-to-firewallgroup-and-firewallpolicy-resources' (#29 ) from feature/add-namespace-to-firewallgroup-and-firewallpolicy-resources into main
2025-06-28 23:53:51 +02:00 · 2025-06-28 18:33:54 +02:00 · 2025-06-27 15:48:14 +00:00
1 changed files with 2 additions and 2 deletions
--- a/internal/controller/firewallpolicy_controller.go
+++ b/internal/controller/firewallpolicy_controller.go
@@ -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)
@@ -340,7 +340,7 @@ func (r *FirewallPolicyReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 				skipService = true
 			}
 		}
-		if val, found := service.Annotations["unifi.engen.priv.no/firewall-policy"]; found && ((strings.Contains(val, "/") && val == firewallPolicy.Namespace+"/"+firewallPolicy.Name) || (val == firewallPolicy.Name && firewallPolicy.Namespace == defaultNs)) && !skipService {
+		if val, found := service.Annotations["unifi.engen.priv.no/firewall-policy"]; found && ((strings.Contains(val, "/") && val == firewallPolicy.Namespace+"/"+firewallPolicy.Name) || (val == firewallPolicy.Name && firewallPolicy.Namespace == service.Namespace)) && !skipService {
 			myServices = append(myServices, service)
 		} else if _, found := destination_services[service.Namespace+"/"+service.Name]; found && !skipService {
 			myServices = append(myServices, service)
Author	SHA1	Message	Date
Vegard Engen	990140ee1c	Check for firewallGroup in same namespace if namespace is not defined All checks were successful Build project / build (push) Successful in 1m51s Details	2025-06-28 23:53:51 +02:00
Vegard Engen	938d53fa8f	Fix namespace matching for firewallgroups in firewallpolicies All checks were successful Build project / build (push) Successful in 1m55s Details Publish / build (push) Successful in 2m5s Details	2025-06-28 18:33:54 +02:00
Vegard Engen	768c61020e	Merge pull request 'feature/add-namespace-to-firewallgroup-and-firewallpolicy-resources' (#29 ) from feature/add-namespace-to-firewallgroup-and-firewallpolicy-resources into main All checks were successful Publish / build (push) Successful in 1m58s Details Reviewed-on: #29	2025-06-27 15:48:14 +00:00