Merge pull request kubernetes-sigs#10506 from sbueringer/pr-reg-m-once

k8s-ci-robot · web-flow · commit 3e4c1960b31d · 2024-04-24T08:48:02.000-07:00
🌱 envtest: Setup Machine webhook only once
diff --git a/internal/test/envtest/environment.go b/internal/test/envtest/environment.go
@@ -291,9 +291,6 @@ func newEnvironment(uncachedObjs ...client.Object) *Environment {
 	if err := (&webhooks.MachineHealthCheck{}).SetupWebhookWithManager(mgr); err != nil {
 		klog.Fatalf("unable to create webhook: %+v", err)
 	}
-	if err := (&webhooks.Machine{}).SetupWebhookWithManager(mgr); err != nil {
-		klog.Fatalf("unable to create webhook: %+v", err)
-	}
 	if err := (&webhooks.MachineSet{}).SetupWebhookWithManager(mgr); err != nil {
 		klog.Fatalf("unable to create webhook: %+v", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -291,9 +291,6 @@ func newEnvironment(uncachedObjs ...client.Object) *Environment {`
`291`	`291`	`if err := (&webhooks.MachineHealthCheck{}).SetupWebhookWithManager(mgr); err != nil {`
`292`	`292`	`klog.Fatalf("unable to create webhook: %+v", err)`
`293`	`293`	`}`
`294`		`- if err := (&webhooks.Machine{}).SetupWebhookWithManager(mgr); err != nil {`
`295`		`- klog.Fatalf("unable to create webhook: %+v", err)`
`296`		`- }`
`297`	`294`	`if err := (&webhooks.MachineSet{}).SetupWebhookWithManager(mgr); err != nil {`
`298`	`295`	`klog.Fatalf("unable to create webhook: %+v", err)`
`299`	`296`	`}`