Fix reconciler logic.

Finalizer to clean up firewall group objects when deleting a firewall group resource

api/v1beta1/firewallrule_types.go

@@ -40,9 +40,6 @@ import (
 //}
 
 type FirewallRuleSpec struct {
-	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
-	// Important: Run "make" to regenerate code after modifying this file
-
 	Name                               string              `json:"name"`
 	Source                             FirewallSource      `json:"source"`
 	Destination                        FirewallDestination `json:"destination"`
@@ -52,9 +49,6 @@ type FirewallRuleSpec struct {
 
 // FirewallRuleStatus defines the observed state of FirewallRule.
 type FirewallRuleStatus struct {
-	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
-	// Important: Run "make" to regenerate code after modifying this file
-
 	ResourcesManaged *FirewallRuleResourcesManaged `json:"resources_managed,omitempty"`
 }
 
@@ -66,7 +60,10 @@ type FirewallRuleResourcesManaged struct {
 type UnifiFirewallRuleEntry struct {
 	From      string `json:"from"`
 	To        string `json:"to"`
-	RuleID string `json:"rule_id"`
+	TcpIpv4ID string `json:"tcpipv4_id"`
+	UdpIpv4ID string `json:"udpipv4_id"`
+	TcpIpv6ID string `json:"tcpipv6_id"`
+	UdpIpv6ID string `json:"udpipv6_id"`
 }
 
 // +kubebuilder:object:root=true

config/crd/bases/unifi.engen.priv.no_firewallrules.yaml

@@ -110,14 +110,23 @@ spec:
                       properties:
                         from:
                           type: string
-                        rule_id:
+                        tcpipv4_id:
+                          type: string
+                        tcpipv6_id:
                           type: string
                         to:
                           type: string
+                        udpipv4_id:
+                          type: string
+                        udpipv6_id:
+                          type: string
                       required:
                       - from
-                      - rule_id
+                      - tcpipv4_id
+                      - tcpipv6_id
                       - to
+                      - udpipv4_id
+                      - udpipv6_id
                       type: object
                     type: array
                 type: object

internal/controller/firewallgroup_controller.go

@@ -32,6 +32,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -43,6 +44,8 @@ import (
 	"github.com/vegardengen/unifi-network-operator/internal/unifi"
 )
 
+const firewallGroupFinalizer = "finalizer.unifi.engen.priv.no/firewallgroup"
+
 // FirewallGroupReconciler reconciles a FirewallGroup object
 type FirewallGroupReconciler struct {
 	client.Client
@@ -78,14 +81,150 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 	defaultNs := cfg.Data["defaultNamespace"]
 	log.Info(defaultNs)
 
-	var nwObj unifiv1beta1.FirewallGroup
+	var firewallGroup unifiv1beta1.FirewallGroup
-	if err := r.Get(ctx, req.NamespacedName, &nwObj); err != nil {
+	if err := r.Get(ctx, req.NamespacedName, &firewallGroup); err != nil {
 		return reconcile.Result{}, client.IgnoreNotFound(err)
 	}
-	log.Info(nwObj.Spec.Name)
+	log.Info(firewallGroup.Spec.Name)
+
+	// Check if the object is being deleted
+	if firewallGroup.DeletionTimestamp != nil {
+		if controllerutil.ContainsFinalizer(&firewallGroup, firewallGroupFinalizer) {
+			err := r.UnifiClient.Reauthenticate()
+			if err != nil {
+				return reconcile.Result{}, err
+			}
+			log.Info("Running finalizer logic for FirewallGroup", "name", firewallGroup.Name)
+
+			if len(firewallGroup.Status.ResourcesManaged.IPV4Object.ID) > 0 {
+				log.Info(fmt.Sprintf("Trying to delete ipv4 object %s", firewallGroup.Status.ResourcesManaged.IPV4Object.ID))
+				err := r.UnifiClient.Client.DeleteFirewallGroup(context.Background(), r.UnifiClient.SiteID, firewallGroup.Status.ResourcesManaged.IPV4Object.ID)
+				if err != nil {
+					msg := strings.ToLower(err.Error())
+					log.Info(msg)
+					if strings.Contains(msg, "api.err.objectreferredby") {
+						firewall_group, err := r.UnifiClient.Client.GetFirewallGroup(context.Background(), r.UnifiClient.SiteID, firewallGroup.Status.ResourcesManaged.IPV4Object.ID)
+						if err != nil {
+							log.Error(err, "Could not get object for renaming.")
+							return reconcile.Result{}, err
+						} else {
+							log.Info("Firewall group is in use. Invoking workaround...!")
+							firewall_group.GroupMembers = []string{"127.0.0.1"}
+							firewall_group.Name = firewall_group.Name + "-deleted"
+							_, updateerr := r.UnifiClient.Client.UpdateFirewallGroup(context.Background(), r.UnifiClient.SiteID, firewall_group)
+							if updateerr != nil {
+								log.Error(updateerr, "Could neither delete or rename firewall group")
+								return reconcile.Result{}, updateerr
+							}
+						}
+					} else {
+						log.Error(err, "Could not delete firewall group")
+						return reconcile.Result{}, err
+					}
+				}
+			}
+			if len(firewallGroup.Status.ResourcesManaged.IPV6Object.ID) > 0 {
+				log.Info(fmt.Sprintf("Trying to delete ipv6 object %s", firewallGroup.Status.ResourcesManaged.IPV6Object.ID))
+				err := r.UnifiClient.Client.DeleteFirewallGroup(context.Background(), r.UnifiClient.SiteID, firewallGroup.Status.ResourcesManaged.IPV6Object.ID)
+				if err != nil {
+					msg := strings.ToLower(err.Error())
+					log.Info(msg)
+					if strings.Contains(msg, "api.err.objectreferredby") {
+						firewall_group, err := r.UnifiClient.Client.GetFirewallGroup(context.Background(), r.UnifiClient.SiteID, firewallGroup.Status.ResourcesManaged.IPV6Object.ID)
+						if err != nil {
+							log.Error(err, "Could not get object for renaming.")
+							return reconcile.Result{}, err
+						} else {
+							log.Info("Firewall group is in use. Invoking workaround...!")
+							firewall_group.GroupMembers = []string{"::1"}
+							firewall_group.Name = firewall_group.Name + "-deleted"
+							_, updateerr := r.UnifiClient.Client.UpdateFirewallGroup(context.Background(), r.UnifiClient.SiteID, firewall_group)
+							if updateerr != nil {
+								log.Error(updateerr, "Could neither delete or rename firewall group")
+								return reconcile.Result{}, updateerr
+							}
+						}
+					} else {
+						log.Error(err, "Could not delete firewall group")
+						return reconcile.Result{}, err
+					}
+				}
+			}
+			if len(firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID) > 0 {
+				log.Info(fmt.Sprintf("Trying to delete tcp object %s", firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID))
+				err := r.UnifiClient.Client.DeleteFirewallGroup(context.Background(), r.UnifiClient.SiteID, firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID)
+				if err != nil {
+					msg := strings.ToLower(err.Error())
+					log.Info(msg)
+					if strings.Contains(msg, "api.err.objectreferredby") {
+						firewall_group, err := r.UnifiClient.Client.GetFirewallGroup(context.Background(), r.UnifiClient.SiteID, firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID)
+						if err != nil {
+							log.Error(err, "Could not get object for renaming.")
+							return reconcile.Result{}, err
+						} else {
+							log.Info("Firewall group is in use. Invoking workaround...!")
+							firewall_group.GroupMembers = []string{"0"}
+							firewall_group.Name = firewall_group.Name + "-deleted"
+							_, updateerr := r.UnifiClient.Client.UpdateFirewallGroup(context.Background(), r.UnifiClient.SiteID, firewall_group)
+							if updateerr != nil {
+								log.Error(updateerr, "Could neither delete or rename firewall group")
+								return reconcile.Result{}, updateerr
+							}
+						}
+					} else {
+						log.Error(err, "Could not delete firewall group")
+						return reconcile.Result{}, err
+					}
+				}
+			}
+			if len(firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID) > 0 {
+				log.Info(fmt.Sprintf("Trying to delete udp object %s", firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID))
+				err := r.UnifiClient.Client.DeleteFirewallGroup(context.Background(), r.UnifiClient.SiteID, firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID)
+				if err != nil {
+					msg := strings.ToLower(err.Error())
+					log.Info(msg)
+					if strings.Contains(msg, "api.err.objectreferredby") {
+						firewall_group, err := r.UnifiClient.Client.GetFirewallGroup(context.Background(), r.UnifiClient.SiteID, firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID)
+						if err != nil {
+							log.Error(err, "Could not get object for renaming.")
+							return reconcile.Result{}, err
+						} else {
+							log.Info("Firewall group is in use. Invoking workaround...!")
+							firewall_group.GroupMembers = []string{"0"}
+							firewall_group.Name = firewall_group.Name + "-deleted"
+							_, updateerr := r.UnifiClient.Client.UpdateFirewallGroup(context.Background(), r.UnifiClient.SiteID, firewall_group)
+							if updateerr != nil {
+								log.Error(updateerr, "Could neither delete or rename firewall group")
+								return reconcile.Result{}, updateerr
+							}
+						}
+					} else {
+						log.Error(err, "Could not delete firewall group")
+						return reconcile.Result{}, err
+					}
+				}
+			}
+
+			controllerutil.RemoveFinalizer(&firewallGroup, firewallGroupFinalizer)
+			if err := r.Update(ctx, &firewallGroup); err != nil {
+				return ctrl.Result{}, err
+			}
+
+			log.Info("Successfully finalized FirewallGroup")
+		}
+		return ctrl.Result{}, nil
+	}
+
+	if !controllerutil.ContainsFinalizer(&firewallGroup, firewallGroupFinalizer) {
+		controllerutil.AddFinalizer(&firewallGroup, firewallGroupFinalizer)
+		if err := r.Update(ctx, &firewallGroup); err != nil {
+			return ctrl.Result{}, err
+		}
+	}
+
 	var ipv4, ipv6, tcpports, udpports []string
 
-	for _, addressEntry := range nwObj.Spec.ManualAddresses {
+	for _, addressEntry := range firewallGroup.Spec.ManualAddresses {
 		ip := net.ParseIP(addressEntry)
 
 		if ip != nil {
@@ -114,7 +253,7 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 		}
 	}
 
-	for _, portEntry := range nwObj.Spec.ManualPorts {
+	for _, portEntry := range firewallGroup.Spec.ManualPorts {
 		port_type := "tcp"
 		port := portEntry
 		if match, _ := regexp.MatchString("(?:tcp|udp)\\/?)\\d+", string(portEntry)); match {
@@ -134,7 +273,7 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 		}
 	}
 	var services corev1.ServiceList
-	if nwObj.Spec.MatchServicesInAllNamespaces {
+	if firewallGroup.Spec.MatchServicesInAllNamespaces {
 		if err := r.List(ctx, &services); err != nil {
 			log.Error(err, "unable to list services")
 			return reconcile.Result{}, err
@@ -147,7 +286,7 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 		}
 	}
 	serviceNamespaceNames := make(map[string]struct{})
-	for _, serviceEntry := range nwObj.Spec.ManualServices {
+	for _, serviceEntry := range firewallGroup.Spec.ManualServices {
 		serviceNamespaceNames[serviceEntry.Namespace+"/"+serviceEntry.Name] = struct{}{}
 	}
 	log.Info(fmt.Sprintf("Manually specified: %+v", serviceNamespaceNames))
@@ -156,8 +295,8 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 		val, found := service.Annotations["unifi.engen.priv.no/firewall-group"]
 		log.Info(fmt.Sprintf("%s %sv %+v %+v", service.Name, val, manually_specified, found))
 
-		// if val, found := service.Annotations["unifi.engen.priv.no/firewall-group"]; (manually_specified || (found && val == nwObj.Name)) && service.Status.LoadBalancer.Ingress != nil {
+		// if val, found := service.Annotations["unifi.engen.priv.no/firewall-group"]; (manually_specified || (found && val == firewallGroup.Name)) && service.Status.LoadBalancer.Ingress != nil {
-		if (manually_specified || (found && val == nwObj.Name)) && service.Status.LoadBalancer.Ingress != nil {
+		if (manually_specified || (found && val == firewallGroup.Name)) && service.Status.LoadBalancer.Ingress != nil {
 			for _, ingress := range service.Status.LoadBalancer.Ingress {
 				if ingress.IP != "" {
 					ip := ingress.IP
@@ -186,15 +325,15 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 			}
 		}
 	}
-	nwObj.Status.ResolvedIPV4Addresses = ipv4
+	firewallGroup.Status.ResolvedIPV4Addresses = ipv4
-	nwObj.Status.ResolvedIPV6Addresses = ipv6
+	firewallGroup.Status.ResolvedIPV6Addresses = ipv6
-	nwObj.Status.ResolvedTCPPorts = tcpports
+	firewallGroup.Status.ResolvedTCPPorts = tcpports
-	nwObj.Status.ResolvedUDPPorts = udpports
+	firewallGroup.Status.ResolvedUDPPorts = udpports
 	currentTime := metav1.Now()
-	nwObj.Status.LastSyncTime = &currentTime
+	firewallGroup.Status.LastSyncTime = &currentTime
-	nwObj.Status.SyncedWithUnifi = true
+	firewallGroup.Status.SyncedWithUnifi = true
-	if nwObj.Status.ResourcesManaged == nil {
+	if firewallGroup.Status.ResourcesManaged == nil {
-		nwObj.Status.ResourcesManaged = &unifiv1beta1.FirewallGroupResourcesManaged{
+		firewallGroup.Status.ResourcesManaged = &unifiv1beta1.FirewallGroupResourcesManaged{
 			IPV4Object: &unifiv1beta1.NamedUnifiResource{
 				ID:   "",
 				Name: "",
@@ -222,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-" + nwObj.Spec.Name + "-ipv4"
+	ipv4_name := "k8s-" + firewallGroup.Spec.Name + "-ipv4"
-	ipv6_name := "k8s-" + nwObj.Spec.Name + "-ipv6"
+	ipv6_name := "k8s-" + firewallGroup.Spec.Name + "-ipv6"
-	tcpports_name := "k8s-" + nwObj.Spec.Name + "-tcpports"
+	tcpports_name := "k8s-" + firewallGroup.Spec.Name + "-tcpports"
-	udpports_name := "k8s-" + nwObj.Spec.Name + "-udpports"
+	udpports_name := "k8s-" + firewallGroup.Spec.Name + "-udpports"
 	ipv4_done := false
 	ipv6_done := false
 	tcpports_done := false
@@ -247,14 +386,15 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 							log.Error(updateerr, "Could neither delete or rename firewall group")
 							return reconcile.Result{}, updateerr
 						}
-						nwObj.Status.ResourcesManaged.IPV4Object.Name = firewall_group.Name
+						firewallGroup.Status.ResourcesManaged.IPV4Object.Name = ""
+						firewallGroup.Status.ResourcesManaged.IPV4Object.ID = ""
 					} else {
 						log.Error(err, "Could not delete firewall group")
 						return reconcile.Result{}, err
 					}
 				} else {
-					nwObj.Status.ResourcesManaged.IPV4Object.Name = ""
+					firewallGroup.Status.ResourcesManaged.IPV4Object.Name = ""
-					nwObj.Status.ResourcesManaged.IPV4Object.ID = ""
+					firewallGroup.Status.ResourcesManaged.IPV4Object.ID = ""
 				}
 				ipv4_done = true
 			} else {
@@ -286,14 +426,15 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 							log.Error(updateerr, "Could neither delete or rename firewall group")
 							return reconcile.Result{}, updateerr
 						}
-						nwObj.Status.ResourcesManaged.IPV6Object.Name = firewall_group.Name
+						firewallGroup.Status.ResourcesManaged.IPV6Object.Name = ""
+						firewallGroup.Status.ResourcesManaged.IPV6Object.ID = ""
 					} else {
 						log.Error(err, "Could not delete firewall group")
 						return reconcile.Result{}, err
 					}
 				} else {
-					nwObj.Status.ResourcesManaged.IPV6Object.Name = ""
+					firewallGroup.Status.ResourcesManaged.IPV6Object.Name = ""
-					nwObj.Status.ResourcesManaged.IPV6Object.ID = ""
+					firewallGroup.Status.ResourcesManaged.IPV6Object.ID = ""
 				}
 				ipv6_done = true
 			} else {
@@ -325,14 +466,15 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 							log.Error(updateerr, "Could neither delete or rename firewall group")
 							return reconcile.Result{}, updateerr
 						}
-						nwObj.Status.ResourcesManaged.TCPPortsObject.Name = firewall_group.Name
+						firewallGroup.Status.ResourcesManaged.TCPPortsObject.Name = ""
+						firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID = ""
 					} else {
 						log.Error(err, "Could not delete firewall group")
 						return reconcile.Result{}, err
 					}
 				} else {
-					nwObj.Status.ResourcesManaged.TCPPortsObject.Name = ""
+					firewallGroup.Status.ResourcesManaged.TCPPortsObject.Name = ""
-					nwObj.Status.ResourcesManaged.TCPPortsObject.ID = ""
+					firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID = ""
 				}
 				tcpports_done = true
 			} else {
@@ -364,14 +506,15 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 							log.Error(updateerr, "Could neither delete or rename firewall group")
 							return reconcile.Result{}, updateerr
 						}
-						nwObj.Status.ResourcesManaged.UDPPortsObject.Name = firewall_group.Name
+						firewallGroup.Status.ResourcesManaged.UDPPortsObject.Name = ""
+						firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID = ""
 					} else {
 						log.Error(err, "Could not delete firewall group")
 						return reconcile.Result{}, err
 					}
 				} else {
-					nwObj.Status.ResourcesManaged.UDPPortsObject.Name = ""
+					firewallGroup.Status.ResourcesManaged.UDPPortsObject.Name = ""
-					nwObj.Status.ResourcesManaged.UDPPortsObject.ID = ""
+					firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID = ""
 				}
 				udpports_done = true
 			} else {
@@ -396,7 +539,8 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 				log.Error(err, "Could not update firewall group")
 				return reconcile.Result{}, err
 			}
-			nwObj.Status.ResourcesManaged.IPV4Object.Name = firewall_group.Name
+			firewallGroup.Status.ResourcesManaged.IPV4Object.Name = firewall_group.Name
+			firewallGroup.Status.ResourcesManaged.IPV4Object.ID = firewall_group.ID
 			ipv4_done = true
 		}
 		if firewall_group.Name == ipv6_name+"-deleted" && len(ipv6) > 0 {
@@ -408,7 +552,8 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 				log.Error(err, "Could not update firewall group")
 				return reconcile.Result{}, err
 			}
-			nwObj.Status.ResourcesManaged.IPV4Object.Name = firewall_group.Name
+			firewallGroup.Status.ResourcesManaged.IPV6Object.Name = firewall_group.Name
+			firewallGroup.Status.ResourcesManaged.IPV6Object.ID = firewall_group.ID
 			ipv6_done = true
 		}
 		if firewall_group.Name == tcpports_name+"-deleted" && len(tcpports) > 0 {
@@ -420,7 +565,8 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 				log.Error(err, "Could not update firewall group")
 				return reconcile.Result{}, err
 			}
-			nwObj.Status.ResourcesManaged.TCPPortsObject.Name = firewall_group.Name
+			firewallGroup.Status.ResourcesManaged.TCPPortsObject.Name = firewall_group.Name
+			firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID = firewall_group.ID
 			tcpports_done = true
 		}
 		if firewall_group.Name == udpports_name+"-deleted" && len(udpports) > 0 {
@@ -432,7 +578,8 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 				log.Error(err, "Could not update firewall group")
 				return reconcile.Result{}, err
 			}
-			nwObj.Status.ResourcesManaged.UDPPortsObject.Name = firewall_group.Name
+			firewallGroup.Status.ResourcesManaged.UDPPortsObject.Name = firewall_group.Name
+			firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID = firewall_group.ID
 			udpports_done = true
 		}
 	}
@@ -454,8 +601,8 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 
 		log.Info(fmt.Sprintf("ID and name: %s %s", firewall_group.ID, firewall_group.Name))
 		log.Info(fmt.Sprintf("%+v", firewall_group))
-		nwObj.Status.ResourcesManaged.IPV4Object.ID = firewall_group.ID
+		firewallGroup.Status.ResourcesManaged.IPV4Object.ID = firewall_group.ID
-		nwObj.Status.ResourcesManaged.IPV4Object.Name = firewall_group.Name
+		firewallGroup.Status.ResourcesManaged.IPV4Object.Name = firewall_group.Name
 	}
 	if len(ipv6) > 0 && !ipv6_done {
 		log.Info(fmt.Sprintf("Creating %s", ipv6_name))
@@ -472,8 +619,8 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 		} else {
 			firewall_group = *firewall_group_result
 		}
-		nwObj.Status.ResourcesManaged.IPV6Object.ID = firewall_group.ID
+		firewallGroup.Status.ResourcesManaged.IPV6Object.ID = firewall_group.ID
-		nwObj.Status.ResourcesManaged.IPV6Object.Name = firewall_group.Name
+		firewallGroup.Status.ResourcesManaged.IPV6Object.Name = firewall_group.Name
 
 	}
 	if len(tcpports) > 0 && !tcpports_done {
@@ -491,8 +638,8 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 		} else {
 			firewall_group = *firewall_group_result
 		}
-		nwObj.Status.ResourcesManaged.TCPPortsObject.ID = firewall_group.ID
+		firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID = firewall_group.ID
-		nwObj.Status.ResourcesManaged.TCPPortsObject.Name = firewall_group.Name
+		firewallGroup.Status.ResourcesManaged.TCPPortsObject.Name = firewall_group.Name
 	}
 	if len(udpports) > 0 && !udpports_done {
 		log.Info(fmt.Sprintf("Creating %s", udpports_name))
@@ -510,11 +657,11 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 		} else {
 			firewall_group = *firewall_group_result
 		}
-		nwObj.Status.ResourcesManaged.UDPPortsObject.ID = firewall_group.ID
+		firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID = firewall_group.ID
-		nwObj.Status.ResourcesManaged.UDPPortsObject.Name = firewall_group.Name
+		firewallGroup.Status.ResourcesManaged.UDPPortsObject.Name = firewall_group.Name
 	}
-	log.Info(fmt.Sprintf("Updating status for %s: %+v", nwObj.Name, nwObj.Status))
+	log.Info(fmt.Sprintf("Updating status for %s: %+v", firewallGroup.Name, firewallGroup.Status))
-	if err := r.Status().Update(ctx, &nwObj); err != nil {
+	if err := r.Status().Update(ctx, &firewallGroup); err != nil {
 		log.Error(err, "unable to update FirewallGroup status")
 		return reconcile.Result{}, err
 	}
@@ -539,15 +686,15 @@ func (r *FirewallGroupReconciler) mapServiceToFirewallGroups(ctx context.Context
 		return nil
 	}
 
-	for _, fwg := range allFirewallGroups.Items {
+	for _, firewallGroup := range allFirewallGroups.Items {
-		if fwg.Spec.MatchServicesInAllNamespaces || fwg.Namespace == service.Namespace {
+		if firewallGroup.Spec.MatchServicesInAllNamespaces || firewallGroup.Namespace == service.Namespace {
 			annotationKey := "unifi.engen.priv.no/firewall-group"
-			annotationVal := fwg.Name
+			annotationVal := firewallGroup.Name
 			if val, ok := service.Annotations[annotationKey]; ok && (annotationVal == "" || val == annotationVal) {
 				requests = append(requests, ctrl.Request{
 					NamespacedName: types.NamespacedName{
-						Name:      fwg.Name,
+						Name:      firewallGroup.Name,
-						Namespace: fwg.Namespace,
+						Namespace: firewallGroup.Namespace,
 					},
 				})
 			}

internal/controller/firewallrule_controller.go

@@ -22,12 +22,14 @@ import (
 	// "strings"
 	"encoding/json"
 	"time"
+	"strings"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
@@ -45,6 +47,8 @@ type FirewallRuleReconciler struct {
 	ConfigLoader *config.ConfigLoaderType
 }
 
+const firewallRuleFinalizer = "finalizer.unifi.engen.priv.no/firewallrule"
+
 // +kubebuilder:rbac:groups=unifi.engen.priv.no,resources=firewallrules,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=unifi.engen.priv.no,resources=firewallrules/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups=unifi.engen.priv.no,resources=firewallrules/finalizers,verbs=update
@@ -115,6 +119,101 @@ func (r *FirewallRuleReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	}
 	log.Info(firewallRule.Spec.Name)
 
+	if firewallRule.DeletionTimestamp != nil {
+		if controllerutil.ContainsFinalizer(&firewallRule, firewallRuleFinalizer) {
+			err := r.UnifiClient.Reauthenticate()
+			if err != nil {
+				return ctrl.Result{}, err
+			}
+			log.Info("Running finalizer logic for FirewallRule", "name", firewallRule.Name)
+
+			if len(firewallRule.Status.ResourcesManaged.UnifiFirewallRules) > 0 {
+				for i, UnifiFirewallRule := range firewallRule.Status.ResourcesManaged.UnifiFirewallRules {
+					log.Info(fmt.Sprintf("From: %s to: %s TcpIpv4: %s UdpIpv4: %s TcpIpv6: %s UdpIpv6: %s", UnifiFirewallRule.From, UnifiFirewallRule.To, UnifiFirewallRule.TcpIpv4ID, UnifiFirewallRule.UdpIpv4ID, UnifiFirewallRule.TcpIpv6ID, UnifiFirewallRule.UdpIpv6ID))
+					if len(UnifiFirewallRule.TcpIpv4ID) > 0 {
+						err := r.UnifiClient.Client.DeleteFirewallPolicy(context.Background(), r.UnifiClient.SiteID, UnifiFirewallRule.TcpIpv4ID)
+						if err != nil && !strings.Contains(err.Error(), "not found") {
+						} else {
+							firewallRule.Status.ResourcesManaged.UnifiFirewallRules[i].TcpIpv4ID = ""
+							if err := r.Status().Update(ctx, &firewallRule); err != nil {
+								return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
+							}
+						}
+					}
+					if len(UnifiFirewallRule.UdpIpv4ID) > 0 {
+						err := r.UnifiClient.Client.DeleteFirewallPolicy(context.Background(), r.UnifiClient.SiteID, UnifiFirewallRule.UdpIpv4ID)
+						if err != nil && !strings.Contains(err.Error(), "not found") {
+							return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
+						} else {
+							firewallRule.Status.ResourcesManaged.UnifiFirewallRules[i].UdpIpv4ID = ""
+							if err := r.Status().Update(ctx, &firewallRule); err != nil {
+								return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
+							}
+						}
+					}
+					if len(UnifiFirewallRule.TcpIpv6ID) > 0 {
+						err := r.UnifiClient.Client.DeleteFirewallPolicy(context.Background(), r.UnifiClient.SiteID, UnifiFirewallRule.TcpIpv6ID)
+						if err != nil && !strings.Contains(err.Error(), "not found") {
+							return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
+						} else {
+							firewallRule.Status.ResourcesManaged.UnifiFirewallRules[i].TcpIpv6ID = ""
+							if err := r.Status().Update(ctx, &firewallRule); err != nil {
+								return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
+							}
+						}
+					}
+					if len(UnifiFirewallRule.UdpIpv6ID) > 0 {
+						err := r.UnifiClient.Client.DeleteFirewallPolicy(context.Background(), r.UnifiClient.SiteID, UnifiFirewallRule.UdpIpv6ID)
+						if err != nil && !strings.Contains(err.Error(), "not found") {
+							return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
+						} else {
+							firewallRule.Status.ResourcesManaged.UnifiFirewallRules[i].UdpIpv6ID = ""
+							if err := r.Status().Update(ctx, &firewallRule); err != nil {
+								return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
+							}
+						}
+					}
+				}
+			}
+
+			if len(firewallRule.Status.ResourcesManaged.FirewallGroups) > 0 {
+				for i, firewallGroup := range firewallRule.Status.ResourcesManaged.FirewallGroups {
+					var firewallGroupCRD unifiv1beta1.FirewallGroup
+					if firewallGroup.Name != "" {
+						if err := r.Get(ctx, types.NamespacedName{Name: firewallGroup.Name, Namespace: firewallGroup.Namespace}, &firewallGroupCRD); err != nil {
+							return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
+						}
+						if err := r.Delete(ctx, &firewallGroupCRD); err != nil {
+							log.Error(err, "Could not delete firewall group")
+							return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
+						}
+						firewallRule.Status.ResourcesManaged.FirewallGroups[i].Name = ""
+						firewallRule.Status.ResourcesManaged.FirewallGroups[i].Namespace = ""
+						if err := r.Status().Update(ctx, &firewallRule); err != nil {
+							return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
+						}
+					}
+				}
+			}
+			controllerutil.RemoveFinalizer(&firewallRule, firewallRuleFinalizer)
+			if err := r.Update(ctx, &firewallRule); err != nil {
+				return ctrl.Result{}, err
+			}
+
+			log.Info("Successfully finalized FirewallGroup")
+		}
+		return ctrl.Result{}, nil
+	}
+	if !controllerutil.ContainsFinalizer(&firewallRule, firewallRuleFinalizer) {
+		controllerutil.AddFinalizer(&firewallRule, firewallRuleFinalizer)
+		if err := r.Update(ctx, &firewallRule); err != nil {
+			return ctrl.Result{}, err
+		}
+	}
+
+	firewallruleindex := make(map[string]int)
+
+	nextIndex := 0
 	if firewallRule.Status.ResourcesManaged == nil {
 		firewallGroupsManaged := []unifiv1beta1.FirewallGroupEntry{}
 		unifiFirewallRules := []unifiv1beta1.UnifiFirewallRuleEntry{}
@@ -122,6 +221,11 @@ func (r *FirewallRuleReconciler) Reconcile(ctx context.Context, req ctrl.Request
 			UnifiFirewallRules: unifiFirewallRules,
 			FirewallGroups:     firewallGroupsManaged,
 		}
+	} else {
+		for index, firewallRuleEntry := range firewallRule.Status.ResourcesManaged.UnifiFirewallRules {
+			firewallruleindex[firewallRuleEntry.From+"/"+firewallRuleEntry.To] = index
+			nextIndex = nextIndex + 1
+		}
 	}
 	err = r.UnifiClient.Reauthenticate()
 	if err != nil {
@@ -258,9 +362,10 @@ func (r *FirewallRuleReconciler) Reconcile(ctx context.Context, req ctrl.Request
 				log.Error(err, fmt.Sprintf("Failed to create %s", createdFirewallGroupCRD.Name))
 				return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
 			} else {
+				time.Sleep(10 * time.Second)
 				_ = r.Get(ctx, types.NamespacedName{Name: createdFirewallGroupCRD.Name, Namespace: createdFirewallGroupCRD.Namespace}, &firewallGroupCRD)
 			}
-			log.Info("Adding %+v", firewallGroupCRD)
+			log.Info(fmt.Sprintf("Adding %+v", firewallGroupCRD))
 			myFirewallGroups = append(myFirewallGroups, firewallGroupCRD)
 			found := false
 			for _, managedFirewallGroup := range firewallRule.Status.ResourcesManaged.FirewallGroups {
@@ -296,35 +401,54 @@ func (r *FirewallRuleReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		if i, found := zoneCRDNames[namespace+"/"+zoneEntry.Name]; found {
 			log.Info(fmt.Sprintf("Creating firewallrules for %s", zoneCRDs.Items[i].Name))
 			for _, firewallGroup := range myFirewallGroups {
+				found := false
+				index, found := firewallruleindex["zone:"+zoneCRDs.Items[i].Name+"/"+firewallGroup.Name]
+				if !found {
+					firewallRuleEntry := unifiv1beta1.UnifiFirewallRuleEntry{
+						From:      "zone:" + zoneCRDs.Items[i].Name,
+						To:        firewallGroup.Name,
+						TcpIpv4ID: "",
+						UdpIpv4ID: "",
+						TcpIpv6ID: "",
+						UdpIpv6ID: "",
+					}
+					firewallRule.Status.ResourcesManaged.UnifiFirewallRules = append(firewallRule.Status.ResourcesManaged.UnifiFirewallRules, firewallRuleEntry)
+					index = nextIndex
+					nextIndex = nextIndex + 1
+				}
+
 				if len(firewallGroup.Status.ResolvedIPV4Addresses) > 0 {
 					if len(firewallGroup.Status.ResolvedTCPPorts) > 0 {
 						rulename := "k8s-fw-" + firewallRule.Name + "-" + zoneCRDs.Items[i].Name + "-" + firewallGroup.Name + "-ipv4-tcp"
 						if _, found := unifiFirewallruleNames[rulename]; !found {
 							log.Info(fmt.Sprintf("Creating ipv4 tcp firewallrule for %s to %s: %s", zoneCRDs.Items[i].Name, firewallGroup.Name, rulename))
-							firewallRule := fillDefaultRule()
+							unifiFirewallRule := fillDefaultRule()
-							firewallRule.Name = rulename
+							unifiFirewallRule.Name = rulename
-							firewallRule.Source.PortMatchingType = "ANY"
+							unifiFirewallRule.Source.PortMatchingType = "ANY"
-							firewallRule.Source.ZoneID = zoneCRDs.Items[i].Spec.ID
+							unifiFirewallRule.Source.ZoneID = zoneCRDs.Items[i].Spec.ID
-							firewallRule.Source.MatchingTarget = "ANY"
+							unifiFirewallRule.Source.MatchingTarget = "ANY"
-							firewallRule.Protocol = "tcp"
+							unifiFirewallRule.Protocol = "tcp"
-							firewallRule.IPVersion = "IPV4"
+							unifiFirewallRule.IPVersion = "IPV4"
-							firewallRule.Description = fmt.Sprintf("Allow tcp IPV4 from %s to %s", zoneCRDs.Items[i].Name, firewallGroup.Name)
+							unifiFirewallRule.Description = fmt.Sprintf("Allow tcp IPV4 from %s to %s", zoneCRDs.Items[i].Name, firewallGroup.Name)
-							firewallRule.Destination.MatchingTargetType = "OBJECT"
+							unifiFirewallRule.Destination.MatchingTargetType = "OBJECT"
-							firewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV4Object.ID
+							unifiFirewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV4Object.ID
-							firewallRule.Destination.MatchingTarget = "IP"
+							unifiFirewallRule.Destination.MatchingTarget = "IP"
-							firewallRule.Destination.PortMatchingType = "OBJECT"
+							unifiFirewallRule.Destination.PortMatchingType = "OBJECT"
-							firewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID
+							unifiFirewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID
-							firewallRule.Destination.ZoneID = kubernetesZoneID
+							unifiFirewallRule.Destination.ZoneID = kubernetesZoneID
 
-							log.Info(fmt.Sprintf("Trying to create firewall rule from zone  %s to %s: %+v", zoneCRDs.Items[i].Name, firewallGroup.Name, firewallRule))
+							log.Info(fmt.Sprintf("Trying to create firewall rule from zone  %s to %s: %+v", zoneCRDs.Items[i].Name, firewallGroup.Name, unifiFirewallRule))
-							pretty, _ := json.MarshalIndent(firewallRule, "", "  ")
+							pretty, _ := json.MarshalIndent(unifiFirewallRule, "", "  ")
 							log.Info(string(pretty))
-							_, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &firewallRule)
+							updatedRule, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &unifiFirewallRule)
 							if err != nil {
 								log.Error(err, "Could not create firewall policy")
 								return ctrl.Result{}, err
 							}
-
+							firewallRule.Status.ResourcesManaged.UnifiFirewallRules[index].TcpIpv4ID = updatedRule.ID
+							if err = r.Status().Update(ctx, &firewallRule); err != nil {
+								return ctrl.Result{}, err
+							}
 						} else {
 							log.Info(fmt.Sprintf("Firewall rule for ipv4 tcp %s to %s already exists", zoneCRDs.Items[i].Name, firewallGroup.Name))
 						}
@@ -333,29 +457,33 @@ func (r *FirewallRuleReconciler) Reconcile(ctx context.Context, req ctrl.Request
 						rulename := "k8s-fw-" + firewallRule.Name + "-" + zoneCRDs.Items[i].Name + "-" + firewallGroup.Name + "-ipv4-udp"
 						if _, found := unifiFirewallruleNames[rulename]; !found {
 							log.Info(fmt.Sprintf("Creating ipv4 udp firewallrule for %s to %s: %s", zoneCRDs.Items[i].Name, firewallGroup.Name, rulename))
-							firewallRule := fillDefaultRule()
+							unifiFirewallRule := fillDefaultRule()
-							firewallRule.Name = rulename
+							unifiFirewallRule.Name = rulename
-							firewallRule.Source.PortMatchingType = "ANY"
+							unifiFirewallRule.Source.PortMatchingType = "ANY"
-							firewallRule.Source.ZoneID = zoneCRDs.Items[i].Spec.ID
+							unifiFirewallRule.Source.ZoneID = zoneCRDs.Items[i].Spec.ID
-							firewallRule.Source.MatchingTarget = "ANY"
+							unifiFirewallRule.Source.MatchingTarget = "ANY"
-							firewallRule.Protocol = "udp"
+							unifiFirewallRule.Protocol = "udp"
-							firewallRule.IPVersion = "IPV4"
+							unifiFirewallRule.IPVersion = "IPV4"
-							firewallRule.Description = fmt.Sprintf("Allow udp IPV4 from %s to %s", zoneCRDs.Items[i].Name, firewallGroup.Name)
+							unifiFirewallRule.Description = fmt.Sprintf("Allow udp IPV4 from %s to %s", zoneCRDs.Items[i].Name, firewallGroup.Name)
-							firewallRule.Destination.MatchingTargetType = "OBJECT"
+							unifiFirewallRule.Destination.MatchingTargetType = "OBJECT"
-							firewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV4Object.ID
+							unifiFirewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV4Object.ID
-							firewallRule.Destination.MatchingTarget = "IP"
+							unifiFirewallRule.Destination.MatchingTarget = "IP"
-							firewallRule.Destination.PortMatchingType = "OBJECT"
+							unifiFirewallRule.Destination.PortMatchingType = "OBJECT"
-							firewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID
+							unifiFirewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID
-							firewallRule.Destination.ZoneID = kubernetesZoneID
+							unifiFirewallRule.Destination.ZoneID = kubernetesZoneID
 
-							log.Info(fmt.Sprintf("Trying to create firewall rule from zone  %s to %s: %+v", zoneCRDs.Items[i].Name, firewallGroup.Name, firewallRule))
+							log.Info(fmt.Sprintf("Trying to create firewall rule from zone  %s to %s: %+v", zoneCRDs.Items[i].Name, firewallGroup.Name, unifiFirewallRule))
-							pretty, _ := json.MarshalIndent(firewallRule, "", "  ")
+							pretty, _ := json.MarshalIndent(unifiFirewallRule, "", "  ")
 							log.Info(string(pretty))
-							_, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &firewallRule)
+							updatedRule, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &unifiFirewallRule)
 							if err != nil {
 								log.Error(err, "Could not create firewall policy")
 								return ctrl.Result{}, err
 							}
+							firewallRule.Status.ResourcesManaged.UnifiFirewallRules[index].UdpIpv4ID = updatedRule.ID
+							if err := r.Status().Update(ctx, &firewallRule); err != nil {
+								return ctrl.Result{}, err
+							}
 
 						} else {
 							log.Info(fmt.Sprintf("Firewall rule for ipv4 udp %s to %s already exists", zoneCRDs.Items[i].Name, firewallGroup.Name))
@@ -367,29 +495,33 @@ func (r *FirewallRuleReconciler) Reconcile(ctx context.Context, req ctrl.Request
 						rulename := "k8s-fw-" + firewallRule.Name + "-" + zoneCRDs.Items[i].Name + "-" + firewallGroup.Name + "-ipv6-tcp"
 						if _, found := unifiFirewallruleNames[rulename]; !found {
 							log.Info(fmt.Sprintf("Creating ipv6 tcp firewallrule for %s to %s: %s", zoneCRDs.Items[i].Name, firewallGroup.Name, rulename))
-							firewallRule := fillDefaultRule()
+							unifiFirewallRule := fillDefaultRule()
-							firewallRule.Name = rulename
+							unifiFirewallRule.Name = rulename
-							firewallRule.Source.PortMatchingType = "ANY"
+							unifiFirewallRule.Source.PortMatchingType = "ANY"
-							firewallRule.Source.ZoneID = zoneCRDs.Items[i].Spec.ID
+							unifiFirewallRule.Source.ZoneID = zoneCRDs.Items[i].Spec.ID
-							firewallRule.Source.MatchingTarget = "ANY"
+							unifiFirewallRule.Source.MatchingTarget = "ANY"
-							firewallRule.Protocol = "tcp"
+							unifiFirewallRule.Protocol = "tcp"
-							firewallRule.IPVersion = "IPV6"
+							unifiFirewallRule.IPVersion = "IPV6"
-							firewallRule.Description = fmt.Sprintf("Allow tcp IPV6 from %s to %s", zoneCRDs.Items[i].Name, firewallGroup.Name)
+							unifiFirewallRule.Description = fmt.Sprintf("Allow tcp IPV6 from %s to %s", zoneCRDs.Items[i].Name, firewallGroup.Name)
-							firewallRule.Destination.MatchingTargetType = "OBJECT"
+							unifiFirewallRule.Destination.MatchingTargetType = "OBJECT"
-							firewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV6Object.ID
+							unifiFirewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV6Object.ID
-							firewallRule.Destination.MatchingTarget = "IP"
+							unifiFirewallRule.Destination.MatchingTarget = "IP"
-							firewallRule.Destination.PortMatchingType = "OBJECT"
+							unifiFirewallRule.Destination.PortMatchingType = "OBJECT"
-							firewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID
+							unifiFirewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID
-							firewallRule.Destination.ZoneID = kubernetesZoneID
+							unifiFirewallRule.Destination.ZoneID = kubernetesZoneID
 
-							log.Info(fmt.Sprintf("Trying to create firewall rule from zone  %s to %s: %+v", zoneCRDs.Items[i].Name, firewallGroup.Name, firewallRule))
+							log.Info(fmt.Sprintf("Trying to create firewall rule from zone  %s to %s: %+v", zoneCRDs.Items[i].Name, firewallGroup.Name, unifiFirewallRule))
-							pretty, _ := json.MarshalIndent(firewallRule, "", "  ")
+							pretty, _ := json.MarshalIndent(unifiFirewallRule, "", "  ")
 							log.Info(string(pretty))
-							_, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &firewallRule)
+							updatedRule, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &unifiFirewallRule)
 							if err != nil {
 								log.Error(err, "Could not create firewall policy")
 								return ctrl.Result{}, err
 							}
+							firewallRule.Status.ResourcesManaged.UnifiFirewallRules[index].TcpIpv6ID = updatedRule.ID
+							if err := r.Status().Update(ctx, &firewallRule); err != nil {
+								return ctrl.Result{}, err
+							}
 
 						} else {
 							log.Info(fmt.Sprintf("Firewall rule for ipv6 tcp %s to %s already exists", zoneCRDs.Items[i].Name, firewallGroup.Name))
@@ -399,29 +531,33 @@ func (r *FirewallRuleReconciler) Reconcile(ctx context.Context, req ctrl.Request
 						rulename := "k8s-fw-" + firewallRule.Name + "-" + zoneCRDs.Items[i].Name + "-" + firewallGroup.Name + "-ipv6-udp"
 						if _, found := unifiFirewallruleNames[rulename]; !found {
 							log.Info(fmt.Sprintf("Creating ipv6 udp firewallrule for %s to %s: %s", zoneCRDs.Items[i].Name, firewallGroup.Name, rulename))
-							firewallRule := fillDefaultRule()
+							unifiFirewallRule := fillDefaultRule()
-							firewallRule.Name = rulename
+							unifiFirewallRule.Name = rulename
-							firewallRule.Source.PortMatchingType = "ANY"
+							unifiFirewallRule.Source.PortMatchingType = "ANY"
-							firewallRule.Source.ZoneID = zoneCRDs.Items[i].Spec.ID
+							unifiFirewallRule.Source.ZoneID = zoneCRDs.Items[i].Spec.ID
-							firewallRule.Source.MatchingTarget = "ANY"
+							unifiFirewallRule.Source.MatchingTarget = "ANY"
-							firewallRule.Protocol = "udp"
+							unifiFirewallRule.Protocol = "udp"
-							firewallRule.IPVersion = "IPV6"
+							unifiFirewallRule.IPVersion = "IPV6"
-							firewallRule.Description = fmt.Sprintf("Allow udp IPV6 from %s to %s", zoneCRDs.Items[i].Name, firewallGroup.Name)
+							unifiFirewallRule.Description = fmt.Sprintf("Allow udp IPV6 from %s to %s", zoneCRDs.Items[i].Name, firewallGroup.Name)
-							firewallRule.Destination.MatchingTargetType = "OBJECT"
+							unifiFirewallRule.Destination.MatchingTargetType = "OBJECT"
-							firewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV6Object.ID
+							unifiFirewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV6Object.ID
-							firewallRule.Destination.MatchingTarget = "IP"
+							unifiFirewallRule.Destination.MatchingTarget = "IP"
-							firewallRule.Destination.PortMatchingType = "OBJECT"
+							unifiFirewallRule.Destination.PortMatchingType = "OBJECT"
-							firewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID
+							unifiFirewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID
-							firewallRule.Destination.ZoneID = kubernetesZoneID
+							unifiFirewallRule.Destination.ZoneID = kubernetesZoneID
 
-							log.Info(fmt.Sprintf("Trying to create firewall rule from zone  %s to %s: %+v", zoneCRDs.Items[i].Name, firewallGroup.Name, firewallRule))
+							log.Info(fmt.Sprintf("Trying to create firewall rule from zone  %s to %s: %+v", zoneCRDs.Items[i].Name, firewallGroup.Name, unifiFirewallRule))
-							pretty, _ := json.MarshalIndent(firewallRule, "", "  ")
+							pretty, _ := json.MarshalIndent(unifiFirewallRule, "", "  ")
 							log.Info(string(pretty))
-							_, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &firewallRule)
+							updatedRule, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &unifiFirewallRule)
 							if err != nil {
 								log.Error(err, "Could not create firewall policy")
 								return ctrl.Result{}, err
 							}
+							firewallRule.Status.ResourcesManaged.UnifiFirewallRules[index].UdpIpv6ID = updatedRule.ID
+							if err := r.Status().Update(ctx, &firewallRule); err != nil {
+								return ctrl.Result{}, err
+							}
 
 						} else {
 							log.Info(fmt.Sprintf("Firewall rule for ipv6 udp %s to %s already exists", zoneCRDs.Items[i].Name, firewallGroup.Name))
@@ -439,36 +575,54 @@ func (r *FirewallRuleReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		if i, found := networkCRDNames[namespace+"/"+networkEntry.Name]; found {
 			log.Info(fmt.Sprintf("Creating firewallrules for %s", networkCRDs.Items[i].Name))
 			for _, firewallGroup := range myFirewallGroups {
+				index, found := firewallruleindex["network:"+networkCRDs.Items[i].Name+"/"+firewallGroup.Name]
+				if !found {
+					firewallRuleEntry := unifiv1beta1.UnifiFirewallRuleEntry{
+						From:      "zone:" + networkCRDs.Items[i].Name,
+						To:        firewallGroup.Name,
+						TcpIpv4ID: "",
+						UdpIpv4ID: "",
+						TcpIpv6ID: "",
+						UdpIpv6ID: "",
+					}
+					firewallRule.Status.ResourcesManaged.UnifiFirewallRules = append(firewallRule.Status.ResourcesManaged.UnifiFirewallRules, firewallRuleEntry)
+					index = nextIndex
+					nextIndex = nextIndex + 1
+				}
 				if len(firewallGroup.Status.ResolvedIPV4Addresses) > 0 {
 					if len(firewallGroup.Status.ResolvedTCPPorts) > 0 {
 						rulename := "k8s-fw-" + firewallRule.Name + "-" + networkCRDs.Items[i].Name + "-" + firewallGroup.Name + "-ipv4-tcp"
 						if _, found := unifiFirewallruleNames[rulename]; !found {
 							log.Info(fmt.Sprintf("Creating ipv4 tcp firewallrule for %s to %s: %s", networkCRDs.Items[i].Name, firewallGroup.Name, rulename))
-							firewallRule := fillDefaultRule()
+							unifiFirewallRule := fillDefaultRule()
-							firewallRule.Name = rulename
+							unifiFirewallRule.Name = rulename
-							firewallRule.Source.NetworkIDs = []string{networkCRDs.Items[i].Spec.ID}
+							unifiFirewallRule.Source.NetworkIDs = []string{networkCRDs.Items[i].Spec.ID}
-							firewallRule.Source.PortMatchingType = "ANY"
+							unifiFirewallRule.Source.PortMatchingType = "ANY"
-							firewallRule.Source.ZoneID = networkCRDs.Items[i].Status.FirewallZoneID
+							unifiFirewallRule.Source.ZoneID = networkCRDs.Items[i].Status.FirewallZoneID
-							firewallRule.Source.MatchingTarget = "NETWORK"
+							unifiFirewallRule.Source.MatchingTarget = "NETWORK"
-							firewallRule.Protocol = "tcp"
+							unifiFirewallRule.Protocol = "tcp"
-							firewallRule.IPVersion = "IPV4"
+							unifiFirewallRule.IPVersion = "IPV4"
-							firewallRule.Description = fmt.Sprintf("Allow tcp IPV4 from %s to %s", networkCRDs.Items[i].Name, firewallGroup.Name)
+							unifiFirewallRule.Description = fmt.Sprintf("Allow tcp IPV4 from %s to %s", networkCRDs.Items[i].Name, firewallGroup.Name)
-							firewallRule.Destination.MatchingTargetType = "OBJECT"
+							unifiFirewallRule.Destination.MatchingTargetType = "OBJECT"
-							firewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV4Object.ID
+							unifiFirewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV4Object.ID
-							firewallRule.Destination.MatchingTarget = "IP"
+							unifiFirewallRule.Destination.MatchingTarget = "IP"
-							firewallRule.Destination.PortMatchingType = "OBJECT"
+							unifiFirewallRule.Destination.PortMatchingType = "OBJECT"
-							firewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID
+							unifiFirewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID
-							firewallRule.Destination.ZoneID = kubernetesZoneID
+							unifiFirewallRule.Destination.ZoneID = kubernetesZoneID
 
-							log.Info(fmt.Sprintf("Trying to create firewall rule from network  %s to %s: %+v", networkCRDs.Items[i].Name, firewallGroup.Name, firewallRule))
+							log.Info(fmt.Sprintf("Trying to create firewall rule from network  %s to %s: %+v", networkCRDs.Items[i].Name, firewallGroup.Name, unifiFirewallRule))
-							pretty, _ := json.MarshalIndent(firewallRule, "", "  ")
+							pretty, _ := json.MarshalIndent(unifiFirewallRule, "", "  ")
 							log.Info(string(pretty))
-							_, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &firewallRule)
+							updatedRule, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &unifiFirewallRule)
 							if err != nil {
 								log.Error(err, "Could not create firewall policy")
 								return ctrl.Result{}, err
 							}
 
+							firewallRule.Status.ResourcesManaged.UnifiFirewallRules[index].TcpIpv4ID = updatedRule.ID
+							if err := r.Status().Update(ctx, &firewallRule); err != nil {
+								return ctrl.Result{}, err
+							}
 						} else {
 							log.Info(fmt.Sprintf("Firewall rule for ipv4 tcp %s to %s already exists", networkCRDs.Items[i].Name, firewallGroup.Name))
 						}
@@ -477,30 +631,34 @@ func (r *FirewallRuleReconciler) Reconcile(ctx context.Context, req ctrl.Request
 						rulename := "k8s-fw-" + firewallRule.Name + "-" + networkCRDs.Items[i].Name + "-" + firewallGroup.Name + "-ipv4-udp"
 						if _, found := unifiFirewallruleNames[rulename]; !found {
 							log.Info(fmt.Sprintf("Creating ipv4 udp firewallrule for %s to %s: %s", networkCRDs.Items[i].Name, firewallGroup.Name, rulename))
-							firewallRule := fillDefaultRule()
+							unifiFirewallRule := fillDefaultRule()
-							firewallRule.Name = rulename
+							unifiFirewallRule.Name = rulename
-							firewallRule.Source.NetworkIDs = []string{networkCRDs.Items[i].Spec.ID}
+							unifiFirewallRule.Source.NetworkIDs = []string{networkCRDs.Items[i].Spec.ID}
-							firewallRule.Source.PortMatchingType = "ANY"
+							unifiFirewallRule.Source.PortMatchingType = "ANY"
-							firewallRule.Source.ZoneID = networkCRDs.Items[i].Status.FirewallZoneID
+							unifiFirewallRule.Source.ZoneID = networkCRDs.Items[i].Status.FirewallZoneID
-							firewallRule.Source.MatchingTarget = "NETWORK"
+							unifiFirewallRule.Source.MatchingTarget = "NETWORK"
-							firewallRule.Protocol = "udp"
+							unifiFirewallRule.Protocol = "udp"
-							firewallRule.IPVersion = "IPV4"
+							unifiFirewallRule.IPVersion = "IPV4"
-							firewallRule.Description = fmt.Sprintf("Allow udp IPV4 from %s to %s", networkCRDs.Items[i].Name, firewallGroup.Name)
+							unifiFirewallRule.Description = fmt.Sprintf("Allow udp IPV4 from %s to %s", networkCRDs.Items[i].Name, firewallGroup.Name)
-							firewallRule.Destination.MatchingTargetType = "OBJECT"
+							unifiFirewallRule.Destination.MatchingTargetType = "OBJECT"
-							firewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV4Object.ID
+							unifiFirewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV4Object.ID
-							firewallRule.Destination.MatchingTarget = "IP"
+							unifiFirewallRule.Destination.MatchingTarget = "IP"
-							firewallRule.Destination.PortMatchingType = "OBJECT"
+							unifiFirewallRule.Destination.PortMatchingType = "OBJECT"
-							firewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID
+							unifiFirewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID
-							firewallRule.Destination.ZoneID = kubernetesZoneID
+							unifiFirewallRule.Destination.ZoneID = kubernetesZoneID
 
-							log.Info(fmt.Sprintf("Trying to create firewall rule from network  %s to %s: %+v", networkCRDs.Items[i].Name, firewallGroup.Name, firewallRule))
+							log.Info(fmt.Sprintf("Trying to create firewall rule from network  %s to %s: %+v", networkCRDs.Items[i].Name, firewallGroup.Name, unifiFirewallRule))
-							pretty, _ := json.MarshalIndent(firewallRule, "", "  ")
+							pretty, _ := json.MarshalIndent(unifiFirewallRule, "", "  ")
 							log.Info(string(pretty))
-							_, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &firewallRule)
+							updatedRule, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &unifiFirewallRule)
 							if err != nil {
 								log.Error(err, "Could not create firewall policy")
 								return ctrl.Result{}, err
 							}
+							firewallRule.Status.ResourcesManaged.UnifiFirewallRules[index].UdpIpv4ID = updatedRule.ID
+							if err := r.Status().Update(ctx, &firewallRule); err != nil {
+								return ctrl.Result{}, err
+							}
 
 						} else {
 							log.Info(fmt.Sprintf("Firewall rule for ipv4 udp %s to %s already exists", networkCRDs.Items[i].Name, firewallGroup.Name))
@@ -512,30 +670,34 @@ func (r *FirewallRuleReconciler) Reconcile(ctx context.Context, req ctrl.Request
 						rulename := "k8s-fw-" + firewallRule.Name + "-" + networkCRDs.Items[i].Name + "-" + firewallGroup.Name + "-ipv6-tcp"
 						if _, found := unifiFirewallruleNames[rulename]; !found {
 							log.Info(fmt.Sprintf("Creating ipv6 tcp firewallrule for %s to %s: %s", networkCRDs.Items[i].Name, firewallGroup.Name, rulename))
-							firewallRule := fillDefaultRule()
+							unifiFirewallRule := fillDefaultRule()
-							firewallRule.Name = rulename
+							unifiFirewallRule.Name = rulename
-							firewallRule.Source.NetworkIDs = []string{networkCRDs.Items[i].Spec.ID}
+							unifiFirewallRule.Source.NetworkIDs = []string{networkCRDs.Items[i].Spec.ID}
-							firewallRule.Source.PortMatchingType = "ANY"
+							unifiFirewallRule.Source.PortMatchingType = "ANY"
-							firewallRule.Source.ZoneID = networkCRDs.Items[i].Status.FirewallZoneID
+							unifiFirewallRule.Source.ZoneID = networkCRDs.Items[i].Status.FirewallZoneID
-							firewallRule.Source.MatchingTarget = "NETWORK"
+							unifiFirewallRule.Source.MatchingTarget = "NETWORK"
-							firewallRule.Protocol = "tcp"
+							unifiFirewallRule.Protocol = "tcp"
-							firewallRule.IPVersion = "IPV6"
+							unifiFirewallRule.IPVersion = "IPV6"
-							firewallRule.Description = fmt.Sprintf("Allow tcp IPV6 from %s to %s", networkCRDs.Items[i].Name, firewallGroup.Name)
+							unifiFirewallRule.Description = fmt.Sprintf("Allow tcp IPV6 from %s to %s", networkCRDs.Items[i].Name, firewallGroup.Name)
-							firewallRule.Destination.MatchingTargetType = "OBJECT"
+							unifiFirewallRule.Destination.MatchingTargetType = "OBJECT"
-							firewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV6Object.ID
+							unifiFirewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV6Object.ID
-							firewallRule.Destination.MatchingTarget = "IP"
+							unifiFirewallRule.Destination.MatchingTarget = "IP"
-							firewallRule.Destination.PortMatchingType = "OBJECT"
+							unifiFirewallRule.Destination.PortMatchingType = "OBJECT"
-							firewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID
+							unifiFirewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID
-							firewallRule.Destination.ZoneID = kubernetesZoneID
+							unifiFirewallRule.Destination.ZoneID = kubernetesZoneID
 
-							log.Info(fmt.Sprintf("Trying to create firewall rule from network  %s to %s: %+v", networkCRDs.Items[i].Name, firewallGroup.Name, firewallRule))
+							log.Info(fmt.Sprintf("Trying to create firewall rule from network  %s to %s: %+v", networkCRDs.Items[i].Name, firewallGroup.Name, unifiFirewallRule))
-							pretty, _ := json.MarshalIndent(firewallRule, "", "  ")
+							pretty, _ := json.MarshalIndent(unifiFirewallRule, "", "  ")
 							log.Info(string(pretty))
-							_, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &firewallRule)
+							updatedRule, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &unifiFirewallRule)
 							if err != nil {
 								log.Error(err, "Could not create firewall policy")
 								return ctrl.Result{}, err
 							}
+							firewallRule.Status.ResourcesManaged.UnifiFirewallRules[index].TcpIpv6ID = updatedRule.ID
+							if err := r.Status().Update(ctx, &firewallRule); err != nil {
+								return ctrl.Result{}, err
+							}
 
 						} else {
 							log.Info(fmt.Sprintf("Firewall rule for ipv6 tcp %s to %s already exists", networkCRDs.Items[i].Name, firewallGroup.Name))
@@ -545,30 +707,34 @@ func (r *FirewallRuleReconciler) Reconcile(ctx context.Context, req ctrl.Request
 						rulename := "k8s-fw-" + firewallRule.Name + "-" + networkCRDs.Items[i].Name + "-" + firewallGroup.Name + "-ipv6-udp"
 						if _, found := unifiFirewallruleNames[rulename]; !found {
 							log.Info(fmt.Sprintf("Creating ipv6 udp firewallrule for %s to %s: %s", networkCRDs.Items[i].Name, firewallGroup.Name, rulename))
-							firewallRule := fillDefaultRule()
+							unifiFirewallRule := fillDefaultRule()
-							firewallRule.Name = rulename
+							unifiFirewallRule.Name = rulename
-							firewallRule.Source.NetworkIDs = []string{networkCRDs.Items[i].Spec.ID}
+							unifiFirewallRule.Source.NetworkIDs = []string{networkCRDs.Items[i].Spec.ID}
-							firewallRule.Source.PortMatchingType = "ANY"
+							unifiFirewallRule.Source.PortMatchingType = "ANY"
-							firewallRule.Source.ZoneID = networkCRDs.Items[i].Status.FirewallZoneID
+							unifiFirewallRule.Source.ZoneID = networkCRDs.Items[i].Status.FirewallZoneID
-							firewallRule.Source.MatchingTarget = "NETWORK"
+							unifiFirewallRule.Source.MatchingTarget = "NETWORK"
-							firewallRule.Protocol = "udp"
+							unifiFirewallRule.Protocol = "udp"
-							firewallRule.IPVersion = "IPV6"
+							unifiFirewallRule.IPVersion = "IPV6"
-							firewallRule.Description = fmt.Sprintf("Allow udp IPV6 from %s to %s", networkCRDs.Items[i].Name, firewallGroup.Name)
+							unifiFirewallRule.Description = fmt.Sprintf("Allow udp IPV6 from %s to %s", networkCRDs.Items[i].Name, firewallGroup.Name)
-							firewallRule.Destination.MatchingTargetType = "OBJECT"
+							unifiFirewallRule.Destination.MatchingTargetType = "OBJECT"
-							firewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV6Object.ID
+							unifiFirewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV6Object.ID
-							firewallRule.Destination.MatchingTarget = "IP"
+							unifiFirewallRule.Destination.MatchingTarget = "IP"
-							firewallRule.Destination.PortMatchingType = "OBJECT"
+							unifiFirewallRule.Destination.PortMatchingType = "OBJECT"
-							firewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID
+							unifiFirewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID
-							firewallRule.Destination.ZoneID = kubernetesZoneID
+							unifiFirewallRule.Destination.ZoneID = kubernetesZoneID
 
-							log.Info(fmt.Sprintf("Trying to create firewall rule from network  %s to %s: %+v", networkCRDs.Items[i].Name, firewallGroup.Name, firewallRule))
+							log.Info(fmt.Sprintf("Trying to create firewall rule from network  %s to %s: %+v", networkCRDs.Items[i].Name, firewallGroup.Name, unifiFirewallRule))
-							pretty, _ := json.MarshalIndent(firewallRule, "", "  ")
+							pretty, _ := json.MarshalIndent(unifiFirewallRule, "", "  ")
 							log.Info(string(pretty))
-							_, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &firewallRule)
+							updatedRule, err := r.UnifiClient.Client.CreateFirewallPolicy(context.Background(), r.UnifiClient.SiteID, &unifiFirewallRule)
 							if err != nil {
 								log.Error(err, "Could not create firewall policy")
 								return ctrl.Result{}, err
 							}
+							firewallRule.Status.ResourcesManaged.UnifiFirewallRules[index].UdpIpv6ID = updatedRule.ID
+							if err := r.Status().Update(ctx, &firewallRule); err != nil {
+								return ctrl.Result{}, err
+							}
 
 						} else {
 							log.Info(fmt.Sprintf("Firewall rule for ipv6 udp %s to %s already exists", networkCRDs.Items[i].Name, firewallGroup.Name))