Fix reconciler logic.

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

api/v1beta1/common_types.go

@@ -0,0 +1,41 @@
+package v1beta1
+
+// EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
+// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
+
+// FirewallRuleSpec defines the desired state of FirewallRule.
+type NamedUnifiResource struct {
+	Name string `json:"name,omitempty"`
+	ID   string `json:"id,omitempty"`
+}
+
+type ServiceEntry struct {
+	Namespace string `json:"namespace,omitempty"`
+	Name      string `json:"name,omitempty"`
+}
+
+type FirewallGroupEntry struct {
+	Namespace string `json:"namespace,omitempty"`
+	Name      string `json:"name,omitempty"`
+}
+type FirewallZoneEntry struct {
+	Namespace string `json:"namespace,omitempty"`
+	Name      string `json:"name,omitempty"`
+}
+type FirewallRuleEntry struct {
+	Namespace string `json:"namespace,omitempty"`
+	Name      string `json:"name,omitempty"`
+}
+type NetworkEntry struct {
+	Namespace string `json:"namespace,omitempty"`
+	Name      string `json:"name,omitempty"`
+}
+type FirewallSource struct {
+	FirewallZones []FirewallZoneEntry `json:"from_zones,omitempty"`
+	Networks      []NetworkEntry      `json:"from_networks,omitempty"`
+}
+
+type FirewallDestination struct {
+	FirewallGroups []FirewallGroupEntry `json:"firewall_groups,omitempty"`
+	Services       []ServiceEntry       `json:"services,omitempty"`
+}

api/v1beta1/firewallgroup_types.go

@@ -24,28 +24,28 @@ import (
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
 // FirewallGroupSpec defines the desired state of FirewallGroup.
+
 type FirewallGroupSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
 	// Foo is an example field of FirewallGroup. Edit firewallgroup_types.go to remove/update
 	// Description is a human-readable explanation for the object
+	ID   string `json:"id,omitempty"`
 	Name string `json:"name,omitempty"`
 
 	MatchServicesInAllNamespaces bool `json:"matchServicesInAllNamespaces,omitempty"`
 	// ManualAddresses is a list of manual IPs or CIDRs (IPv4 or IPv6)
 	// +optional
-	ManualAddresses []string `json:"manualAddresses,omitempty"`
-	ManualPorts     []string `json:"manualPorts,omitempty"`
+	ManualAddresses []string       `json:"manualAddresses,omitempty"`
+	ManualPorts     []string       `json:"manualPorts,omitempty"`
+	ManualServices  []ServiceEntry `json:"manual_services,omitempty"`
+
+	AutoCreatedFrom FirewallRuleEntry `json:"auto_created_from,omitempty"`
 
 	// AutoIncludeSelector defines which services to extract addresses from
 	// +optional
 	AutoIncludeSelector *metav1.LabelSelector `json:"autoIncludeSelector,omitempty"`
-
-	// AddressType can be "ip", "cidr", or "both"
-	// +kubebuilder:validation:Enum=ip;cidr;both
-	// +optional
-	AddressType string `json:"addressType,omitempty"`
 }
 
 // FirewallGroupStatus defines the observed state of FirewallGroup.
@@ -53,17 +53,29 @@ type FirewallGroupStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
-	ResolvedAddresses []string `json:"resolvedAddresses,omitempty"`
+	ResolvedIPV4Addresses []string `json:"resolvedIPV4Addresses,omitempty"`
+	ResolvedIPV6Addresses []string `json:"resolvedIPV6Addresses,omitempty"`
+	ResolvedTCPPorts      []string `json:"resolvedTCPorts,omitempty"`
+	ResolvedUDPPorts      []string `json:"resolvedUDPorts,omitempty"`
 
 	// SyncedWithUnifi indicates whether the addresses are successfully pushed
 	// +optional
 	SyncedWithUnifi bool `json:"syncedWithUnifi,omitempty"`
 
+	ResourcesManaged *FirewallGroupResourcesManaged `json:"resources_managed,omitempty"`
+
 	// LastSyncTime is the last time the object was synced
 	// +optional
 	LastSyncTime *metav1.Time `json:"lastSyncTime,omitempty"`
 }
 
+type FirewallGroupResourcesManaged struct {
+	IPV4Object     *NamedUnifiResource `json:"ipv4_object,omitempty"`
+	IPV6Object     *NamedUnifiResource `json:"ipv6_object,omitempty"`
+	TCPPortsObject *NamedUnifiResource `json:"tcp_ports_object,omitempty"`
+	UDPPortsObject *NamedUnifiResource `json:"udp_ports_object,omitempty"`
+}
+
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 

api/v1beta1/firewallrule_types.go

@@ -24,18 +24,46 @@ import (
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
 // FirewallRuleSpec defines the desired state of FirewallRule.
-type FirewallRuleSpec struct {
-	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
-	// Important: Run "make" to regenerate code after modifying this file
+// type ServiceSpec struct {
+// 	Namespace string `json:"namespace,omitempty"`
+// 	Name      string `json:"name,omitempty"`
+// }
 
-	// Foo is an example field of FirewallRule. Edit firewallrule_types.go to remove/update
-	Foo string `json:"foo,omitempty"`
+// type FirewallSource struct {
+//	Zones    []string `json:"from_zones,omitempty"`
+//	Networks []string `json:"from_networks,omitempty"`
+//}
+
+//type FirewallDestination struct {
+//	FirewallGroups []string      `json:"firewall_group,omitempty"`
+//	Services       []ServiceSpec `json:"service,omitempty"`
+//}
+
+type FirewallRuleSpec struct {
+	Name                               string              `json:"name"`
+	Source                             FirewallSource      `json:"source"`
+	Destination                        FirewallDestination `json:"destination"`
+	MatchFirewallGroupsInAllNamespaces bool                `json:"match_firewall_groups_in_all_namespaces,omitempty"`
+	MatchServicesInAllNamespaces       bool                `json:"match_services_in_all_namespaces,omitempty"`
 }
 
 // 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"`
+}
+
+type FirewallRuleResourcesManaged struct {
+	UnifiFirewallRules []UnifiFirewallRuleEntry `json:"firewall_rules_managed,omitempty"`
+	FirewallGroups     []FirewallGroupEntry     `json:"firewall_groups_managed,omitempty"`
+}
+
+type UnifiFirewallRuleEntry struct {
+	From      string `json:"from"`
+	To        string `json:"to"`
+	TcpIpv4ID string `json:"tcpipv4_id"`
+	UdpIpv4ID string `json:"udpipv4_id"`
+	TcpIpv6ID string `json:"tcpipv6_id"`
+	UdpIpv6ID string `json:"udpipv6_id"`
 }
 
 // +kubebuilder:object:root=true

api/v1beta1/firewallzone_types.go

@@ -39,6 +39,12 @@ type FirewallZoneSpec struct {
 type FirewallZoneStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
+
+	ResourcesManaged *FirewallZoneResourcesManaged `json:"resources_managed,omitempty"`
+}
+
+type FirewallZoneResourcesManaged struct {
+	UnifiFirewallZones []NamedUnifiResource `json:"firewall_zones_managed,omitempty"`
 }
 
 // +kubebuilder:object:root=true

api/v1beta1/networkconfiguration_types.go

@@ -58,11 +58,16 @@ type NetworkconfigurationStatus struct {
 	// +optional
 	SyncedWithUnifi bool `json:"syncedWithUnifi,omitempty"`
 
+	ResourcesManaged *NetworkconfigurationResourcesManaged `json:"resources_managed,omitempty"`
 	// LastSyncTime is the last time the object was synced
 	// +optional
 	LastSyncTime *metav1.Time `json:"lastSyncTime,omitempty"`
 }
 
+type NetworkconfigurationResourcesManaged struct {
+	UnifiNetworks []NamedUnifiResource `json:"networks_managed,omitempty"`
+}
+
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 

api/v1beta1/zz_generated.deepcopy.go

@@ -25,6 +25,31 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *FirewallDestination) DeepCopyInto(out *FirewallDestination) {
+	*out = *in
+	if in.FirewallGroups != nil {
+		in, out := &in.FirewallGroups, &out.FirewallGroups
+		*out = make([]FirewallGroupEntry, len(*in))
+		copy(*out, *in)
+	}
+	if in.Services != nil {
+		in, out := &in.Services, &out.Services
+		*out = make([]ServiceEntry, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallDestination.
+func (in *FirewallDestination) DeepCopy() *FirewallDestination {
+	if in == nil {
+		return nil
+	}
+	out := new(FirewallDestination)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *FirewallGroup) DeepCopyInto(out *FirewallGroup) {
 	*out = *in
@@ -52,6 +77,21 @@ func (in *FirewallGroup) DeepCopyObject() runtime.Object {
 	return nil
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *FirewallGroupEntry) DeepCopyInto(out *FirewallGroupEntry) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallGroupEntry.
+func (in *FirewallGroupEntry) DeepCopy() *FirewallGroupEntry {
+	if in == nil {
+		return nil
+	}
+	out := new(FirewallGroupEntry)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *FirewallGroupList) DeepCopyInto(out *FirewallGroupList) {
 	*out = *in
@@ -84,6 +124,41 @@ func (in *FirewallGroupList) DeepCopyObject() runtime.Object {
 	return nil
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *FirewallGroupResourcesManaged) DeepCopyInto(out *FirewallGroupResourcesManaged) {
+	*out = *in
+	if in.IPV4Object != nil {
+		in, out := &in.IPV4Object, &out.IPV4Object
+		*out = new(NamedUnifiResource)
+		**out = **in
+	}
+	if in.IPV6Object != nil {
+		in, out := &in.IPV6Object, &out.IPV6Object
+		*out = new(NamedUnifiResource)
+		**out = **in
+	}
+	if in.TCPPortsObject != nil {
+		in, out := &in.TCPPortsObject, &out.TCPPortsObject
+		*out = new(NamedUnifiResource)
+		**out = **in
+	}
+	if in.UDPPortsObject != nil {
+		in, out := &in.UDPPortsObject, &out.UDPPortsObject
+		*out = new(NamedUnifiResource)
+		**out = **in
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallGroupResourcesManaged.
+func (in *FirewallGroupResourcesManaged) DeepCopy() *FirewallGroupResourcesManaged {
+	if in == nil {
+		return nil
+	}
+	out := new(FirewallGroupResourcesManaged)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *FirewallGroupSpec) DeepCopyInto(out *FirewallGroupSpec) {
 	*out = *in
@@ -97,6 +172,12 @@ func (in *FirewallGroupSpec) DeepCopyInto(out *FirewallGroupSpec) {
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}
+	if in.ManualServices != nil {
+		in, out := &in.ManualServices, &out.ManualServices
+		*out = make([]ServiceEntry, len(*in))
+		copy(*out, *in)
+	}
+	out.AutoCreatedFrom = in.AutoCreatedFrom
 	if in.AutoIncludeSelector != nil {
 		in, out := &in.AutoIncludeSelector, &out.AutoIncludeSelector
 		*out = new(v1.LabelSelector)
@@ -117,11 +198,31 @@ func (in *FirewallGroupSpec) DeepCopy() *FirewallGroupSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *FirewallGroupStatus) DeepCopyInto(out *FirewallGroupStatus) {
 	*out = *in
-	if in.ResolvedAddresses != nil {
-		in, out := &in.ResolvedAddresses, &out.ResolvedAddresses
+	if in.ResolvedIPV4Addresses != nil {
+		in, out := &in.ResolvedIPV4Addresses, &out.ResolvedIPV4Addresses
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}
+	if in.ResolvedIPV6Addresses != nil {
+		in, out := &in.ResolvedIPV6Addresses, &out.ResolvedIPV6Addresses
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.ResolvedTCPPorts != nil {
+		in, out := &in.ResolvedTCPPorts, &out.ResolvedTCPPorts
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.ResolvedUDPPorts != nil {
+		in, out := &in.ResolvedUDPPorts, &out.ResolvedUDPPorts
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.ResourcesManaged != nil {
+		in, out := &in.ResourcesManaged, &out.ResourcesManaged
+		*out = new(FirewallGroupResourcesManaged)
+		(*in).DeepCopyInto(*out)
+	}
 	if in.LastSyncTime != nil {
 		in, out := &in.LastSyncTime, &out.LastSyncTime
 		*out = (*in).DeepCopy()
@@ -143,8 +244,8 @@ func (in *FirewallRule) DeepCopyInto(out *FirewallRule) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	out.Spec = in.Spec
-	out.Status = in.Status
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallRule.
@@ -165,6 +266,21 @@ func (in *FirewallRule) DeepCopyObject() runtime.Object {
 	return nil
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *FirewallRuleEntry) DeepCopyInto(out *FirewallRuleEntry) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallRuleEntry.
+func (in *FirewallRuleEntry) DeepCopy() *FirewallRuleEntry {
+	if in == nil {
+		return nil
+	}
+	out := new(FirewallRuleEntry)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *FirewallRuleList) DeepCopyInto(out *FirewallRuleList) {
 	*out = *in
@@ -197,9 +313,36 @@ func (in *FirewallRuleList) DeepCopyObject() runtime.Object {
 	return nil
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *FirewallRuleResourcesManaged) DeepCopyInto(out *FirewallRuleResourcesManaged) {
+	*out = *in
+	if in.UnifiFirewallRules != nil {
+		in, out := &in.UnifiFirewallRules, &out.UnifiFirewallRules
+		*out = make([]UnifiFirewallRuleEntry, len(*in))
+		copy(*out, *in)
+	}
+	if in.FirewallGroups != nil {
+		in, out := &in.FirewallGroups, &out.FirewallGroups
+		*out = make([]FirewallGroupEntry, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallRuleResourcesManaged.
+func (in *FirewallRuleResourcesManaged) DeepCopy() *FirewallRuleResourcesManaged {
+	if in == nil {
+		return nil
+	}
+	out := new(FirewallRuleResourcesManaged)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *FirewallRuleSpec) DeepCopyInto(out *FirewallRuleSpec) {
 	*out = *in
+	in.Source.DeepCopyInto(&out.Source)
+	in.Destination.DeepCopyInto(&out.Destination)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallRuleSpec.
@@ -215,6 +358,11 @@ func (in *FirewallRuleSpec) DeepCopy() *FirewallRuleSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *FirewallRuleStatus) DeepCopyInto(out *FirewallRuleStatus) {
 	*out = *in
+	if in.ResourcesManaged != nil {
+		in, out := &in.ResourcesManaged, &out.ResourcesManaged
+		*out = new(FirewallRuleResourcesManaged)
+		(*in).DeepCopyInto(*out)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallRuleStatus.
@@ -227,13 +375,38 @@ func (in *FirewallRuleStatus) DeepCopy() *FirewallRuleStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *FirewallSource) DeepCopyInto(out *FirewallSource) {
+	*out = *in
+	if in.FirewallZones != nil {
+		in, out := &in.FirewallZones, &out.FirewallZones
+		*out = make([]FirewallZoneEntry, len(*in))
+		copy(*out, *in)
+	}
+	if in.Networks != nil {
+		in, out := &in.Networks, &out.Networks
+		*out = make([]NetworkEntry, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallSource.
+func (in *FirewallSource) DeepCopy() *FirewallSource {
+	if in == nil {
+		return nil
+	}
+	out := new(FirewallSource)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *FirewallZone) DeepCopyInto(out *FirewallZone) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	in.Spec.DeepCopyInto(&out.Spec)
-	out.Status = in.Status
+	in.Status.DeepCopyInto(&out.Status)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallZone.
@@ -254,6 +427,21 @@ func (in *FirewallZone) DeepCopyObject() runtime.Object {
 	return nil
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *FirewallZoneEntry) DeepCopyInto(out *FirewallZoneEntry) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallZoneEntry.
+func (in *FirewallZoneEntry) DeepCopy() *FirewallZoneEntry {
+	if in == nil {
+		return nil
+	}
+	out := new(FirewallZoneEntry)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *FirewallZoneList) DeepCopyInto(out *FirewallZoneList) {
 	*out = *in
@@ -286,6 +474,26 @@ func (in *FirewallZoneList) DeepCopyObject() runtime.Object {
 	return nil
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *FirewallZoneResourcesManaged) DeepCopyInto(out *FirewallZoneResourcesManaged) {
+	*out = *in
+	if in.UnifiFirewallZones != nil {
+		in, out := &in.UnifiFirewallZones, &out.UnifiFirewallZones
+		*out = make([]NamedUnifiResource, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallZoneResourcesManaged.
+func (in *FirewallZoneResourcesManaged) DeepCopy() *FirewallZoneResourcesManaged {
+	if in == nil {
+		return nil
+	}
+	out := new(FirewallZoneResourcesManaged)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *FirewallZoneSpec) DeepCopyInto(out *FirewallZoneSpec) {
 	*out = *in
@@ -309,6 +517,11 @@ func (in *FirewallZoneSpec) DeepCopy() *FirewallZoneSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *FirewallZoneStatus) DeepCopyInto(out *FirewallZoneStatus) {
 	*out = *in
+	if in.ResourcesManaged != nil {
+		in, out := &in.ResourcesManaged, &out.ResourcesManaged
+		*out = new(FirewallZoneResourcesManaged)
+		(*in).DeepCopyInto(*out)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FirewallZoneStatus.
@@ -321,6 +534,36 @@ func (in *FirewallZoneStatus) DeepCopy() *FirewallZoneStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *NamedUnifiResource) DeepCopyInto(out *NamedUnifiResource) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NamedUnifiResource.
+func (in *NamedUnifiResource) DeepCopy() *NamedUnifiResource {
+	if in == nil {
+		return nil
+	}
+	out := new(NamedUnifiResource)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *NetworkEntry) DeepCopyInto(out *NetworkEntry) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NetworkEntry.
+func (in *NetworkEntry) DeepCopy() *NetworkEntry {
+	if in == nil {
+		return nil
+	}
+	out := new(NetworkEntry)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Networkconfiguration) DeepCopyInto(out *Networkconfiguration) {
 	*out = *in
@@ -380,6 +623,26 @@ func (in *NetworkconfigurationList) DeepCopyObject() runtime.Object {
 	return nil
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *NetworkconfigurationResourcesManaged) DeepCopyInto(out *NetworkconfigurationResourcesManaged) {
+	*out = *in
+	if in.UnifiNetworks != nil {
+		in, out := &in.UnifiNetworks, &out.UnifiNetworks
+		*out = make([]NamedUnifiResource, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NetworkconfigurationResourcesManaged.
+func (in *NetworkconfigurationResourcesManaged) DeepCopy() *NetworkconfigurationResourcesManaged {
+	if in == nil {
+		return nil
+	}
+	out := new(NetworkconfigurationResourcesManaged)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *NetworkconfigurationSpec) DeepCopyInto(out *NetworkconfigurationSpec) {
 	*out = *in
@@ -398,6 +661,11 @@ func (in *NetworkconfigurationSpec) DeepCopy() *NetworkconfigurationSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *NetworkconfigurationStatus) DeepCopyInto(out *NetworkconfigurationStatus) {
 	*out = *in
+	if in.ResourcesManaged != nil {
+		in, out := &in.ResourcesManaged, &out.ResourcesManaged
+		*out = new(NetworkconfigurationResourcesManaged)
+		(*in).DeepCopyInto(*out)
+	}
 	if in.LastSyncTime != nil {
 		in, out := &in.LastSyncTime, &out.LastSyncTime
 		*out = (*in).DeepCopy()
@@ -413,3 +681,33 @@ func (in *NetworkconfigurationStatus) DeepCopy() *NetworkconfigurationStatus {
 	in.DeepCopyInto(out)
 	return out
 }
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ServiceEntry) DeepCopyInto(out *ServiceEntry) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServiceEntry.
+func (in *ServiceEntry) DeepCopy() *ServiceEntry {
+	if in == nil {
+		return nil
+	}
+	out := new(ServiceEntry)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *UnifiFirewallRuleEntry) DeepCopyInto(out *UnifiFirewallRuleEntry) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UnifiFirewallRuleEntry.
+func (in *UnifiFirewallRuleEntry) DeepCopy() *UnifiFirewallRuleEntry {
+	if in == nil {
+		return nil
+	}
+	out := new(UnifiFirewallRuleEntry)
+	in.DeepCopyInto(out)
+	return out
+}

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

@@ -37,15 +37,14 @@ spec:
           metadata:
             type: object
           spec:
-            description: FirewallGroupSpec defines the desired state of FirewallGroup.
             properties:
-              addressType:
-                description: AddressType can be "ip", "cidr", or "both"
-                enum:
-                - ip
-                - cidr
-                - both
-                type: string
+              auto_created_from:
+                properties:
+                  name:
+                    type: string
+                  namespace:
+                    type: string
+                type: object
               autoIncludeSelector:
                 description: AutoIncludeSelector defines which services to extract
                   addresses from
@@ -93,6 +92,20 @@ spec:
                     type: object
                 type: object
                 x-kubernetes-map-type: atomic
+              id:
+                description: |-
+                  Foo is an example field of FirewallGroup. Edit firewallgroup_types.go to remove/update
+                  Description is a human-readable explanation for the object
+                type: string
+              manual_services:
+                items:
+                  properties:
+                    name:
+                      type: string
+                    namespace:
+                      type: string
+                  type: object
+                type: array
               manualAddresses:
                 description: ManualAddresses is a list of manual IPs or CIDRs (IPv4
                   or IPv6)
@@ -106,9 +119,6 @@ spec:
               matchServicesInAllNamespaces:
                 type: boolean
               name:
-                description: |-
-                  Foo is an example field of FirewallGroup. Edit firewallgroup_types.go to remove/update
-                  Description is a human-readable explanation for the object
                 type: string
             type: object
           status:
@@ -118,10 +128,57 @@ spec:
                 description: LastSyncTime is the last time the object was synced
                 format: date-time
                 type: string
-              resolvedAddresses:
+              resolvedIPV4Addresses:
                 items:
                   type: string
                 type: array
+              resolvedIPV6Addresses:
+                items:
+                  type: string
+                type: array
+              resolvedTCPorts:
+                items:
+                  type: string
+                type: array
+              resolvedUDPorts:
+                items:
+                  type: string
+                type: array
+              resources_managed:
+                properties:
+                  ipv4_object:
+                    description: FirewallRuleSpec defines the desired state of FirewallRule.
+                    properties:
+                      id:
+                        type: string
+                      name:
+                        type: string
+                    type: object
+                  ipv6_object:
+                    description: FirewallRuleSpec defines the desired state of FirewallRule.
+                    properties:
+                      id:
+                        type: string
+                      name:
+                        type: string
+                    type: object
+                  tcp_ports_object:
+                    description: FirewallRuleSpec defines the desired state of FirewallRule.
+                    properties:
+                      id:
+                        type: string
+                      name:
+                        type: string
+                    type: object
+                  udp_ports_object:
+                    description: FirewallRuleSpec defines the desired state of FirewallRule.
+                    properties:
+                      id:
+                        type: string
+                      name:
+                        type: string
+                    type: object
+                type: object
               syncedWithUnifi:
                 description: SyncedWithUnifi indicates whether the addresses are successfully
                   pushed

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

@@ -37,15 +37,99 @@ spec:
           metadata:
             type: object
           spec:
-            description: FirewallRuleSpec defines the desired state of FirewallRule.
             properties:
-              foo:
-                description: Foo is an example field of FirewallRule. Edit firewallrule_types.go
-                  to remove/update
+              destination:
+                properties:
+                  firewall_groups:
+                    items:
+                      properties:
+                        name:
+                          type: string
+                        namespace:
+                          type: string
+                      type: object
+                    type: array
+                  services:
+                    items:
+                      properties:
+                        name:
+                          type: string
+                        namespace:
+                          type: string
+                      type: object
+                    type: array
+                type: object
+              match_firewall_groups_in_all_namespaces:
+                type: boolean
+              match_services_in_all_namespaces:
+                type: boolean
+              name:
                 type: string
+              source:
+                properties:
+                  from_networks:
+                    items:
+                      properties:
+                        name:
+                          type: string
+                        namespace:
+                          type: string
+                      type: object
+                    type: array
+                  from_zones:
+                    items:
+                      properties:
+                        name:
+                          type: string
+                        namespace:
+                          type: string
+                      type: object
+                    type: array
+                type: object
+            required:
+            - destination
+            - name
+            - source
             type: object
           status:
             description: FirewallRuleStatus defines the observed state of FirewallRule.
+            properties:
+              resources_managed:
+                properties:
+                  firewall_groups_managed:
+                    items:
+                      properties:
+                        name:
+                          type: string
+                        namespace:
+                          type: string
+                      type: object
+                    type: array
+                  firewall_rules_managed:
+                    items:
+                      properties:
+                        from:
+                          type: string
+                        tcpipv4_id:
+                          type: string
+                        tcpipv6_id:
+                          type: string
+                        to:
+                          type: string
+                        udpipv4_id:
+                          type: string
+                        udpipv6_id:
+                          type: string
+                      required:
+                      - from
+                      - tcpipv4_id
+                      - tcpipv6_id
+                      - to
+                      - udpipv4_id
+                      - udpipv6_id
+                      type: object
+                    type: array
+                type: object
             type: object
         type: object
     served: true

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

@@ -54,6 +54,20 @@ spec:
             type: object
           status:
             description: FirewallZoneStatus defines the observed state of FirewallZone.
+            properties:
+              resources_managed:
+                properties:
+                  firewall_zones_managed:
+                    items:
+                      description: FirewallRuleSpec defines the desired state of FirewallRule.
+                      properties:
+                        id:
+                          type: string
+                        name:
+                          type: string
+                      type: object
+                    type: array
+                type: object
             type: object
         type: object
     served: true

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

@@ -93,6 +93,19 @@ spec:
                 description: LastSyncTime is the last time the object was synced
                 format: date-time
                 type: string
+              resources_managed:
+                properties:
+                  networks_managed:
+                    items:
+                      description: FirewallRuleSpec defines the desired state of FirewallRule.
+                      properties:
+                        id:
+                          type: string
+                        name:
+                          type: string
+                      type: object
+                    type: array
+                type: object
               syncedWithUnifi:
                 description: SyncedWithUnifi indicates whether the addresses are successfully
                   pushed

config/samples/unifi_v1beta1_firewallrule.yaml

@@ -6,4 +6,3 @@ metadata:
     app.kubernetes.io/managed-by: kustomize
   name: firewallrule-sample
 spec:
-  # TODO(user): Add fields here

go.mod

@@ -9,7 +9,7 @@ godebug default=go1.23
 require (
 	github.com/onsi/ginkgo/v2 v2.23.4
 	github.com/onsi/gomega v1.37.0
-	github.com/vegardengen/go-unifi v0.0.1-alpha9
+	github.com/vegardengen/go-unifi v0.0.1-alpha25
 	k8s.io/api v0.32.1
 	k8s.io/apimachinery v0.32.1
 	k8s.io/client-go v0.32.1

go.sum

@@ -1080,8 +1080,38 @@ github.com/vbatts/tar-split v0.11.5 h1:3bHCTIheBm1qFTcgh9oPu+nNBtX+XJIupG/vacinC
 github.com/vbatts/tar-split v0.11.5/go.mod h1:yZbwRsSeGjusneWgA781EKej9HF8vme8okylkAeNKLk=
 github.com/vegardengen/go-unifi v0.0.1-alpha1 h1:PF1Y4NH/bfk6A7PLGxiqAhQkrfPau0B1vSayfmqlbRM=
 github.com/vegardengen/go-unifi v0.0.1-alpha1/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
+github.com/vegardengen/go-unifi v0.0.1-alpha11 h1:+2eOU2jkJSji6YYVHUfQht/tjfGeLZCQlNGD2Oh7ndE=
+github.com/vegardengen/go-unifi v0.0.1-alpha11/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
+github.com/vegardengen/go-unifi v0.0.1-alpha12 h1:1g0JGmB1FivG0nU9EvZVyZkX5i+HR3qRGto0jk4k8hU=
+github.com/vegardengen/go-unifi v0.0.1-alpha12/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
+github.com/vegardengen/go-unifi v0.0.1-alpha13 h1:MEFYSlYGBmbSkxTAJ4i89iV2ji5wrvDsRgx4LmuCz3Y=
+github.com/vegardengen/go-unifi v0.0.1-alpha13/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
+github.com/vegardengen/go-unifi v0.0.1-alpha14 h1:O5vrSemL/XbX+9aNmovYNE0xAtdurVa3TawN2wBaUbs=
+github.com/vegardengen/go-unifi v0.0.1-alpha14/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
+github.com/vegardengen/go-unifi v0.0.1-alpha15 h1:qjmfOmxDBu8/pSKiWP7YQzh8qZEUUJ9S4vs93GjfeqM=
+github.com/vegardengen/go-unifi v0.0.1-alpha15/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
+github.com/vegardengen/go-unifi v0.0.1-alpha16 h1:OVVaOjYO8dh32fF1BQxSrRoV878ZBLtB/KQx9jIe9Ak=
+github.com/vegardengen/go-unifi v0.0.1-alpha16/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
+github.com/vegardengen/go-unifi v0.0.1-alpha17 h1:SoSStxP7CV+lxlKg2mqfadpXCQ2xhwRwM78sdxtPmKU=
+github.com/vegardengen/go-unifi v0.0.1-alpha17/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
+github.com/vegardengen/go-unifi v0.0.1-alpha18 h1:vUaALQmoRzP1z764GCzfQLt1IjnlG/ODJvNxx0B84D4=
+github.com/vegardengen/go-unifi v0.0.1-alpha18/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
+github.com/vegardengen/go-unifi v0.0.1-alpha19 h1:B1U2hXNT/6HHsw92oHElhwpuYvwIUCvCdQ5D/tOik4o=
+github.com/vegardengen/go-unifi v0.0.1-alpha19/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
 github.com/vegardengen/go-unifi v0.0.1-alpha2 h1:2aVWpzi+i1X4rVFLOphAp7ZoTvER/rySzvpdB5cul4I=
 github.com/vegardengen/go-unifi v0.0.1-alpha2/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
+github.com/vegardengen/go-unifi v0.0.1-alpha20 h1:kQ+QQ1IYGwvjLkoXYBEU4gSD2yQj+9FwHtMf7+GQlok=
+github.com/vegardengen/go-unifi v0.0.1-alpha20/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
+github.com/vegardengen/go-unifi v0.0.1-alpha21 h1:a+yPTu97ETRdkhmKltMrJTo28qA0GPWctPFyICLCUZw=
+github.com/vegardengen/go-unifi v0.0.1-alpha21/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
+github.com/vegardengen/go-unifi v0.0.1-alpha22 h1:2axPhv/S6bawsh7n3/ik4oBcRHNFjrTykOzgTRd+LnU=
+github.com/vegardengen/go-unifi v0.0.1-alpha22/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
+github.com/vegardengen/go-unifi v0.0.1-alpha23 h1:PFKiAKy9u8s04a8cjSRIJa6N3BfPYQW8NmpEtXi+KJM=
+github.com/vegardengen/go-unifi v0.0.1-alpha23/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
+github.com/vegardengen/go-unifi v0.0.1-alpha24 h1:0L5aRrQEdXBQAzO/AK/OaA/Gt2ymA8pzA8MoAk12aOc=
+github.com/vegardengen/go-unifi v0.0.1-alpha24/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
+github.com/vegardengen/go-unifi v0.0.1-alpha25 h1:GAwtNpMslE6/0IfM80cWFaMqwqsn+NXlUVsvauN7v68=
+github.com/vegardengen/go-unifi v0.0.1-alpha25/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
 github.com/vegardengen/go-unifi v0.0.1-alpha3 h1:ppllnTPduJIRZWSVLh9oGNXjo4L2hVzpVzCxvRhLSpM=
 github.com/vegardengen/go-unifi v0.0.1-alpha3/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc=
 github.com/vegardengen/go-unifi v0.0.1-alpha4 h1:ZqdkYf/DRBwc1O+TwNsEAuMiXEv4j82XWbhbcMqUDnU=

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
-	if err := r.Get(ctx, req.NamespacedName, &nwObj); err != nil {
+	var firewallGroup unifiv1beta1.FirewallGroup
+	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
@@ -146,8 +285,18 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 			return reconcile.Result{}, err
 		}
 	}
+	serviceNamespaceNames := make(map[string]struct{})
+	for _, serviceEntry := range firewallGroup.Spec.ManualServices {
+		serviceNamespaceNames[serviceEntry.Namespace+"/"+serviceEntry.Name] = struct{}{}
+	}
+	log.Info(fmt.Sprintf("Manually specified: %+v", serviceNamespaceNames))
 	for _, service := range services.Items {
-		if val, found := service.Annotations["unifi.engen.priv.no/firewall-group"]; found && val == nwObj.Name && service.Status.LoadBalancer.Ingress != nil {
+		_, manually_specified := serviceNamespaceNames[service.Namespace+"/"+service.Name]
+		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 == firewallGroup.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
@@ -176,12 +325,33 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 			}
 		}
 	}
-	nwObj.Status.ResolvedAddresses = ipv4
-	nwObj.Status.ResolvedAddresses = append(nwObj.Status.ResolvedAddresses, ipv6...)
+	firewallGroup.Status.ResolvedIPV4Addresses = ipv4
+	firewallGroup.Status.ResolvedIPV6Addresses = ipv6
+	firewallGroup.Status.ResolvedTCPPorts = tcpports
+	firewallGroup.Status.ResolvedUDPPorts = udpports
 	currentTime := metav1.Now()
-	nwObj.Status.LastSyncTime = &currentTime
-	nwObj.Status.SyncedWithUnifi = true
-
+	firewallGroup.Status.LastSyncTime = &currentTime
+	firewallGroup.Status.SyncedWithUnifi = true
+	if firewallGroup.Status.ResourcesManaged == nil {
+		firewallGroup.Status.ResourcesManaged = &unifiv1beta1.FirewallGroupResourcesManaged{
+			IPV4Object: &unifiv1beta1.NamedUnifiResource{
+				ID:   "",
+				Name: "",
+			},
+			IPV6Object: &unifiv1beta1.NamedUnifiResource{
+				ID:   "",
+				Name: "",
+			},
+			TCPPortsObject: &unifiv1beta1.NamedUnifiResource{
+				ID:   "",
+				Name: "",
+			},
+			UDPPortsObject: &unifiv1beta1.NamedUnifiResource{
+				ID:   "",
+				Name: "",
+			},
+		}
+	}
 	err = r.UnifiClient.Reauthenticate()
 	if err != nil {
 		return reconcile.Result{}, err
@@ -191,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"
-	ipv6_name := "k8s-" + nwObj.Spec.Name + "-ipv6"
-	tcpports_name := "k8s-" + nwObj.Spec.Name + "-tcpports"
-	udpports_name := "k8s-" + nwObj.Spec.Name + "-udpports"
+	ipv4_name := "k8s-" + firewallGroup.Spec.Name + "-ipv4"
+	ipv6_name := "k8s-" + firewallGroup.Spec.Name + "-ipv6"
+	tcpports_name := "k8s-" + firewallGroup.Spec.Name + "-tcpports"
+	udpports_name := "k8s-" + firewallGroup.Spec.Name + "-udpports"
 	ipv4_done := false
 	ipv6_done := false
 	tcpports_done := false
@@ -216,10 +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
 						}
+						firewallGroup.Status.ResourcesManaged.IPV4Object.Name = ""
+						firewallGroup.Status.ResourcesManaged.IPV4Object.ID = ""
 					} else {
 						log.Error(err, "Could not delete firewall group")
 						return reconcile.Result{}, err
 					}
+				} else {
+					firewallGroup.Status.ResourcesManaged.IPV4Object.Name = ""
+					firewallGroup.Status.ResourcesManaged.IPV4Object.ID = ""
 				}
 				ipv4_done = true
 			} else {
@@ -251,10 +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
 						}
+						firewallGroup.Status.ResourcesManaged.IPV6Object.Name = ""
+						firewallGroup.Status.ResourcesManaged.IPV6Object.ID = ""
 					} else {
 						log.Error(err, "Could not delete firewall group")
 						return reconcile.Result{}, err
 					}
+				} else {
+					firewallGroup.Status.ResourcesManaged.IPV6Object.Name = ""
+					firewallGroup.Status.ResourcesManaged.IPV6Object.ID = ""
 				}
 				ipv6_done = true
 			} else {
@@ -279,17 +459,22 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 					log.Info(msg)
 					if strings.Contains(msg, "api.err.objectreferredby") {
 						log.Info("Firewall group is in use. Invoking workaround...!")
-						firewall_group.GroupMembers = []string{"127.0.0.1"}
+						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
 						}
+						firewallGroup.Status.ResourcesManaged.TCPPortsObject.Name = ""
+						firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID = ""
 					} else {
 						log.Error(err, "Could not delete firewall group")
 						return reconcile.Result{}, err
 					}
+				} else {
+					firewallGroup.Status.ResourcesManaged.TCPPortsObject.Name = ""
+					firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID = ""
 				}
 				tcpports_done = true
 			} else {
@@ -321,10 +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
 						}
+						firewallGroup.Status.ResourcesManaged.UDPPortsObject.Name = ""
+						firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID = ""
 					} else {
 						log.Error(err, "Could not delete firewall group")
 						return reconcile.Result{}, err
 					}
+				} else {
+					firewallGroup.Status.ResourcesManaged.UDPPortsObject.Name = ""
+					firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID = ""
 				}
 				udpports_done = true
 			} else {
@@ -349,6 +539,8 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 				log.Error(err, "Could not update firewall group")
 				return reconcile.Result{}, err
 			}
+			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 {
@@ -360,6 +552,8 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 				log.Error(err, "Could not update firewall group")
 				return reconcile.Result{}, err
 			}
+			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 {
@@ -371,6 +565,8 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 				log.Error(err, "Could not update firewall group")
 				return reconcile.Result{}, err
 			}
+			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 {
@@ -382,6 +578,8 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 				log.Error(err, "Could not update firewall group")
 				return reconcile.Result{}, err
 			}
+			firewallGroup.Status.ResourcesManaged.UDPPortsObject.Name = firewall_group.Name
+			firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID = firewall_group.ID
 			udpports_done = true
 		}
 	}
@@ -392,11 +590,19 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 		firewall_group.SiteID = r.UnifiClient.SiteID
 		firewall_group.GroupMembers = ipv4
 		firewall_group.GroupType = "address-group"
-		_, err := r.UnifiClient.Client.CreateFirewallGroup(context.Background(), r.UnifiClient.SiteID, &firewall_group)
+		firewall_group_result, err := r.UnifiClient.Client.CreateFirewallGroup(context.Background(), r.UnifiClient.SiteID, &firewall_group)
+		log.Info(fmt.Sprintf("%+v", firewall_group_result))
 		if err != nil {
 			log.Error(err, "Could not create firewall group")
 			return reconcile.Result{}, err
+		} else {
+			firewall_group = *firewall_group_result
 		}
+
+		log.Info(fmt.Sprintf("ID and name: %s %s", firewall_group.ID, firewall_group.Name))
+		log.Info(fmt.Sprintf("%+v", firewall_group))
+		firewallGroup.Status.ResourcesManaged.IPV4Object.ID = firewall_group.ID
+		firewallGroup.Status.ResourcesManaged.IPV4Object.Name = firewall_group.Name
 	}
 	if len(ipv6) > 0 && !ipv6_done {
 		log.Info(fmt.Sprintf("Creating %s", ipv6_name))
@@ -405,11 +611,17 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 		firewall_group.SiteID = r.UnifiClient.SiteID
 		firewall_group.GroupMembers = ipv6
 		firewall_group.GroupType = "ipv6-address-group"
-		_, err := r.UnifiClient.Client.CreateFirewallGroup(context.Background(), r.UnifiClient.SiteID, &firewall_group)
+		firewall_group_result, err := r.UnifiClient.Client.CreateFirewallGroup(context.Background(), r.UnifiClient.SiteID, &firewall_group)
+		log.Info(fmt.Sprintf("%+v", firewall_group_result))
 		if err != nil {
 			log.Error(err, "Could not create firewall group")
 			return reconcile.Result{}, err
+		} else {
+			firewall_group = *firewall_group_result
 		}
+		firewallGroup.Status.ResourcesManaged.IPV6Object.ID = firewall_group.ID
+		firewallGroup.Status.ResourcesManaged.IPV6Object.Name = firewall_group.Name
+
 	}
 	if len(tcpports) > 0 && !tcpports_done {
 		log.Info(fmt.Sprintf("Creating %s", tcpports_name))
@@ -419,11 +631,15 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 		firewall_group.GroupMembers = tcpports
 		firewall_group.GroupType = "port-group"
 		log.Info(fmt.Sprintf("Trying to apply: %+v", firewall_group))
-		_, err := r.UnifiClient.Client.CreateFirewallGroup(context.Background(), r.UnifiClient.SiteID, &firewall_group)
+		firewall_group_result, err := r.UnifiClient.Client.CreateFirewallGroup(context.Background(), r.UnifiClient.SiteID, &firewall_group)
 		if err != nil {
 			log.Error(err, "Could not create firewall group")
 			return reconcile.Result{}, err
+		} else {
+			firewall_group = *firewall_group_result
 		}
+		firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID = firewall_group.ID
+		firewallGroup.Status.ResourcesManaged.TCPPortsObject.Name = firewall_group.Name
 	}
 	if len(udpports) > 0 && !udpports_done {
 		log.Info(fmt.Sprintf("Creating %s", udpports_name))
@@ -433,13 +649,19 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 		firewall_group.GroupMembers = udpports
 		firewall_group.GroupType = "port-group"
 		log.Info(fmt.Sprintf("Trying to apply: %+v", firewall_group))
-		_, err := r.UnifiClient.Client.CreateFirewallGroup(context.Background(), r.UnifiClient.SiteID, &firewall_group)
+		firewall_group_result, err := r.UnifiClient.Client.CreateFirewallGroup(context.Background(), r.UnifiClient.SiteID, &firewall_group)
+		log.Info(fmt.Sprintf("%+v", firewall_group_result))
 		if err != nil {
 			log.Error(err, "Could not create firewall group")
 			return reconcile.Result{}, err
+		} else {
+			firewall_group = *firewall_group_result
 		}
+		firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID = firewall_group.ID
+		firewallGroup.Status.ResourcesManaged.UDPPortsObject.Name = firewall_group.Name
 	}
-	if err := r.Status().Update(ctx, &nwObj); err != nil {
+	log.Info(fmt.Sprintf("Updating status for %s: %+v", firewallGroup.Name, firewallGroup.Status))
+	if err := r.Status().Update(ctx, &firewallGroup); err != nil {
 		log.Error(err, "unable to update FirewallGroup status")
 		return reconcile.Result{}, err
 	}
@@ -464,15 +686,15 @@ func (r *FirewallGroupReconciler) mapServiceToFirewallGroups(ctx context.Context
 		return nil
 	}
 
-	for _, fwg := range allFirewallGroups.Items {
-		if fwg.Spec.MatchServicesInAllNamespaces || fwg.Namespace == service.Namespace {
+	for _, firewallGroup := range allFirewallGroups.Items {
+		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,
-						Namespace: fwg.Namespace,
+						Name:      firewallGroup.Name,
+						Namespace: firewallGroup.Namespace,
 					},
 				})
 			}

internal/controller/firewallrule_controller.go

@@ -18,12 +18,22 @@ package controller
 
 import (
 	"context"
+	"fmt"
+	// "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"
 
+	goUnifi "github.com/vegardengen/go-unifi/unifi"
 	unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1"
 	"github.com/vegardengen/unifi-network-operator/internal/config"
 	"github.com/vegardengen/unifi-network-operator/internal/unifi"
@@ -37,10 +47,13 @@ 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
 // +kubebuilder:rbac:groups="",resources=configmaps,verbs=list;get;watch
+// +kubebuilder:rbac:groups="",resources=services,verbs=list;get;watch
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.
@@ -51,6 +64,38 @@ type FirewallRuleReconciler struct {
 //
 // For more details, check Reconcile and its Result here:
 // - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.20.2/pkg/reconcile
+
+func fillDefaultRule() goUnifi.FirewallPolicy {
+	var firewallRule goUnifi.FirewallPolicy
+	firewallRule.Action = "ALLOW"
+	firewallRule.CreateAllowRespond = true
+	firewallRule.ConnectionStateType = "ALL"
+	firewallRule.ConnectionStates = []string{}
+	firewallRule.Destination = goUnifi.FirewallDestination{
+		MatchOppositePorts: false,
+		MatchingTarget:     "IP",
+		MatchingTargetType: "OBJECT",
+	}
+	firewallRule.Enabled = true
+	firewallRule.ICMPTypename = "ANY"
+	firewallRule.ICMPV6Typename = "ANY"
+	firewallRule.MatchIPSec = false
+	firewallRule.MatchOppositeProtocol = false
+	firewallRule.Predefined = false
+	firewallRule.Schedule = goUnifi.FirewallSchedule{
+		Mode:         "ALWAYS",
+		RepeatOnDays: []string{},
+		TimeAllDay:   false,
+	}
+	firewallRule.Source = goUnifi.FirewallSource{
+		MatchMac:              false,
+		MatchOppositePorts:    false,
+		MatchOppositeNetworks: false,
+	}
+
+	return firewallRule
+}
+
 func (r *FirewallRuleReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	log := log.FromContext(ctx)
 
@@ -62,20 +107,720 @@ func (r *FirewallRuleReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	}
 
 	defaultNs := cfg.Data["defaultNamespace"]
+	kubernetesZone := cfg.Data["kubernetesUnifiZone"]
+	var kubernetesZoneID string
 	log.Info(defaultNs)
+	log.Info(kubernetesZone)
 
+	var firewallRule unifiv1beta1.FirewallRule
+
+	if err := r.Get(ctx, req.NamespacedName, &firewallRule); err != nil {
+		return ctrl.Result{}, client.IgnoreNotFound(err)
+	}
+	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{}
+		firewallRule.Status.ResourcesManaged = &unifiv1beta1.FirewallRuleResourcesManaged{
+			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 {
 		return ctrl.Result{}, err
 	}
 
+	var zoneCRDs unifiv1beta1.FirewallZoneList
+	var networkCRDs unifiv1beta1.NetworkconfigurationList
+
+	err = r.List(ctx, &zoneCRDs)
+	if err != nil {
+		log.Error(err, "Could not list firewall zones")
+		return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
+	}
+
+	zoneCRDNames := make(map[string]int)
+
+	for i, zoneCRD := range zoneCRDs.Items {
+		namespace := defaultNs
+		if len(zoneCRD.Namespace) > 0 {
+			namespace = zoneCRD.Namespace
+		}
+		if kubernetesZone == zoneCRD.Name {
+			kubernetesZoneID = zoneCRD.Spec.ID
+			log.Info(fmt.Sprintf("Zone for kubernetes resources: %s with ID %s", kubernetesZone, kubernetesZoneID))
+		}
+		zoneCRDNames[namespace+"/"+zoneCRD.Name] = i
+	}
+
+	err = r.List(ctx, &networkCRDs)
+	if err != nil {
+		log.Error(err, "Could not list networks")
+		return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
+	}
+
+	networkCRDNames := make(map[string]int)
+
+	for i, networkCRD := range networkCRDs.Items {
+		namespace := defaultNs
+		if len(networkCRD.Namespace) > 0 {
+			namespace = networkCRD.Namespace
+		}
+		networkCRDNames[namespace+"/"+networkCRD.Name] = i
+	}
+
+	destination_services := make(map[string]struct{})
+	destination_groups := make(map[string]struct{})
+
+	for _, dest_group := range firewallRule.Spec.Destination.FirewallGroups {
+		namespace := defaultNs
+		if len(dest_group.Namespace) > 0 {
+			namespace = dest_group.Namespace
+		}
+		destination_groups[namespace+"/"+dest_group.Name] = struct{}{}
+	}
+	for _, dest_service := range firewallRule.Spec.Destination.Services {
+		namespace := defaultNs
+		if len(dest_service.Namespace) > 0 {
+			namespace = dest_service.Namespace
+		}
+		destination_services[namespace+"/"+dest_service.Name] = struct{}{}
+	}
+	log.Info(fmt.Sprintf("%+v", destination_services))
+	var firewallGroupCRDs unifiv1beta1.FirewallGroupList
+	var myFirewallGroups []unifiv1beta1.FirewallGroup
+	if err = r.List(ctx, &firewallGroupCRDs); err != nil {
+		log.Error(err, "Failed to list firewall groups")
+		return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
+	}
+
+	for _, firewallGroup := range firewallGroupCRDs.Items {
+		if val, found := firewallGroup.Annotations["unifi.engen.priv.no/firewall-rule"]; found && val == firewallRule.Name {
+			myFirewallGroups = append(myFirewallGroups, firewallGroup)
+		} else if _, found := destination_groups[firewallGroup.Namespace+"/"+firewallGroup.Name]; found {
+			myFirewallGroups = append(myFirewallGroups, firewallGroup)
+		}
+	}
+	myFirewallGroupNames := make(map[string]struct{})
+	for _, firewallGroup := range myFirewallGroups {
+		myFirewallGroupNames[firewallGroup.Name] = struct{}{}
+	}
+	var serviceCRDs corev1.ServiceList
+	var myServices []corev1.Service
+	if err = r.List(ctx, &serviceCRDs); err != nil {
+		log.Error(err, "Failed to list services")
+		return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
+	}
+	for _, service := range serviceCRDs.Items {
+		skipService := false
+		if val, found := service.Annotations["unifi.engen.priv.no/firewall-group"]; found {
+			if _, found := myFirewallGroupNames[val]; found {
+				skipService = true
+			}
+		}
+		if val, found := service.Annotations["unifi.engen.priv.no/firewall-rule"]; found && val == firewallRule.Name && !skipService {
+			myServices = append(myServices, service)
+		} else if _, found := destination_services[service.Namespace+"/"+service.Name]; found && !skipService {
+			myServices = append(myServices, service)
+		}
+	}
+
+	for _, service := range myServices {
+		log.Info(fmt.Sprintf("Should handle service %s", service.Name))
+		var firewallGroupCRD unifiv1beta1.FirewallGroup
+		if err := r.Get(ctx, types.NamespacedName{
+			Name:      toKubeName("k8s-auto" + "_" + service.Namespace + "/" + service.Name),
+			Namespace: firewallRule.Namespace,
+		}, &firewallGroupCRD); err == nil {
+			myFirewallGroups = append(myFirewallGroups, firewallGroupCRD)
+		} else {
+			log.Info("Going to create firewall group")
+			var manualServices []unifiv1beta1.ServiceEntry
+			manualServices = append(manualServices, unifiv1beta1.ServiceEntry{
+				Name:      service.Name,
+				Namespace: service.Namespace,
+			})
+			createdFirewallGroupCRD := &unifiv1beta1.FirewallGroup{
+				ObjectMeta: ctrl.ObjectMeta{
+					Name:      toKubeName("k8s-auto" + "_" + service.Namespace + "/" + service.Name),
+					Namespace: firewallRule.Namespace,
+				},
+				Spec: unifiv1beta1.FirewallGroupSpec{
+					Name: "auto-" + service.Namespace + "/" + service.Name,
+					AutoCreatedFrom: unifiv1beta1.FirewallRuleEntry{
+						Name:      firewallRule.Name,
+						Namespace: firewallRule.Namespace,
+					},
+					ManualServices:               manualServices,
+					MatchServicesInAllNamespaces: true,
+				},
+			}
+			log.Info(fmt.Sprintf("%+v", createdFirewallGroupCRD))
+			if err := r.Create(ctx, createdFirewallGroupCRD); err != nil {
+				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(fmt.Sprintf("Adding %+v", firewallGroupCRD))
+			myFirewallGroups = append(myFirewallGroups, firewallGroupCRD)
+			found := false
+			for _, managedFirewallGroup := range firewallRule.Status.ResourcesManaged.FirewallGroups {
+				if managedFirewallGroup.Name == firewallGroupCRD.Name && managedFirewallGroup.Namespace == firewallGroupCRD.Namespace {
+					found = true
+				}
+			}
+			if !found {
+				firewallRule.Status.ResourcesManaged.FirewallGroups = append(firewallRule.Status.ResourcesManaged.FirewallGroups, unifiv1beta1.FirewallGroupEntry{Name: firewallGroupCRD.Name, Namespace: firewallGroupCRD.Namespace})
+				if err := r.Status().Update(ctx, &firewallRule); err != nil {
+					log.Error(err, "Failed to update status with added firewallgroup")
+				}
+			}
+
+		}
+	}
+	unifi_firewall_rules, err := r.UnifiClient.Client.ListFirewallPolicy(context.Background(), r.UnifiClient.SiteID)
+	if err != nil {
+		log.Error(err, "Could not list firewall rules")
+		return ctrl.Result{}, err
+	}
+	unifiFirewallruleNames := make(map[string]struct{})
+	for _, unifi_firewall_rule := range unifi_firewall_rules {
+		unifiFirewallruleNames[unifi_firewall_rule.Name] = struct{}{}
+	}
+	log.Info(fmt.Sprintf("Number of firewall rules: %d", len(unifi_firewall_rules)))
+
+	for _, zoneEntry := range firewallRule.Spec.Source.FirewallZones {
+		namespace := defaultNs
+		if len(zoneEntry.Namespace) > 0 {
+			namespace = zoneEntry.Namespace
+		}
+		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))
+							unifiFirewallRule := fillDefaultRule()
+							unifiFirewallRule.Name = rulename
+							unifiFirewallRule.Source.PortMatchingType = "ANY"
+							unifiFirewallRule.Source.ZoneID = zoneCRDs.Items[i].Spec.ID
+							unifiFirewallRule.Source.MatchingTarget = "ANY"
+							unifiFirewallRule.Protocol = "tcp"
+							unifiFirewallRule.IPVersion = "IPV4"
+							unifiFirewallRule.Description = fmt.Sprintf("Allow tcp IPV4 from %s to %s", zoneCRDs.Items[i].Name, firewallGroup.Name)
+							unifiFirewallRule.Destination.MatchingTargetType = "OBJECT"
+							unifiFirewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV4Object.ID
+							unifiFirewallRule.Destination.MatchingTarget = "IP"
+							unifiFirewallRule.Destination.PortMatchingType = "OBJECT"
+							unifiFirewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID
+							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, unifiFirewallRule))
+							pretty, _ := json.MarshalIndent(unifiFirewallRule, "", "  ")
+							log.Info(string(pretty))
+							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))
+						}
+					}
+					if len(firewallGroup.Status.ResolvedUDPPorts) > 0 {
+						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))
+							unifiFirewallRule := fillDefaultRule()
+							unifiFirewallRule.Name = rulename
+							unifiFirewallRule.Source.PortMatchingType = "ANY"
+							unifiFirewallRule.Source.ZoneID = zoneCRDs.Items[i].Spec.ID
+							unifiFirewallRule.Source.MatchingTarget = "ANY"
+							unifiFirewallRule.Protocol = "udp"
+							unifiFirewallRule.IPVersion = "IPV4"
+							unifiFirewallRule.Description = fmt.Sprintf("Allow udp IPV4 from %s to %s", zoneCRDs.Items[i].Name, firewallGroup.Name)
+							unifiFirewallRule.Destination.MatchingTargetType = "OBJECT"
+							unifiFirewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV4Object.ID
+							unifiFirewallRule.Destination.MatchingTarget = "IP"
+							unifiFirewallRule.Destination.PortMatchingType = "OBJECT"
+							unifiFirewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID
+							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, unifiFirewallRule))
+							pretty, _ := json.MarshalIndent(unifiFirewallRule, "", "  ")
+							log.Info(string(pretty))
+							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))
+						}
+					}
+				}
+				if len(firewallGroup.Status.ResolvedIPV6Addresses) > 0 {
+					if len(firewallGroup.Status.ResolvedTCPPorts) > 0 {
+						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))
+							unifiFirewallRule := fillDefaultRule()
+							unifiFirewallRule.Name = rulename
+							unifiFirewallRule.Source.PortMatchingType = "ANY"
+							unifiFirewallRule.Source.ZoneID = zoneCRDs.Items[i].Spec.ID
+							unifiFirewallRule.Source.MatchingTarget = "ANY"
+							unifiFirewallRule.Protocol = "tcp"
+							unifiFirewallRule.IPVersion = "IPV6"
+							unifiFirewallRule.Description = fmt.Sprintf("Allow tcp IPV6 from %s to %s", zoneCRDs.Items[i].Name, firewallGroup.Name)
+							unifiFirewallRule.Destination.MatchingTargetType = "OBJECT"
+							unifiFirewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV6Object.ID
+							unifiFirewallRule.Destination.MatchingTarget = "IP"
+							unifiFirewallRule.Destination.PortMatchingType = "OBJECT"
+							unifiFirewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID
+							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, unifiFirewallRule))
+							pretty, _ := json.MarshalIndent(unifiFirewallRule, "", "  ")
+							log.Info(string(pretty))
+							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))
+						}
+					}
+					if len(firewallGroup.Status.ResolvedUDPPorts) > 0 {
+						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))
+							unifiFirewallRule := fillDefaultRule()
+							unifiFirewallRule.Name = rulename
+							unifiFirewallRule.Source.PortMatchingType = "ANY"
+							unifiFirewallRule.Source.ZoneID = zoneCRDs.Items[i].Spec.ID
+							unifiFirewallRule.Source.MatchingTarget = "ANY"
+							unifiFirewallRule.Protocol = "udp"
+							unifiFirewallRule.IPVersion = "IPV6"
+							unifiFirewallRule.Description = fmt.Sprintf("Allow udp IPV6 from %s to %s", zoneCRDs.Items[i].Name, firewallGroup.Name)
+							unifiFirewallRule.Destination.MatchingTargetType = "OBJECT"
+							unifiFirewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV6Object.ID
+							unifiFirewallRule.Destination.MatchingTarget = "IP"
+							unifiFirewallRule.Destination.PortMatchingType = "OBJECT"
+							unifiFirewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID
+							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, unifiFirewallRule))
+							pretty, _ := json.MarshalIndent(unifiFirewallRule, "", "  ")
+							log.Info(string(pretty))
+							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))
+						}
+					}
+				}
+			}
+		}
+	}
+	for _, networkEntry := range firewallRule.Spec.Source.Networks {
+		namespace := defaultNs
+		if len(networkEntry.Namespace) > 0 {
+			namespace = networkEntry.Namespace
+		}
+		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))
+							unifiFirewallRule := fillDefaultRule()
+							unifiFirewallRule.Name = rulename
+							unifiFirewallRule.Source.NetworkIDs = []string{networkCRDs.Items[i].Spec.ID}
+							unifiFirewallRule.Source.PortMatchingType = "ANY"
+							unifiFirewallRule.Source.ZoneID = networkCRDs.Items[i].Status.FirewallZoneID
+							unifiFirewallRule.Source.MatchingTarget = "NETWORK"
+							unifiFirewallRule.Protocol = "tcp"
+							unifiFirewallRule.IPVersion = "IPV4"
+							unifiFirewallRule.Description = fmt.Sprintf("Allow tcp IPV4 from %s to %s", networkCRDs.Items[i].Name, firewallGroup.Name)
+							unifiFirewallRule.Destination.MatchingTargetType = "OBJECT"
+							unifiFirewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV4Object.ID
+							unifiFirewallRule.Destination.MatchingTarget = "IP"
+							unifiFirewallRule.Destination.PortMatchingType = "OBJECT"
+							unifiFirewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID
+							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, unifiFirewallRule))
+							pretty, _ := json.MarshalIndent(unifiFirewallRule, "", "  ")
+							log.Info(string(pretty))
+							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))
+						}
+					}
+					if len(firewallGroup.Status.ResolvedUDPPorts) > 0 {
+						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))
+							unifiFirewallRule := fillDefaultRule()
+							unifiFirewallRule.Name = rulename
+							unifiFirewallRule.Source.NetworkIDs = []string{networkCRDs.Items[i].Spec.ID}
+							unifiFirewallRule.Source.PortMatchingType = "ANY"
+							unifiFirewallRule.Source.ZoneID = networkCRDs.Items[i].Status.FirewallZoneID
+							unifiFirewallRule.Source.MatchingTarget = "NETWORK"
+							unifiFirewallRule.Protocol = "udp"
+							unifiFirewallRule.IPVersion = "IPV4"
+							unifiFirewallRule.Description = fmt.Sprintf("Allow udp IPV4 from %s to %s", networkCRDs.Items[i].Name, firewallGroup.Name)
+							unifiFirewallRule.Destination.MatchingTargetType = "OBJECT"
+							unifiFirewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV4Object.ID
+							unifiFirewallRule.Destination.MatchingTarget = "IP"
+							unifiFirewallRule.Destination.PortMatchingType = "OBJECT"
+							unifiFirewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID
+							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, unifiFirewallRule))
+							pretty, _ := json.MarshalIndent(unifiFirewallRule, "", "  ")
+							log.Info(string(pretty))
+							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))
+						}
+					}
+				}
+				if len(firewallGroup.Status.ResolvedIPV6Addresses) > 0 {
+					if len(firewallGroup.Status.ResolvedTCPPorts) > 0 {
+						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))
+							unifiFirewallRule := fillDefaultRule()
+							unifiFirewallRule.Name = rulename
+							unifiFirewallRule.Source.NetworkIDs = []string{networkCRDs.Items[i].Spec.ID}
+							unifiFirewallRule.Source.PortMatchingType = "ANY"
+							unifiFirewallRule.Source.ZoneID = networkCRDs.Items[i].Status.FirewallZoneID
+							unifiFirewallRule.Source.MatchingTarget = "NETWORK"
+							unifiFirewallRule.Protocol = "tcp"
+							unifiFirewallRule.IPVersion = "IPV6"
+							unifiFirewallRule.Description = fmt.Sprintf("Allow tcp IPV6 from %s to %s", networkCRDs.Items[i].Name, firewallGroup.Name)
+							unifiFirewallRule.Destination.MatchingTargetType = "OBJECT"
+							unifiFirewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV6Object.ID
+							unifiFirewallRule.Destination.MatchingTarget = "IP"
+							unifiFirewallRule.Destination.PortMatchingType = "OBJECT"
+							unifiFirewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.TCPPortsObject.ID
+							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, unifiFirewallRule))
+							pretty, _ := json.MarshalIndent(unifiFirewallRule, "", "  ")
+							log.Info(string(pretty))
+							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))
+						}
+					}
+					if len(firewallGroup.Status.ResolvedUDPPorts) > 0 {
+						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))
+							unifiFirewallRule := fillDefaultRule()
+							unifiFirewallRule.Name = rulename
+							unifiFirewallRule.Source.NetworkIDs = []string{networkCRDs.Items[i].Spec.ID}
+							unifiFirewallRule.Source.PortMatchingType = "ANY"
+							unifiFirewallRule.Source.ZoneID = networkCRDs.Items[i].Status.FirewallZoneID
+							unifiFirewallRule.Source.MatchingTarget = "NETWORK"
+							unifiFirewallRule.Protocol = "udp"
+							unifiFirewallRule.IPVersion = "IPV6"
+							unifiFirewallRule.Description = fmt.Sprintf("Allow udp IPV6 from %s to %s", networkCRDs.Items[i].Name, firewallGroup.Name)
+							unifiFirewallRule.Destination.MatchingTargetType = "OBJECT"
+							unifiFirewallRule.Destination.IPGroupID = firewallGroup.Status.ResourcesManaged.IPV6Object.ID
+							unifiFirewallRule.Destination.MatchingTarget = "IP"
+							unifiFirewallRule.Destination.PortMatchingType = "OBJECT"
+							unifiFirewallRule.Destination.PortGroupID = firewallGroup.Status.ResourcesManaged.UDPPortsObject.ID
+							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, unifiFirewallRule))
+							pretty, _ := json.MarshalIndent(unifiFirewallRule, "", "  ")
+							log.Info(string(pretty))
+							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))
+						}
+					}
+				}
+			}
+		}
+	}
 	return ctrl.Result{}, nil
 }
 
+func (r *FirewallRuleReconciler) mapFirewallGroupToFirewallRules(ctx context.Context, obj client.Object) []ctrl.Request {
+	var requests []ctrl.Request
+	firewallGroup, ok := obj.(*unifiv1beta1.FirewallGroup)
+	if !ok {
+		return requests
+	}
+
+	var allFirewallRules unifiv1beta1.FirewallRuleList
+
+	if err := r.List(ctx, &allFirewallRules); err != nil {
+		return nil
+	}
+
+	for _, rule := range allFirewallRules.Items {
+		if rule.Spec.MatchFirewallGroupsInAllNamespaces || rule.Namespace == firewallGroup.Namespace {
+			annotationKey := "unifi.engen.priv.no/firewall-rule"
+			annotationVal := rule.Name
+			if val, ok := firewallGroup.Annotations[annotationKey]; ok && (annotationVal == "" || val == annotationVal) {
+				requests = append(requests, ctrl.Request{
+					NamespacedName: types.NamespacedName{
+						Name:      rule.Name,
+						Namespace: rule.Namespace,
+					},
+				})
+			}
+		}
+	}
+
+	return requests
+}
+
+func (r *FirewallRuleReconciler) mapServiceToFirewallRules(ctx context.Context, obj client.Object) []ctrl.Request {
+	var requests []ctrl.Request
+	service, ok := obj.(*corev1.Service)
+	if !ok {
+		return requests
+	}
+
+	var allFirewallRules unifiv1beta1.FirewallRuleList
+
+	if err := r.List(ctx, &allFirewallRules); err != nil {
+		return nil
+	}
+
+	for _, rule := range allFirewallRules.Items {
+		if rule.Spec.MatchServicesInAllNamespaces || rule.Namespace == service.Namespace {
+			annotationKey := "unifi.engen.priv.no/firewall-rule"
+			annotationVal := rule.Name
+			if val, ok := service.Annotations[annotationKey]; ok && (annotationVal == "" || val == annotationVal) {
+				requests = append(requests, ctrl.Request{
+					NamespacedName: types.NamespacedName{
+						Name:      rule.Name,
+						Namespace: rule.Namespace,
+					},
+				})
+			}
+		}
+	}
+
+	return requests
+}
+
 // SetupWithManager sets up the controller with the Manager.
 func (r *FirewallRuleReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&unifiv1beta1.FirewallRule{}).
 		Named("firewallrule").
+		Watches(
+			&corev1.Service{},
+			handler.EnqueueRequestsFromMapFunc(r.mapServiceToFirewallRules),
+		).
+		Watches(
+			&unifiv1beta1.FirewallGroup{},
+			handler.EnqueueRequestsFromMapFunc(r.mapFirewallGroupToFirewallRules),
+		).
 		Complete(r)
 }

internal/controller/networkconfiguration_controller.go

@@ -22,6 +22,7 @@ import (
 	"time"
 
 	"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/log"
@@ -178,6 +179,10 @@ func (r *NetworkconfigurationReconciler) Reconcile(ctx context.Context, req ctrl
 				Vlan:                      int64(unifinetwork.VLAN),
 				VlanEnabled:               unifinetwork.VLANEnabled,
 			}
+			networkStatus := unifiv1.NetworkconfigurationStatus{
+				FirewallZoneID: unifinetwork.FirewallZoneID,
+			}
+			log.Info(fmt.Sprintf("Network status %s: %+v", networkSpec.Name, networkStatus))
 			if _, found := networkNamesCRDs[unifinetwork.Name]; !found {
 				firewallZoneNamesCRDs := make(map[string]struct{})
 				firewallZoneIdsCRDs := make(map[string]struct{})
@@ -190,12 +195,18 @@ func (r *NetworkconfigurationReconciler) Reconcile(ctx context.Context, req ctrl
 						Name:      toKubeName(unifinetwork.Name),
 						Namespace: defaultNs,
 					},
-					Spec: networkSpec,
+					Spec:   networkSpec,
+					Status: networkStatus,
 				}
 				err = r.Create(ctx, networkCRD)
 				if err != nil {
 					return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
 				}
+				err = r.Get(ctx, types.NamespacedName{Name: networkCRD.Name, Namespace: networkCRD.Namespace}, networkCRD)
+				networkCRD.Status = networkStatus
+				if err = r.Status().Update(ctx, networkCRD); err != nil {
+					return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
+				}
 			} else {
 				for _, networkCRD := range networkCRDs.Items {
 					if networkCRD.Spec.Name == unifinetwork.Name {
@@ -205,6 +216,9 @@ func (r *NetworkconfigurationReconciler) Reconcile(ctx context.Context, req ctrl
 					if err != nil {
 						return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
 					}
+					if err = r.Status().Update(ctx, &networkCRD); err != nil {
+						return ctrl.Result{RequeueAfter: 10 * time.Minute}, err
+					}
 				}
 			}
 		}