chore: make reviewable

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

Author: arturshadnik

fleetconfig-controller/internal/controller/v1beta1/addon.go

@@ -18,6 +18,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	addonapi "open-cluster-management.io/api/client/addon/clientset/versioned"
 	workapi "open-cluster-management.io/api/client/work/clientset/versioned"
+	workv1 "open-cluster-management.io/api/work/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
@@ -39,6 +40,8 @@ const (
 
 	addonArgoCD = "argocd"
 	addonGPF    = "governance-policy-framework"
+
+	managedClusterAddOn = "ManagedClusterAddOn"
 )
 
 var supportedHubAddons = []string{
@@ -666,3 +669,14 @@ func waitForAddonManifestWorksCleanup(ctx context.Context, workC *workapi.Client
 
 	return nil
 }
+
+func allOwnersAddOns(mws []workv1.ManifestWork) bool {
+	for _, m := range mws {
+		if !slices.ContainsFunc(m.OwnerReferences, func(or metav1.OwnerReference) bool {
+			return or.Kind == managedClusterAddOn
+		}) {
+			return false
+		}
+	}
+	return true
+}

fleetconfig-controller/internal/controller/v1beta1/common.go

@@ -4,14 +4,12 @@ import (
 	"context"
 	"fmt"
 	"regexp"
-	"slices"
 	"time"
 
 	kerrs "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	operatorapi "open-cluster-management.io/api/client/operator/clientset/versioned"
 	operatorv1 "open-cluster-management.io/api/operator/v1"
-	workv1 "open-cluster-management.io/api/work/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
@@ -20,7 +18,6 @@ const (
 	clusteradm               = "clusteradm"
 	requeue                  = 30 * time.Second
 	amwExistsError           = "you should manually clean them, uninstall kluster will cause those works out of control."
-	managedClusterAddOn      = "ManagedClusterAddOn"
 	addonCleanupTimeout      = 1 * time.Minute
 	addonCleanupPollInterval = 2 * time.Second
 )
@@ -52,14 +49,3 @@ func getClusterManager(ctx context.Context, operatorC *operatorapi.Clientset) (*
 	}
 	return cm, nil
 }
-
-func allOwnersAddOns(mws []workv1.ManifestWork) bool {
-	for _, m := range mws {
-		if !slices.ContainsFunc(m.OwnerReferences, func(or metav1.OwnerReference) bool {
-			return or.Kind == managedClusterAddOn
-		}) {
-			return false
-		}
-	}
-	return true
-}

fleetconfig-controller/internal/controller/v1beta1/hub_controller.go

@@ -566,19 +566,19 @@ func (r *HubReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		// watch for deleted Spokes to prevent idly waiting after all spokes have been GCd during Hub deletion
 		Watches(
 			&v1beta1.Spoke{},
-			handler.EnqueueRequestsFromMapFunc(mapSpokeRequestToHub),
+			handler.EnqueueRequestsFromMapFunc(mapSpokeEventToHub),
 			builder.WithPredicates(
 				predicate.Funcs{
-					DeleteFunc: func(e event.DeleteEvent) bool {
+					DeleteFunc: func(_ event.DeleteEvent) bool {
 						return true
 					},
-					CreateFunc: func(e event.CreateEvent) bool {
+					CreateFunc: func(_ event.CreateEvent) bool {
 						return true
 					},
-					UpdateFunc: func(e event.UpdateEvent) bool {
+					UpdateFunc: func(_ event.UpdateEvent) bool {
 						return true
 					},
-					GenericFunc: func(e event.GenericEvent) bool {
+					GenericFunc: func(_ event.GenericEvent) bool {
 						return true
 					},
 				},
@@ -588,7 +588,7 @@ func (r *HubReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Complete(r)
 }
 
-func mapSpokeRequestToHub(ctx context.Context, obj client.Object) []reconcile.Request {
+func mapSpokeEventToHub(_ context.Context, _ client.Object) []reconcile.Request {
 	return []reconcile.Request{
 		{
 			NamespacedName: types.NamespacedName{

fleetconfig-controller/internal/controller/v1beta1/spoke_controller.go

@@ -930,10 +930,10 @@ func (r *SpokeReconciler) SetupWithManager(mgr ctrl.Manager) error {
 			&v1beta1.Hub{},
 			handler.EnqueueRequestsFromMapFunc(r.mapHubEventToSpoke),
 			builder.WithPredicates(predicate.Funcs{
-				DeleteFunc: func(e event.DeleteEvent) bool {
+				DeleteFunc: func(_ event.DeleteEvent) bool {
 					return false
 				},
-				CreateFunc: func(e event.CreateEvent) bool {
+				CreateFunc: func(_ event.CreateEvent) bool {
 					return false
 				},
 				// only return true if old and new hub specs are different
@@ -948,7 +948,7 @@ func (r *SpokeReconciler) SetupWithManager(mgr ctrl.Manager) error {
 					}
 					return !reflect.DeepEqual(oldHub.Spec, newHub.Spec)
 				},
-				GenericFunc: func(e event.GenericEvent) bool {
+				GenericFunc: func(_ event.GenericEvent) bool {
 					return false
 				},
 			}),
@@ -957,7 +957,7 @@ func (r *SpokeReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Complete(r)
 }
 
-func (r *SpokeReconciler) mapHubEventToSpoke(ctx context.Context, obj client.Object) []reconcile.Request {
+func (r *SpokeReconciler) mapHubEventToSpoke(ctx context.Context, _ client.Object) []reconcile.Request {
 	spokeList := &v1beta1.SpokeList{}
 	err := r.List(ctx, spokeList)
 	if err != nil {