@@ -23,8 +23,7 @@ import (
2323 "regexp"
2424 "testing"
2525
26- v1 "k8s.io/api/core/v1"
27- storagev1 "k8s.io/api/storage/v1"
26+ "k8s.io/api/core/v1"
2827 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2928 "k8s.io/apimachinery/pkg/runtime"
3029 "k8s.io/apimachinery/pkg/types"
@@ -49,7 +48,6 @@ func TestSyncHandler(t *testing.T) {
4948 tests := []struct {
5049 name string
5150 csiMigrationEnabled bool
52- storageClass * storagev1.StorageClass
5351 pvcKey string
5452 pv * v1.PersistentVolume
5553 pvc * v1.PersistentVolumeClaim
@@ -59,27 +57,14 @@ func TestSyncHandler(t *testing.T) {
5957 }{
6058 {
6159 name : "when pvc has no PV binding" ,
62- pvc : getFakePersistentVolumeClaim ("no-pv-pvc" , "" , "" , "" ),
60+ pvc : getFakePersistentVolumeClaim ("no-pv-pvc" , "" , "" ),
6361 pvcKey : "default/no-pv-pvc" ,
6462 hasError : true ,
6563 },
66- {
67- name : "when pvc has no storageclass" ,
68- pv : getFakePersistentVolume ("vol-1" , csitranslationplugins .AWSEBSInTreePluginName , "no-sc-pvc-vol-1" ),
69- pvc : getFakePersistentVolumeClaim ("no-sc-pvc" , "vol-1" , "" , "no-sc-pvc-vol-1" ),
70- pvcKey : "default/no-sc-pvc" ,
71- },
72- {
73- name : "when pvc storageclass is missing" ,
74- pv : getFakePersistentVolume ("vol-2" , csitranslationplugins .AWSEBSInTreePluginName , "missing-sc-pvc-vol-2" ),
75- pvc : getFakePersistentVolumeClaim ("missing-sc-pvc" , "vol-2" , "resizable" , "missing-sc-pvc-vol-2" ),
76- pvcKey : "default/missing-sc-pvc" ,
77- },
7864 {
7965 name : "when pvc and pv has everything for in-tree plugin" ,
8066 pv : getFakePersistentVolume ("vol-3" , csitranslationplugins .AWSEBSInTreePluginName , "good-pvc-vol-3" ),
81- pvc : getFakePersistentVolumeClaim ("good-pvc" , "vol-3" , "resizable2" , "good-pvc-vol-3" ),
82- storageClass : getFakeStorageClass ("resizable2" , csitranslationplugins .AWSEBSInTreePluginName ),
67+ pvc : getFakePersistentVolumeClaim ("good-pvc" , "vol-3" , "good-pvc-vol-3" ),
8368 pvcKey : "default/good-pvc" ,
8469 expansionCalled : true ,
8570 expectedAnnotation : map [string ]string {volumetypes .VolumeResizerKey : csitranslationplugins .AWSEBSInTreePluginName },
@@ -88,16 +73,14 @@ func TestSyncHandler(t *testing.T) {
8873 name : "when csi migration is enabled for a in-tree plugin" ,
8974 csiMigrationEnabled : true ,
9075 pv : getFakePersistentVolume ("vol-4" , csitranslationplugins .AWSEBSInTreePluginName , "csi-pvc-vol-4" ),
91- pvc : getFakePersistentVolumeClaim ("csi-pvc" , "vol-4" , "resizable3" , "csi-pvc-vol-4" ),
92- storageClass : getFakeStorageClass ("resizable3" , csitranslationplugins .AWSEBSInTreePluginName ),
76+ pvc : getFakePersistentVolumeClaim ("csi-pvc" , "vol-4" , "csi-pvc-vol-4" ),
9377 pvcKey : "default/csi-pvc" ,
9478 expectedAnnotation : map [string ]string {volumetypes .VolumeResizerKey : csitranslationplugins .AWSEBSDriverName },
9579 },
9680 {
9781 name : "for csi plugin without migration path" ,
9882 pv : getFakePersistentVolume ("vol-5" , "com.csi.ceph" , "ceph-csi-pvc-vol-5" ),
99- pvc : getFakePersistentVolumeClaim ("ceph-csi-pvc" , "vol-5" , "resizable4" , "ceph-csi-pvc-vol-5" ),
100- storageClass : getFakeStorageClass ("resizable4" , "com.csi.ceph" ),
83+ pvc : getFakePersistentVolumeClaim ("ceph-csi-pvc" , "vol-5" , "ceph-csi-pvc-vol-5" ),
10184 pvcKey : "default/ceph-csi-pvc" ,
10285 expansionCalled : false ,
10386 hasError : false ,
@@ -110,7 +93,6 @@ func TestSyncHandler(t *testing.T) {
11093 informerFactory := informers .NewSharedInformerFactory (fakeKubeClient , controller .NoResyncPeriodFunc ())
11194 pvcInformer := informerFactory .Core ().V1 ().PersistentVolumeClaims ()
11295 pvInformer := informerFactory .Core ().V1 ().PersistentVolumes ()
113- storageClassInformer := informerFactory .Storage ().V1 ().StorageClasses ()
11496
11597 pvc := test .pvc
11698 if tc .pv != nil {
@@ -122,11 +104,8 @@ func TestSyncHandler(t *testing.T) {
122104 }
123105 allPlugins := []volume.VolumePlugin {}
124106 allPlugins = append (allPlugins , awsebs .ProbeVolumePlugins ()... )
125- if tc .storageClass != nil {
126- informerFactory .Storage ().V1 ().StorageClasses ().Informer ().GetIndexer ().Add (tc .storageClass )
127- }
128107 translator := csitrans .New ()
129- expc , err := NewExpandController (fakeKubeClient , pvcInformer , pvInformer , storageClassInformer , nil , allPlugins , translator , csimigration .NewPluginManager (translator ), nil )
108+ expc , err := NewExpandController (fakeKubeClient , pvcInformer , pvInformer , nil , allPlugins , translator , csimigration .NewPluginManager (translator ), nil )
130109 if err != nil {
131110 t .Fatalf ("error creating expand controller : %v" , err )
132111 }
@@ -226,7 +205,7 @@ func getFakePersistentVolume(volumeName, pluginName string, pvcUID types.UID) *v
226205 return pv
227206}
228207
229- func getFakePersistentVolumeClaim (pvcName , volumeName , scName string , uid types.UID ) * v1.PersistentVolumeClaim {
208+ func getFakePersistentVolumeClaim (pvcName , volumeName string , uid types.UID ) * v1.PersistentVolumeClaim {
230209 pvc := & v1.PersistentVolumeClaim {
231210 ObjectMeta : metav1.ObjectMeta {Name : pvcName , Namespace : "default" , UID : uid },
232211 Spec : v1.PersistentVolumeClaimSpec {},
@@ -235,15 +214,5 @@ func getFakePersistentVolumeClaim(pvcName, volumeName, scName string, uid types.
235214 pvc .Spec .VolumeName = volumeName
236215 }
237216
238- if scName != "" {
239- pvc .Spec .StorageClassName = & scName
240- }
241217 return pvc
242218}
243-
244- func getFakeStorageClass (scName , pluginName string ) * storagev1.StorageClass {
245- return & storagev1.StorageClass {
246- ObjectMeta : metav1.ObjectMeta {Name : scName },
247- Provisioner : pluginName ,
248- }
249- }
0 commit comments