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

update csiDriver apiVersion

Browse Source 
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
This commit is contained in:
f10atin9
2021-09-01 17:56:29 +08:00
parent 9455ab92a9
commit b68ff57e60
5 changed files with 10 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,8 +25,6 @@ import (
"time"
"k8s.io/apimachinery/pkg/labels"
storageinformersv1beta1 "k8s.io/client-go/informers/storage/v1beta1"
storagelistersv1beta1 "k8s.io/client-go/listers/storage/v1beta1"
storagev1 "k8s.io/api/storage/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -53,7 +51,7 @@ type StorageCapabilityController struct {
storageClassLister storagelistersv1.StorageClassLister
storageClassSynced cache.InformerSynced
csiDriverLister storagelistersv1beta1.CSIDriverLister
csiDriverLister storagelistersv1.CSIDriverLister
csiDriverSynced cache.InformerSynced
storageClassWorkQueue workqueue.RateLimitingInterface
@@ -64,7 +62,7 @@ type StorageCapabilityController struct {
func NewController(
storageClassClient storageclient.StorageClassInterface,
storageClassInformer storageinformersv1.StorageClassInformer,
csiDriverInformer storageinformersv1beta1.CSIDriverInformer,
csiDriverInformer storageinformersv1.CSIDriverInformer,
) *StorageCapabilityController {
utilruntime.Must(crdscheme.AddToScheme(scheme.Scheme))

15
pkg/controller/storage/capability/capability_controller_test.go
View File

@@ -19,13 +19,12 @@
package capability
import (
"github.com/google/go-cmp/cmp"
"k8s.io/api/storage/v1beta1"
"reflect"
"testing"
"time"
"github.com/google/go-cmp/cmp"
storagev1 "k8s.io/api/storage/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
@@ -53,7 +52,7 @@ type fixture struct {
storageObjects []runtime.Object // include StorageClass
// Objects to put in the store.
storageClassLister []*storagev1.StorageClass
csiDriverLister []*v1beta1.CSIDriver
csiDriverLister []*storagev1.CSIDriver
// Actions expected to happen on the client.
actions []core.Action
}
@@ -74,14 +73,14 @@ func (f *fixture) newController() (*StorageCapabilityController,
c := NewController(
f.k8sClient.StorageV1().StorageClasses(),
k8sInformers.Storage().V1().StorageClasses(),
k8sInformers.Storage().V1beta1().CSIDrivers(),
k8sInformers.Storage().V1().CSIDrivers(),
)
for _, storageClass := range f.storageClassLister {
_ = k8sInformers.Storage().V1().StorageClasses().Informer().GetIndexer().Add(storageClass)
}
for _, csiDriver := range f.csiDriverLister {
_ = k8sInformers.Storage().V1beta1().CSIDrivers().Informer().GetIndexer().Add(csiDriver)
_ = k8sInformers.Storage().V1().CSIDrivers().Informer().GetIndexer().Add(csiDriver)
}
return c, k8sInformers
@@ -197,8 +196,8 @@ func newStorageClass(name string, provisioner string) *storagev1.StorageClass {
}
}
func newCSIDriver(name string) *v1beta1.CSIDriver {
return &v1beta1.CSIDriver{
func newCSIDriver(name string) *storagev1.CSIDriver {
return &storagev1.CSIDriver{
ObjectMeta: v1.ObjectMeta{
Name: name,
},