tidy code

Author: Colvin-Y

pkg/descheduler/descheduler.go

@@ -34,7 +34,6 @@ import (
 	policyv1 "k8s.io/api/policy/v1"
 	schedulingv1 "k8s.io/api/scheduling/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -209,9 +208,6 @@ func preserveNeeded(obj interface{}) (interface{}, error) {
 
 func newDescheduler(ctx context.Context, rs *options.DeschedulerServer, deschedulerPolicy *api.DeschedulerPolicy, evictionPolicyGroupVersion string, eventRecorder events.EventRecorder, sharedInformerFactory, namespacedSharedInformerFactory informers.SharedInformerFactory) (*descheduler, error) {
 	podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
-	podInformer.SetTransform(preserveNeeded)
-	nodeInformer := sharedInformerFactory.Core().V1().Nodes().Informer()
-	nodeInformer.SetTransform(preserveNeeded)
 
 	ir := newInformerResources(sharedInformerFactory)
 	ir.Uses(v1.SchemeGroupVersion.WithResource("pods"),
@@ -642,7 +638,7 @@ func RunDeschedulerStrategies(ctx context.Context, rs *options.DeschedulerServer
 	ctx, span = tracing.Tracer().Start(ctx, "RunDeschedulerStrategies")
 	defer span.End()
 
-	sharedInformerFactory := informers.NewSharedInformerFactoryWithOptions(rs.Client, 0, informers.WithTransform(trimManagedFields))
+	sharedInformerFactory := informers.NewSharedInformerFactoryWithOptions(rs.Client, 0, informers.WithTransform(preserveNeeded))
 
 	var nodeSelector string
 	if deschedulerPolicy.NodeSelector != nil {
@@ -665,7 +661,7 @@ func RunDeschedulerStrategies(ctx context.Context, rs *options.DeschedulerServer
 	if prometheusProvider != nil && prometheusProvider.Prometheus != nil && prometheusProvider.Prometheus.URL != "" {
 		if prometheusProvider.Prometheus.AuthToken != nil {
 			// Will get reconciled
-			namespacedSharedInformerFactory = informers.NewSharedInformerFactoryWithOptions(rs.Client, 0, informers.WithTransform(trimManagedFields), informers.WithNamespace(prometheusProvider.Prometheus.AuthToken.SecretReference.Namespace))
+			namespacedSharedInformerFactory = informers.NewSharedInformerFactoryWithOptions(rs.Client, 0, informers.WithTransform(preserveNeeded), informers.WithNamespace(prometheusProvider.Prometheus.AuthToken.SecretReference.Namespace))
 			metricProviderTokenReconciliation = secretReconciliation
 		} else {
 			// Use the sa token and assume it has the sufficient permissions to authenticate
@@ -768,10 +764,3 @@ func createClients(clientConnection componentbaseconfig.ClientConnectionConfigur
 
 	return kClient, eventClient, nil
 }
-
-func trimManagedFields(obj interface{}) (interface{}, error) {
-	if accessor, err := meta.Accessor(obj); err == nil {
-		accessor.SetManagedFields(nil)
-	}
-	return obj, nil
-}

pkg/descheduler/descheduler_test.go

@@ -190,7 +190,7 @@ func initDescheduler(t *testing.T, ctx context.Context, featureGates featuregate
 	rs.DefaultFeatureGates = featureGates
 	rs.MetricsClient = metricsClient
 
-	sharedInformerFactory := informers.NewSharedInformerFactoryWithOptions(rs.Client, 0, informers.WithTransform(trimManagedFields))
+	sharedInformerFactory := informers.NewSharedInformerFactoryWithOptions(rs.Client, 0, informers.WithTransform(preserveNeeded))
 	eventBroadcaster, eventRecorder := utils.GetRecorderAndBroadcaster(ctx, client)
 
 	descheduler, err := newDescheduler(ctx, rs, internalDeschedulerPolicy, "v1", eventRecorder, sharedInformerFactory, nil)