Remove status changed predicate

ironcore-dev · Sep 19, 2024 · ff6e1ef · ff6e1ef
1 parent eb53bb3
commit ff6e1ef
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/apinetlet/controllers/network_controller.go b/apinetlet/controllers/network_controller.go
@@ -122,7 +122,7 @@ func (r *NetworkReconciler) delete(ctx context.Context, log logr.Logger, network
 func (r *NetworkReconciler) updateNetworkStatus(ctx context.Context, log logr.Logger, network *networkingv1alpha1.Network, apiNetNetwork *apinetv1alpha1.Network, state networkingv1alpha1.NetworkState) error {
 	networkBase := network.DeepCopy()
 	statusPeerings := apiNetNetworkPeeringsStatusToNetworkPeeringsStatus(apiNetNetwork.Status.Peerings, apiNetNetwork.Spec.Peerings)
-	log.V(1).Info("netwrok status peerings", "old", network.Status.Peerings, "new", statusPeerings)
+	log.V(1).Info("network status peerings", "old", network.Status.Peerings, "new", statusPeerings)
 	if network.Status.State != state || !reflect.DeepEqual(network.Status.Peerings, statusPeerings) {
 		log.V(1).Info("Patching network status")
 		network.Status.State = state

diff --git a/metalnetlet/controllers/network_controller.go b/metalnetlet/controllers/network_controller.go
@@ -20,12 +20,9 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-	"sigs.k8s.io/controller-runtime/pkg/event"
-	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 )
 
@@ -119,7 +116,7 @@ func (r *NetworkReconciler) delete(ctx context.Context, log logr.Logger, network
 func (r *NetworkReconciler) updateApinetNetworkStatus(ctx context.Context, log logr.Logger, network *apinetv1alpha1.Network, metalnetNetwork *metalnetv1alpha1.Network) error {
 	newStatusPeerings := metalnetNetworkPeeringsStatusToNetworkPeeringsStatus(metalnetNetwork.Status.Peerings)
 	log.V(1).Info("apinet status", "old", network.Status.Peerings, "new", newStatusPeerings)
-	if network.Spec.Peerings != nil && newStatusPeerings != nil && !slices.Equal(network.Status.Peerings, newStatusPeerings) {
+	if !slices.Equal(network.Status.Peerings, newStatusPeerings) {
 		log.V(1).Info("Patching apinet network status", "status", newStatusPeerings)
 		networkBase := network.DeepCopy()
 		network.Status.Peerings = newStatusPeerings
@@ -246,7 +243,7 @@ func (r *NetworkReconciler) SetupWithManager(mgr ctrl.Manager, metalnetCache cac
 	return ctrl.NewControllerManagedBy(mgr).
 		For(
 			&apinetv1alpha1.Network{},
-			builder.WithPredicates(r.networkStatusChangedPredicate()),
+			// builder.WithPredicates(r.networkStatusChangedPredicate()),
 		).
 		WatchesRawSource(
 			source.Kind(metalnetCache, &metalnetv1alpha1.Network{}),
@@ -255,12 +252,12 @@ func (r *NetworkReconciler) SetupWithManager(mgr ctrl.Manager, metalnetCache cac
 		Complete(r)
 }
 
-func (r *NetworkReconciler) networkStatusChangedPredicate() predicate.Predicate {
-	return predicate.Funcs{
-		UpdateFunc: func(evt event.UpdateEvent) bool {
-			oldNetwork := evt.ObjectOld.(*apinetv1alpha1.Network)
-			newNetwork := evt.ObjectNew.(*apinetv1alpha1.Network)
-			return !slices.Equal(oldNetwork.Status.Peerings, newNetwork.Status.Peerings) && newNetwork.Status.Peerings != nil
-		},
-	}
-}
+// func (r *NetworkReconciler) networkStatusChangedPredicate() predicate.Predicate {
+// 	return predicate.Funcs{
+// 		UpdateFunc: func(evt event.UpdateEvent) bool {
+// 			oldNetwork := evt.ObjectOld.(*apinetv1alpha1.Network)
+// 			newNetwork := evt.ObjectNew.(*apinetv1alpha1.Network)
+// 			return !slices.Equal(oldNetwork.Status.Peerings, newNetwork.Status.Peerings)
+// 		},
+// 	}
+// }