Merge pull request #23 from vegardengen/22-use-reauthentication-method-in-more-reconcilers

Use reauthentication

internal/controller/firewallgroup_controller.go

@@ -21,10 +21,10 @@ import (
 	"fmt"
 	"net"
 	"reflect"
+	"regexp"
 	"slices"
 	"strconv"
 	"strings"
-	"regexp"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -39,8 +39,8 @@ import (
 
 	goUnifi "github.com/vegardengen/go-unifi/unifi"
 	unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1"
-	"github.com/vegardengen/unifi-network-operator/internal/unifi"
 	"github.com/vegardengen/unifi-network-operator/internal/config"
+	"github.com/vegardengen/unifi-network-operator/internal/unifi"
 )
 
 // FirewallGroupReconciler reconciles a FirewallGroup object
@@ -118,16 +118,16 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 		port_type := "tcp"
 		port := portEntry
 		if match, _ := regexp.MatchString("(?:tcp|udp)\\/?)\\d+", string(portEntry)); match {
-		  fields := strings.Split("/",portEntry)
+			fields := strings.Split("/", portEntry)
 			port_type = fields[0]
 			port = fields[1]
 		}
-		if(port_type == "tcp") {
+		if port_type == "tcp" {
 			if !slices.Contains(tcpports, port) {
 				tcpports = append(tcpports, port)
 			}
 		}
-		if(port_type == "udp") {
+		if port_type == "udp" {
 			if !slices.Contains(udpports, port) {
 				tcpports = append(udpports, port)
 			}
@@ -162,12 +162,12 @@ func (r *FirewallGroupReconciler) Reconcile(ctx context.Context, req reconcile.R
 				for _, portSpec := range service.Spec.Ports {
 					log.Info(fmt.Sprintf("portSpec: %+v", portSpec))
 					log.Info(fmt.Sprintf("Port: %s %d", strconv.Itoa(int(portSpec.Port)), portSpec.Port))
-					if(portSpec.Protocol == "TCP") {
+					if portSpec.Protocol == "TCP" {
 						if !slices.Contains(tcpports, strconv.Itoa(int(portSpec.Port))) {
 							tcpports = append(tcpports, strconv.Itoa(int(portSpec.Port)))
 						}
 					}
-					if(portSpec.Protocol == "UDP") {
+					if portSpec.Protocol == "UDP" {
 						if !slices.Contains(udpports, strconv.Itoa(int(portSpec.Port))) {
 							udpports = append(udpports, strconv.Itoa(int(portSpec.Port)))
 						}

internal/controller/firewallrule_controller.go

@@ -25,8 +25,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
 	unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1"
-	"github.com/vegardengen/unifi-network-operator/internal/unifi"
 	"github.com/vegardengen/unifi-network-operator/internal/config"
+	"github.com/vegardengen/unifi-network-operator/internal/unifi"
 )
 
 // FirewallRuleReconciler reconciles a FirewallRule object
@@ -64,6 +64,11 @@ func (r *FirewallRuleReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	defaultNs := cfg.Data["defaultNamespace"]
 	log.Info(defaultNs)
 
+	err = r.UnifiClient.Reauthenticate()
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+
 	return ctrl.Result{}, nil
 }
 

internal/controller/firewallzone_controller.go

@@ -19,8 +19,8 @@ package controller
 import (
 	"context"
 	"fmt"
-	"strings"
 	"regexp"
+	"strings"
 	"time"
 
 	"k8s.io/apimachinery/pkg/runtime"
@@ -29,8 +29,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
 	unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1"
-	"github.com/vegardengen/unifi-network-operator/internal/unifi"
 	"github.com/vegardengen/unifi-network-operator/internal/config"
+	"github.com/vegardengen/unifi-network-operator/internal/unifi"
 )
 
 // FirewallZoneReconciler reconciles a FirewallZone object
@@ -62,7 +62,6 @@ func toKubeName(input string) string {
 	return name
 }
 
-
 // +kubebuilder:rbac:groups=unifi.engen.priv.no,resources=firewallzones,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=unifi.engen.priv.no,resources=firewallzones/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups=unifi.engen.priv.no,resources=firewallzones/finalizers,verbs=update
@@ -87,6 +86,11 @@ func (r *FirewallZoneReconciler) Reconcile(ctx context.Context, req ctrl.Request
 
 	defaultNs := cfg.Data["defaultNamespace"]
 
+	err = r.UnifiClient.Reauthenticate()
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+
 	var fwzCRDs unifiv1beta1.FirewallZoneList
 	_ = r.List(ctx, &fwzCRDs, client.InNamespace(defaultNs))
 
@@ -118,17 +122,17 @@ func (r *FirewallZoneReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	for _, unifizone := range firewall_zones {
 		log.Info(fmt.Sprintf("%+v\n", unifizone))
 		if _, found := firewallZoneNamesCRDs[unifizone.Name]; !found {
-			zoneCRD := &unifiv1beta1.FirewallZone {
+			zoneCRD := &unifiv1beta1.FirewallZone{
-				ObjectMeta : ctrl.ObjectMeta {
+				ObjectMeta: ctrl.ObjectMeta{
 					Name:      toKubeName(unifizone.Name),
 					Namespace: defaultNs,
 				},
-				Spec: unifiv1beta1.FirewallZoneSpec {
+				Spec: unifiv1beta1.FirewallZoneSpec{
-					Name : unifizone.Name,
+					Name:        unifizone.Name,
-					ID : unifizone.ID,
+					ID:          unifizone.ID,
 					DefaultZone: unifizone.DefaultZone,
-					ZoneKey : unifizone.ZoneKey,
+					ZoneKey:     unifizone.ZoneKey,
-					NetworkIDs : unifizone.NetworkIDs,
+					NetworkIDs:  unifizone.NetworkIDs,
 				},
 			}
 			err := r.Create(ctx, zoneCRD)
@@ -138,12 +142,12 @@ func (r *FirewallZoneReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		} else {
 			for _, zoneCRD := range fwzCRDs.Items {
 				if zoneCRD.Spec.Name == unifizone.Name {
-				    zoneCRD.Spec = unifiv1beta1.FirewallZoneSpec {
+					zoneCRD.Spec = unifiv1beta1.FirewallZoneSpec{
-                                        Name : unifizone.Name,
+						Name:        unifizone.Name,
-                                        ID : unifizone.ID,
+						ID:          unifizone.ID,
 						DefaultZone: unifizone.DefaultZone,
-                                        ZoneKey : unifizone.ZoneKey,
+						ZoneKey:     unifizone.ZoneKey,
-                                        NetworkIDs : unifizone.NetworkIDs,
+						NetworkIDs:  unifizone.NetworkIDs,
 					}
 					err := r.Update(ctx, &zoneCRD)
 					if err != nil {

internal/controller/networkconfiguration_controller.go

@@ -26,8 +26,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
 	unifiv1 "github.com/vegardengen/unifi-network-operator/api/v1beta1"
-	"github.com/vegardengen/unifi-network-operator/internal/unifi"
 	"github.com/vegardengen/unifi-network-operator/internal/config"
+	"github.com/vegardengen/unifi-network-operator/internal/unifi"
 )
 
 // NetworkconfigurationReconciler reconciles a Networkconfiguration object
@@ -66,6 +66,12 @@ func (r *NetworkconfigurationReconciler) Reconcile(ctx context.Context, req ctrl
 	if err := r.List(ctx, &networkCRDs); err != nil {
 		return ctrl.Result{}, err
 	}
+
+	err = r.UnifiClient.Reauthenticate()
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+
 	k8sNetworks := make(map[string]*unifiv1.Networkconfiguration)
 	for i := range networkCRDs.Items {
 		log.Info(fmt.Sprintf("Inserting network %s\n", networkCRDs.Items[i].Spec.NetworkID))