diff --git a/cmd/agent/app/agent.go b/cmd/agent/app/agent.go index 4fd6d2be6..8f32ed3ab 100644 --- a/cmd/agent/app/agent.go +++ b/cmd/agent/app/agent.go @@ -35,7 +35,7 @@ import ( "github.com/karmada-io/karmada/pkg/sharedcli/profileflag" "github.com/karmada-io/karmada/pkg/util" "github.com/karmada-io/karmada/pkg/util/fedinformer/genericmanager" - "github.com/karmada-io/karmada/pkg/util/fedinformer/typedManager" + "github.com/karmada-io/karmada/pkg/util/fedinformer/typedmanager" "github.com/karmada-io/karmada/pkg/util/gclient" "github.com/karmada-io/karmada/pkg/util/helper" "github.com/karmada-io/karmada/pkg/util/names" @@ -249,7 +249,7 @@ func startClusterStatusController(ctx controllerscontext.Context) (bool, error) KubeClient: kubeclientset.NewForConfigOrDie(ctx.Mgr.GetConfig()), EventRecorder: ctx.Mgr.GetEventRecorderFor(status.ControllerName), PredicateFunc: helper.NewClusterPredicateOnAgent(ctx.Opts.ClusterName), - TypedInformerManager: typedManager.GetInstance(), + TypedInformerManager: typedmanager.GetInstance(), GenericInformerManager: genericmanager.GetInstance(), StopChan: ctx.StopChan, ClusterClientSetFunc: util.NewClusterClientSetForAgent, diff --git a/cmd/controller-manager/app/controllermanager.go b/cmd/controller-manager/app/controllermanager.go index 61d49dcf9..1959414c4 100644 --- a/cmd/controller-manager/app/controllermanager.go +++ b/cmd/controller-manager/app/controllermanager.go @@ -49,7 +49,7 @@ import ( "github.com/karmada-io/karmada/pkg/sharedcli/profileflag" "github.com/karmada-io/karmada/pkg/util" "github.com/karmada-io/karmada/pkg/util/fedinformer/genericmanager" - "github.com/karmada-io/karmada/pkg/util/fedinformer/typedManager" + "github.com/karmada-io/karmada/pkg/util/fedinformer/typedmanager" "github.com/karmada-io/karmada/pkg/util/gclient" "github.com/karmada-io/karmada/pkg/util/helper" "github.com/karmada-io/karmada/pkg/util/objectwatcher" @@ -259,7 +259,7 @@ func startClusterStatusController(ctx controllerscontext.Context) (enabled bool, KubeClient: kubeclientset.NewForConfigOrDie(mgr.GetConfig()), EventRecorder: mgr.GetEventRecorderFor(status.ControllerName), PredicateFunc: clusterPredicateFunc, - TypedInformerManager: typedManager.GetInstance(), + TypedInformerManager: typedmanager.GetInstance(), GenericInformerManager: genericmanager.GetInstance(), StopChan: stopChan, ClusterClientSetFunc: util.NewClusterClientSet, diff --git a/pkg/controllers/status/cluster_status_controller.go b/pkg/controllers/status/cluster_status_controller.go index 7b7cac730..8bafac16d 100644 --- a/pkg/controllers/status/cluster_status_controller.go +++ b/pkg/controllers/status/cluster_status_controller.go @@ -34,7 +34,7 @@ import ( "github.com/karmada-io/karmada/pkg/sharedcli/ratelimiterflag" "github.com/karmada-io/karmada/pkg/util" "github.com/karmada-io/karmada/pkg/util/fedinformer/genericmanager" - "github.com/karmada-io/karmada/pkg/util/fedinformer/typedManager" + "github.com/karmada-io/karmada/pkg/util/fedinformer/typedmanager" "github.com/karmada-io/karmada/pkg/util/helper" ) @@ -61,7 +61,7 @@ type ClusterStatusController struct { KubeClient clientset.Interface EventRecorder record.EventRecorder PredicateFunc predicate.Predicate - TypedInformerManager typedManager.MultiClusterInformerManager + TypedInformerManager typedmanager.MultiClusterInformerManager GenericInformerManager genericmanager.MultiClusterInformerManager StopChan <-chan struct{} ClusterClientSetFunc func(string, client.Client, *util.ClientOption) (*util.ClusterClient, error) @@ -246,7 +246,7 @@ func (c *ClusterStatusController) updateStatusIfNeeded(cluster *clusterv1alpha1. // buildInformerForCluster builds informer manager for cluster if it doesn't exist, then constructs informers for node // and pod and start it. If the informer manager exist, return it. -func (c *ClusterStatusController) buildInformerForCluster(clusterClient *util.ClusterClient) (typedManager.SingleClusterInformerManager, error) { +func (c *ClusterStatusController) buildInformerForCluster(clusterClient *util.ClusterClient) (typedmanager.SingleClusterInformerManager, error) { // cluster-status-controller will initialize the generic informer manager // mainly because when the member cluster is joined, the dynamic informer required by the member cluster // to distribute resources is prepared in advance @@ -422,7 +422,7 @@ func getAPIEnablements(clusterClient *util.ClusterClient) ([]clusterv1alpha1.API } // listPods returns the Pod list from the informerManager cache. -func listPods(informerManager typedManager.SingleClusterInformerManager) ([]*corev1.Pod, error) { +func listPods(informerManager typedmanager.SingleClusterInformerManager) ([]*corev1.Pod, error) { podInterface, err := informerManager.Lister(podGVR) if err != nil { return nil, err @@ -437,7 +437,7 @@ func listPods(informerManager typedManager.SingleClusterInformerManager) ([]*cor } // listNodes returns the Node list from the informerManager cache. -func listNodes(informerManager typedManager.SingleClusterInformerManager) ([]*corev1.Node, error) { +func listNodes(informerManager typedmanager.SingleClusterInformerManager) ([]*corev1.Node, error) { nodeInterface, err := informerManager.Lister(nodeGVR) if err != nil { return nil, err diff --git a/pkg/util/fedinformer/typedManager/multi-cluster-manager.go b/pkg/util/fedinformer/typedmanager/multi-cluster-manager.go similarity index 99% rename from pkg/util/fedinformer/typedManager/multi-cluster-manager.go rename to pkg/util/fedinformer/typedmanager/multi-cluster-manager.go index fa633b5d1..132745525 100644 --- a/pkg/util/fedinformer/typedManager/multi-cluster-manager.go +++ b/pkg/util/fedinformer/typedmanager/multi-cluster-manager.go @@ -1,4 +1,4 @@ -package typedManager +package typedmanager import ( "sync" diff --git a/pkg/util/fedinformer/typedManager/single-cluster-manager.go b/pkg/util/fedinformer/typedmanager/single-cluster-manager.go similarity index 99% rename from pkg/util/fedinformer/typedManager/single-cluster-manager.go rename to pkg/util/fedinformer/typedmanager/single-cluster-manager.go index 93d2e8898..47d11a607 100644 --- a/pkg/util/fedinformer/typedManager/single-cluster-manager.go +++ b/pkg/util/fedinformer/typedmanager/single-cluster-manager.go @@ -1,4 +1,4 @@ -package typedManager +package typedmanager import ( "context"