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

Merge pull request #110410 from Jiawei0227/master

Browse Source 
CSIMigration feature gate to GA
This commit is contained in:
Kubernetes Prow Robot
2022-06-22 04:05:48 -07:00
committed by GitHub
parent 23144130a8 760365d5c9
commit 18b5efceda
22 changed files with 29 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,6 @@ import (
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
utilfeature "k8s.io/apiserver/pkg/util/feature"
clientgoinformers "k8s.io/client-go/informers"
clientset "k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"
@@ -37,7 +36,6 @@ import (
volumecache "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache"
"k8s.io/kubernetes/pkg/controller/volume/persistentvolume"
persistentvolumeoptions "k8s.io/kubernetes/pkg/controller/volume/persistentvolume/options"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/volume"
volumetest "k8s.io/kubernetes/pkg/volume/testing"
"k8s.io/kubernetes/pkg/volume/util"
@@ -213,9 +211,7 @@ func TestPodDeletionWithDswp(t *testing.T) {
}
func initCSIObjects(stopCh <-chan struct{}, informers clientgoinformers.SharedInformerFactory) {
if utilfeature.DefaultFeatureGate.Enabled(features.CSIMigration) {
go informers.Storage().V1().CSINodes().Informer().Run(stopCh)
}
go informers.Storage().V1().CSINodes().Informer().Run(stopCh)
go informers.Storage().V1().CSIDrivers().Informer().Run(stopCh)
}