refactor: move scheme initial into init functions in each plugins

Author: zwpaper

pkg/networkaware/networkoverhead/networkoverhead.go

@@ -61,6 +61,15 @@ const (
 	preFilterStateKey = "PreFilter" + Name
 )
 
+var scheme = runtime.NewScheme()
+
+func init() {
+	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
+
+	utilruntime.Must(agv1alpha1.AddToScheme(scheme))
+	utilruntime.Must(ntv1alpha1.AddToScheme(scheme))
+}
+
 // NetworkOverhead : Filter and Score nodes based on Pod's AppGroup requirements: MaxNetworkCosts requirements among Pods with dependencies
 type NetworkOverhead struct {
 	client.Client
@@ -137,14 +146,6 @@ func New(obj runtime.Object, handle framework.Handle) (framework.Plugin, error)
 	if err != nil {
 		return nil, err
 	}
-
-	scheme := runtime.NewScheme()
-
-	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
-
-	utilruntime.Must(agv1alpha1.AddToScheme(scheme))
-	utilruntime.Must(ntv1alpha1.AddToScheme(scheme))
-
 	client, err := client.New(handle.KubeConfig(), client.Options{
 		Scheme: scheme,
 	})

pkg/networkaware/networkoverhead/networkoverhead_test.go

@@ -32,7 +32,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/informers"
 	testClientSet "k8s.io/client-go/kubernetes/fake"
-	"k8s.io/client-go/kubernetes/scheme"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/util/workqueue"
 	"k8s.io/kubernetes/pkg/scheduler/framework"
 	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder"
@@ -488,7 +488,7 @@ func BenchmarkNetworkOverheadPreFilter(b *testing.B) {
 
 	for _, tt := range tests {
 		b.Run(tt.name, func(b *testing.B) {
-			s := scheme.Scheme
+			s := clientgoscheme.Scheme
 			utilruntime.Must(agv1alpha1.AddToScheme(s))
 			utilruntime.Must(ntv1alpha1.AddToScheme(s))
 
@@ -716,7 +716,7 @@ func TestNetworkOverheadScore(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			s := scheme.Scheme
+			s := clientgoscheme.Scheme
 			utilruntime.Must(agv1alpha1.AddToScheme(s))
 			utilruntime.Must(ntv1alpha1.AddToScheme(s))
 
@@ -956,7 +956,7 @@ func BenchmarkNetworkOverheadScore(b *testing.B) {
 
 	for _, tt := range tests {
 		b.Run(tt.name, func(b *testing.B) {
-			s := scheme.Scheme
+			s := clientgoscheme.Scheme
 			utilruntime.Must(agv1alpha1.AddToScheme(s))
 			utilruntime.Must(ntv1alpha1.AddToScheme(s))
 
@@ -1189,7 +1189,7 @@ func TestNetworkOverheadFilter(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			s := scheme.Scheme
+			s := clientgoscheme.Scheme
 			utilruntime.Must(agv1alpha1.AddToScheme(s))
 			utilruntime.Must(ntv1alpha1.AddToScheme(s))
 
@@ -1413,7 +1413,7 @@ func BenchmarkNetworkOverheadFilter(b *testing.B) {
 
 	for _, tt := range tests {
 		b.Run(tt.name, func(b *testing.B) {
-			s := scheme.Scheme
+			s := clientgoscheme.Scheme
 			utilruntime.Must(agv1alpha1.AddToScheme(s))
 			utilruntime.Must(ntv1alpha1.AddToScheme(s))
 

pkg/networkaware/topologicalsort/topologicalsort.go

@@ -40,6 +40,13 @@ const (
 	Name = "TopologicalSort"
 )
 
+var scheme = runtime.NewScheme()
+
+func init() {
+	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
+	utilruntime.Must(agv1alpha.AddToScheme(scheme))
+}
+
 // TopologicalSort : Sort pods based on their AppGroup and corresponding microservice dependencies
 type TopologicalSort struct {
 	client.Client
@@ -73,11 +80,6 @@ func New(obj runtime.Object, handle framework.Handle) (framework.Plugin, error)
 		return nil, err
 	}
 
-	scheme := runtime.NewScheme()
-
-	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
-	utilruntime.Must(agv1alpha.AddToScheme(scheme))
-
 	client, err := client.New(handle.KubeConfig(), client.Options{
 		Scheme: scheme,
 	})

pkg/networkaware/topologicalsort/topologicalsort_test.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/rand"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-	"k8s.io/client-go/kubernetes/scheme"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/util/workqueue"
 	"k8s.io/kubernetes/pkg/scheduler/framework"
 	st "k8s.io/kubernetes/pkg/scheduler/testing"
@@ -249,7 +249,7 @@ func TestTopologicalSortLess(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			pods := makePodsAppGroup(tt.deploymentNames, tt.agName, tt.podPhase)
 
-			s := scheme.Scheme
+			s := clientgoscheme.Scheme
 			utilruntime.Must(agv1alpha1.AddToScheme(s))
 			client := fake.NewClientBuilder().
 				WithScheme(s).
@@ -429,7 +429,7 @@ func BenchmarkTopologicalSortPlugin(b *testing.B) {
 
 			pods := makePodsAppGroup(tt.deploymentNames, tt.agName, tt.podPhase)
 
-			s := scheme.Scheme
+			s := clientgoscheme.Scheme
 			utilruntime.Must(agv1alpha1.AddToScheme(s))
 			client := fake.NewClientBuilder().
 				WithScheme(s).

pkg/noderesourcetopology/plugin.go

@@ -22,6 +22,8 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/runtime"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/klog/v2"
 	"k8s.io/kubernetes/pkg/scheduler/framework"
 
@@ -38,6 +40,13 @@ const (
 	Name = "NodeResourceTopologyMatch"
 )
 
+var scheme = runtime.NewScheme()
+
+func init() {
+	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
+	utilruntime.Must(topologyv1alpha2.AddToScheme(scheme))
+}
+
 type NUMANode struct {
 	NUMAID    int
 	Resources v1.ResourceList

pkg/noderesourcetopology/pluginhelpers.go

@@ -23,10 +23,7 @@ import (
 	"time"
 
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"
-	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	k8scache "k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2"
 	"k8s.io/kubernetes/pkg/scheduler/framework"
@@ -45,9 +42,6 @@ const (
 )
 
 func initNodeTopologyInformer(tcfg *apiconfig.NodeResourceTopologyMatchArgs, handle framework.Handle) (nrtcache.Interface, error) {
-	scheme := runtime.NewScheme()
-	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
-	utilruntime.Must(topologyv1alpha2.AddToScheme(scheme))
 	client, err := ctrlclient.New(handle.KubeConfig(), ctrlclient.Options{Scheme: scheme})
 	if err != nil {
 		klog.ErrorS(err, "Cannot create client for NodeTopologyResource", "kubeConfig", handle.KubeConfig())