Skip to content

Commit 6910e76

Browse files
committed
test:Add podgcCtrl to attachdetachClients
1 parent 68f6347 commit 6910e76

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

test/integration/volume/attach_detach_test.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
restclient "k8s.io/client-go/rest"
3232
"k8s.io/client-go/tools/cache"
3333
kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing"
34+
"k8s.io/kubernetes/pkg/controller/podgc"
3435
"k8s.io/kubernetes/pkg/controller/volume/attachdetach"
3536
volumecache "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache"
3637
"k8s.io/kubernetes/pkg/controller/volume/persistentvolume"
@@ -326,7 +327,7 @@ func waitForPodFuncInDSWP(t *testing.T, dswp volumecache.DesiredStateOfWorld, ch
326327
}
327328
}
328329

329-
func createAdClients(ctx context.Context, t *testing.T, server *kubeapiservertesting.TestServer, syncPeriod time.Duration, timers attachdetach.TimerConfig) (*clientset.Clientset, attachdetach.AttachDetachController, *persistentvolume.PersistentVolumeController, clientgoinformers.SharedInformerFactory) {
330+
func createAdClients(ctx context.Context, t *testing.T, server *kubeapiservertesting.TestServer, syncPeriod time.Duration, timers attachdetach.TimerConfig) (*clientset.Clientset, attachdetach.AttachDetachController, *persistentvolume.PersistentVolumeController, *podgc.PodGCController, clientgoinformers.SharedInformerFactory) {
330331
config := restclient.CopyConfig(server.ClientConfig)
331332
config.QPS = 1000000
332333
config.Burst = 1000000
@@ -383,11 +384,20 @@ func createAdClients(ctx context.Context, t *testing.T, server *kubeapiservertes
383384
NodeInformer: informers.Core().V1().Nodes(),
384385
EnableDynamicProvisioning: false,
385386
}
387+
podgcCtrl := podgc.NewPodGCInternal(
388+
ctx,
389+
testClient,
390+
informers.Core().V1().Pods(),
391+
informers.Core().V1().Nodes(),
392+
0,
393+
500*time.Millisecond,
394+
time.Second,
395+
)
386396
pvCtrl, err := persistentvolume.NewController(ctx, params)
387397
if err != nil {
388398
t.Fatalf("Failed to create PV controller: %v", err)
389399
}
390-
return testClient, ctrl, pvCtrl, informers
400+
return testClient, ctrl, pvCtrl, podgcCtrl, informers
391401
}
392402

393403
// Via integration test we can verify that if pod add

0 commit comments

Comments
 (0)