[test][integration] Drop fwk.RunManager in favor of SetupClient a…

…nd `StartManager` (kubernetes-sigs#3179)
KunWuLuan · Oct 2, 2024 · 1247fa3 · 1247fa3
1 parent f920c18
commit 1247fa3
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 12 deletions.
diff --git a/test/integration/framework/framework.go b/test/integration/framework/framework.go
@@ -207,12 +207,6 @@ func (f *Framework) StopManager(ctx context.Context) {
 	})
 }
 
-func (f *Framework) RunManager(cfg *rest.Config, managerSetup ManagerSetup) (context.Context, client.Client) {
-	ctx, k8sClient := f.SetupClient(cfg)
-	f.StartManager(ctx, cfg, managerSetup)
-	return ctx, k8sClient
-}
-
 func (f *Framework) Teardown() {
 	ginkgo.By("tearing down the test environment")
 	if f.cancel != nil {

diff --git a/test/integration/kueuectl/suite_test.go b/test/integration/kueuectl/suite_test.go
@@ -60,7 +60,8 @@ func TestKueuectl(t *testing.T) {
 var _ = ginkgo.BeforeSuite(func() {
 	fwk = &framework.Framework{CRDPath: crdPath, WebhookPath: webhookPath}
 	cfg = fwk.Init()
-	ctx, k8sClient = fwk.RunManager(cfg, managerSetup)
+	ctx, k8sClient = fwk.SetupClient(cfg)
+	fwk.StartManager(ctx, cfg, managerSetup)
 
 	kassetsPath = os.Getenv("KUBEBUILDER_ASSETS")
 	kueuectlPath = path.Join(os.Getenv("KUEUE_BIN"), "kubectl-kueue")

diff --git a/test/integration/scheduler/fairsharing/suite_test.go b/test/integration/scheduler/fairsharing/suite_test.go
@@ -60,7 +60,8 @@ var _ = ginkgo.BeforeSuite(func() {
 		WebhookPath: filepath.Join("..", "..", "..", "..", "config", "components", "webhook"),
 	}
 	cfg = fwk.Init()
-	ctx, k8sClient = fwk.RunManager(cfg, managerAndSchedulerSetup)
+	ctx, k8sClient = fwk.SetupClient(cfg)
+	fwk.StartManager(ctx, cfg, managerAndSchedulerSetup)
 })
 
 var _ = ginkgo.AfterSuite(func() {

diff --git a/test/integration/scheduler/suite_test.go b/test/integration/scheduler/suite_test.go
@@ -60,7 +60,8 @@ var _ = ginkgo.BeforeSuite(func() {
 		WebhookPath: filepath.Join("..", "..", "..", "config", "components", "webhook"),
 	}
 	cfg = fwk.Init()
-	ctx, k8sClient = fwk.RunManager(cfg, managerAndSchedulerSetup)
+	ctx, k8sClient = fwk.SetupClient(cfg)
+	fwk.StartManager(ctx, cfg, managerAndSchedulerSetup)
 })
 
 var _ = ginkgo.AfterSuite(func() {

diff --git a/test/integration/webhook/core/suite_test.go b/test/integration/webhook/core/suite_test.go
@@ -56,7 +56,8 @@ var _ = ginkgo.BeforeSuite(func() {
 		WebhookPath: filepath.Join("..", "..", "..", "..", "config", "components", "webhook"),
 	}
 	cfg = fwk.Init()
-	ctx, k8sClient = fwk.RunManager(cfg, func(ctx context.Context, mgr manager.Manager) {
+	ctx, k8sClient = fwk.SetupClient(cfg)
+	fwk.StartManager(ctx, cfg, func(ctx context.Context, mgr manager.Manager) {
 		err := indexer.Setup(ctx, mgr.GetFieldIndexer())
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 

diff --git a/test/integration/webhook/jobs/pod_webhook_test.go b/test/integration/webhook/jobs/pod_webhook_test.go
@@ -179,7 +179,7 @@ var _ = ginkgo.Describe("Pod Webhook", func() {
 			err = serverVersionFetcher.FetchServerVersion()
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
-			fwk.RunManager(cfg, managerSetup(
+			fwk.StartManager(ctx, cfg, managerSetup(
 				pod.SetupWebhook,
 				jobframework.WithManageJobsWithoutQueueName(true),
 				jobframework.WithKubeServerVersion(serverVersionFetcher),

diff --git a/test/integration/webhook/jobs/raycluster_webhook_test.go b/test/integration/webhook/jobs/raycluster_webhook_test.go
@@ -71,7 +71,7 @@ var _ = ginkgo.Describe("RayCluster Webhook", func() {
 
 	ginkgo.When("With manageJobsWithoutQueueName enabled", ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
 		ginkgo.BeforeAll(func() {
-			fwk.RunManager(cfg, managerSetup(func(mgr ctrl.Manager, opts ...jobframework.Option) error {
+			fwk.StartManager(ctx, cfg, managerSetup(func(mgr ctrl.Manager, opts ...jobframework.Option) error {
 				reconciler := raycluster.NewReconciler(
 					mgr.GetClient(),
 					mgr.GetEventRecorderFor(constants.JobControllerName),