admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove scheme duplicate registration code (#5147)

Browse Source
This commit is contained in:
Xinzhao Xu
2022-08-22 11:19:00 +08:00
committed by GitHub
parent 644badf8c7
commit b7c815c148
2 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/controller/storage/capability/capability_controller.go
View File

@@ -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(),

9
pkg/controller/storage/snapshotclass/snapshotclass_controller.go
View File

@@ -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,