github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove cloud provider dependency from volume host and volume controllers

Browse Source
This commit is contained in:
carlory
2024-03-19 14:16:25 +08:00
parent 1fc92f393d
commit 9ec6ee539a
14 changed files with 13 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/integration/volume/attach_detach_test.go
View File

@@ -30,7 +30,6 @@ import (
clientset "k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/tools/cache"
fakecloud "k8s.io/cloud-provider/fake"
kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing"
"k8s.io/kubernetes/pkg/controller/volume/attachdetach"
volumecache "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache"
@@ -348,7 +347,6 @@ func createAdClients(ctx context.Context, t *testing.T, server *kubeapiservertes
Detachers: nil,
}
plugins := []volume.VolumePlugin{plugin}
cloud := &fakecloud.Cloud{}
informers := clientgoinformers.NewSharedInformerFactory(testClient, resyncPeriod)
ctrl, err := attachdetach.NewAttachDetachController(
ctx,
@@ -360,7 +358,6 @@ func createAdClients(ctx context.Context, t *testing.T, server *kubeapiservertes
informers.Storage().V1().CSINodes(),
informers.Storage().V1().CSIDrivers(),
informers.Storage().V1().VolumeAttachments(),
cloud,
plugins,
nil, /* prober */
false,
@@ -379,7 +376,6 @@ func createAdClients(ctx context.Context, t *testing.T, server *kubeapiservertes
KubeClient: testClient,
SyncPeriod: controllerOptions.PVClaimBinderSyncPeriod,
VolumePlugins: plugins,
Cloud: nil,
ClusterName: "volume-test-cluster",
VolumeInformer: informers.Core().V1().PersistentVolumes(),
ClaimInformer: informers.Core().V1().PersistentVolumeClaims(),

3
test/integration/volume/persistent_volumes_test.go
View File

@@ -34,7 +34,6 @@ import (
clientset "k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"
ref "k8s.io/client-go/tools/reference"
fakecloud "k8s.io/cloud-provider/fake"
kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/volume/persistentvolume"
@@ -1353,7 +1352,6 @@ func createClients(ctx context.Context, namespaceName string, t *testing.T, s *k
Detachers: nil,
}
plugins := []volume.VolumePlugin{plugin}
cloud := &fakecloud.Cloud{}
informers := informers.NewSharedInformerFactory(testClient, getSyncPeriod(syncPeriod))
ctrl, err := persistentvolumecontroller.NewController(
ctx,
@@ -1361,7 +1359,6 @@ func createClients(ctx context.Context, namespaceName string, t *testing.T, s *k
KubeClient: binderClient,
SyncPeriod: getSyncPeriod(syncPeriod),
VolumePlugins: plugins,
Cloud: cloud,
VolumeInformer: informers.Core().V1().PersistentVolumes(),
ClaimInformer: informers.Core().V1().PersistentVolumeClaims(),
ClassInformer: informers.Storage().V1().StorageClasses(),