From b7c815c148f4260aff2ada142d4905c5cc975d60 Mon Sep 17 00:00:00 2001 From: Xinzhao Xu Date: Mon, 22 Aug 2022 11:19:00 +0800 Subject: [PATCH] Remove scheme duplicate registration code (#5147) --- .../storage/capability/capability_controller.go | 12 ++---------- .../snapshotclass/snapshotclass_controller.go | 9 +-------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/pkg/controller/storage/capability/capability_controller.go b/pkg/controller/storage/capability/capability_controller.go index 78d17418c..98128dfeb 100644 --- a/pkg/controller/storage/capability/capability_controller.go +++ b/pkg/controller/storage/capability/capability_controller.go @@ -25,22 +25,17 @@ import ( "strconv" "time" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - - "k8s.io/apimachinery/pkg/labels" - storagev1 "k8s.io/api/storage/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/labels" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" storageinformersv1 "k8s.io/client-go/informers/storage/v1" - "k8s.io/client-go/kubernetes/scheme" storageclient "k8s.io/client-go/kubernetes/typed/storage/v1" storagelistersv1 "k8s.io/client-go/listers/storage/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" "k8s.io/klog" - - crdscheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) const ( @@ -66,9 +61,6 @@ func NewController( storageClassInformer storageinformersv1.StorageClassInformer, csiDriverInformer storageinformersv1.CSIDriverInformer, ) *StorageCapabilityController { - - utilruntime.Must(crdscheme.AddToScheme(scheme.Scheme)) - controller := &StorageCapabilityController{ storageClassClient: storageClassClient, storageClassLister: storageClassInformer.Lister(), diff --git a/pkg/controller/storage/snapshotclass/snapshotclass_controller.go b/pkg/controller/storage/snapshotclass/snapshotclass_controller.go index 02515a466..498dea5da 100644 --- a/pkg/controller/storage/snapshotclass/snapshotclass_controller.go +++ b/pkg/controller/storage/snapshotclass/snapshotclass_controller.go @@ -24,24 +24,20 @@ import ( "strconv" "time" - storagev1 "k8s.io/api/storage/v1" - snapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1" snapshotclient "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned/typed/volumesnapshot/v1" snapinformers "github.com/kubernetes-csi/external-snapshotter/client/v4/informers/externalversions/volumesnapshot/v1" snapshotlisters "github.com/kubernetes-csi/external-snapshotter/client/v4/listers/volumesnapshot/v1" + storagev1 "k8s.io/api/storage/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" storageinformersv1 "k8s.io/client-go/informers/storage/v1" - "k8s.io/client-go/kubernetes/scheme" storagelistersv1 "k8s.io/client-go/listers/storage/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" "k8s.io/klog" - - crdscheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) const annotationAllowSnapshot = "storageclass.kubesphere.io/allow-snapshot" @@ -63,9 +59,6 @@ func NewController( snapshotClassClient snapshotclient.VolumeSnapshotClassInterface, snapshotClassInformer snapinformers.VolumeSnapshotClassInformer, ) *VolumeSnapshotClassController { - - utilruntime.Must(crdscheme.AddToScheme(scheme.Scheme)) - controller := &VolumeSnapshotClassController{ storageClassLister: storageClassInformer.Lister(), storageClassSynced: storageClassInformer.Informer().HasSynced,