Merge pull request 'Fix namespace matching for firewallgroups in firewallpolicies' (#30 ) from feature/default-namespace-same-as-firewallpolicy-namespace-when-referring-firewallgroup into main

Reviewed-on: #30
Fix namespace matching for firewallgroups in firewallpolicies
2025-06-28 16:38:11 +00:00 · 2025-06-28 18:33:54 +02:00 · 2025-06-27 15:48:14 +00:00 · 2025-06-27 17:01:55 +02:00 · 2025-06-27 16:53:44 +02:00
2 changed files with 5 additions and 5 deletions
--- a/internal/controller/firewallgroup_controller.go
+++ b/internal/controller/firewallgroup_controller.go
@@ -361,10 +361,10 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 		log.Error(err, "Could not list network objects")
 		return reconcile.Result{}, err
 	}
-	ipv4_name := "k8s-" + firewallGroup.Spec.Namespace + "/" + firewallGroup.Spec.Name + "-ipv4"
-	ipv6_name := "k8s-" + firewallGroup.Spec.Namespace + "/" + firewallGroup.Spec.Name + "-ipv6"
-	tcpports_name := "k8s-" firewallGroup.Spec.Namespace + "/" + firewallGroup.Spec.Name + "-tcpports"
-	udpports_name := "k8s-" + firewallGroup.Spec.Namespace + "/" + firewallGroup.Spec.Name + "-udpports"
+	ipv4_name := "k8s-" + firewallGroup.Namespace + "/" + firewallGroup.Name + "-ipv4"
+	ipv6_name := "k8s-" + firewallGroup.Namespace + "/" + firewallGroup.Name + "-ipv6"
+	tcpports_name := "k8s-" + firewallGroup.Namespace + "/" + firewallGroup.Name + "-tcpports"
+	udpports_name := "k8s-" + firewallGroup.Namespace + "/" + firewallGroup.Name + "-udpports"
 	ipv4_done := false
 	ipv6_done := false
 	tcpports_done := false
--- a/internal/controller/firewallpolicy_controller.go
+++ b/internal/controller/firewallpolicy_controller.go
@@ -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	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 All checks were successful Publish / build (push) Successful in 2m1s Details Reviewed-on: #30	2025-06-28 16:38:11 +00: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
Vegard Engen	8d70a78a50	fix All checks were successful Build project / build (push) Successful in 1m47s Details Publish / build (push) Successful in 1m59s Details	2025-06-27 17:01:55 +02:00
Vegard Engen	5885daac55	Fix Some checks failed Build project / build (push) Failing after 1m9s Details Publish / build (push) Failing after 1m19s Details	2025-06-27 16:53:44 +02:00