diff --git a/hack/docs/internal/cronjob-tutorial/generate_cronjob.go b/hack/docs/internal/cronjob-tutorial/generate_cronjob.go index 3f38b88e68d..f64a28ea3d5 100644 --- a/hack/docs/internal/cronjob-tutorial/generate_cronjob.go +++ b/hack/docs/internal/cronjob-tutorial/generate_cronjob.go @@ -362,14 +362,6 @@ CronJob controller's`+" `"+`SetupWithManager`+"`"+` method. }`, ` // +kubebuilder:docs-gen:collapse=old stuff`) CheckError("fixing main.go", err) - - err = pluginutil.ReplaceInFile( - filepath.Join(sp.ctx.Dir, "cmd/main.go"), - ` if err = (&batchv1.CronJob{}).SetupWebhookWithManager(mgr); err != nil { - setupLog.Error(err, "unable to create webhook", "webhook", "CronJob") - os.Exit(1) - }`, `}`) - CheckError("fixing main.go", err) } func updateWebhook(sp *Sample) { diff --git a/hack/docs/internal/cronjob-tutorial/main_revisited.go b/hack/docs/internal/cronjob-tutorial/main_revisited.go index 914a201461a..e0e52467c7b 100644 --- a/hack/docs/internal/cronjob-tutorial/main_revisited.go +++ b/hack/docs/internal/cronjob-tutorial/main_revisited.go @@ -37,9 +37,4 @@ const MainEnableWebhook = ` locally, we'll put them behind an environment variable. We'll just make sure to set` + " `" + `ENABLE_WEBHOOKS=false` + "`" + ` when we run locally. - */ - if os.Getenv("ENABLE_WEBHOOKS") != "false" { - if err = (&batchv1.CronJob{}).SetupWebhookWithManager(mgr); err != nil { - setupLog.Error(err, "unable to create webhook", "webhook", "CronJob") - os.Exit(1) - }` + */` diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/main.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/main.go index 61d49d76c58..2ad545a3349 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/main.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/main.go @@ -113,9 +113,11 @@ const ( os.Exit(1) } ` - webhookSetupCodeFragment = `if err = (&%s.%s{}).SetupWebhookWithManager(mgr); err != nil { - setupLog.Error(err, "unable to create webhook", "webhook", "%s") - os.Exit(1) + webhookSetupCodeFragment = `if os.Getenv("ENABLE_WEBHOOKS") != "false" { + if err = (&%s.%s{}).SetupWebhookWithManager(mgr); err != nil { + setupLog.Error(err, "unable to create webhook", "webhook", "%s") + os.Exit(1) + } } ` ) diff --git a/testdata/project-v4-multigroup/cmd/main.go b/testdata/project-v4-multigroup/cmd/main.go index 2e1ebae672e..c9bebd9afbc 100644 --- a/testdata/project-v4-multigroup/cmd/main.go +++ b/testdata/project-v4-multigroup/cmd/main.go @@ -124,9 +124,11 @@ func main() { setupLog.Error(err, "unable to create controller", "controller", "Captain") os.Exit(1) } - if err = (&crewv1.Captain{}).SetupWebhookWithManager(mgr); err != nil { - setupLog.Error(err, "unable to create webhook", "webhook", "Captain") - os.Exit(1) + if os.Getenv("ENABLE_WEBHOOKS") != "false" { + if err = (&crewv1.Captain{}).SetupWebhookWithManager(mgr); err != nil { + setupLog.Error(err, "unable to create webhook", "webhook", "Captain") + os.Exit(1) + } } if err = (&shipcontroller.FrigateReconciler{ Client: mgr.GetClient(), @@ -135,9 +137,11 @@ func main() { setupLog.Error(err, "unable to create controller", "controller", "Frigate") os.Exit(1) } - if err = (&shipv1beta1.Frigate{}).SetupWebhookWithManager(mgr); err != nil { - setupLog.Error(err, "unable to create webhook", "webhook", "Frigate") - os.Exit(1) + if os.Getenv("ENABLE_WEBHOOKS") != "false" { + if err = (&shipv1beta1.Frigate{}).SetupWebhookWithManager(mgr); err != nil { + setupLog.Error(err, "unable to create webhook", "webhook", "Frigate") + os.Exit(1) + } } if err = (&shipcontroller.DestroyerReconciler{ Client: mgr.GetClient(), @@ -146,9 +150,11 @@ func main() { setupLog.Error(err, "unable to create controller", "controller", "Destroyer") os.Exit(1) } - if err = (&shipv1.Destroyer{}).SetupWebhookWithManager(mgr); err != nil { - setupLog.Error(err, "unable to create webhook", "webhook", "Destroyer") - os.Exit(1) + if os.Getenv("ENABLE_WEBHOOKS") != "false" { + if err = (&shipv1.Destroyer{}).SetupWebhookWithManager(mgr); err != nil { + setupLog.Error(err, "unable to create webhook", "webhook", "Destroyer") + os.Exit(1) + } } if err = (&shipcontroller.CruiserReconciler{ Client: mgr.GetClient(), @@ -157,9 +163,11 @@ func main() { setupLog.Error(err, "unable to create controller", "controller", "Cruiser") os.Exit(1) } - if err = (&shipv2alpha1.Cruiser{}).SetupWebhookWithManager(mgr); err != nil { - setupLog.Error(err, "unable to create webhook", "webhook", "Cruiser") - os.Exit(1) + if os.Getenv("ENABLE_WEBHOOKS") != "false" { + if err = (&shipv2alpha1.Cruiser{}).SetupWebhookWithManager(mgr); err != nil { + setupLog.Error(err, "unable to create webhook", "webhook", "Cruiser") + os.Exit(1) + } } if err = (&seacreaturescontroller.KrakenReconciler{ Client: mgr.GetClient(), @@ -210,9 +218,11 @@ func main() { setupLog.Error(err, "unable to create controller", "controller", "Lakers") os.Exit(1) } - if err = (&testprojectorgv1.Lakers{}).SetupWebhookWithManager(mgr); err != nil { - setupLog.Error(err, "unable to create webhook", "webhook", "Lakers") - os.Exit(1) + if os.Getenv("ENABLE_WEBHOOKS") != "false" { + if err = (&testprojectorgv1.Lakers{}).SetupWebhookWithManager(mgr); err != nil { + setupLog.Error(err, "unable to create webhook", "webhook", "Lakers") + os.Exit(1) + } } if err = (&examplecomcontroller.MemcachedReconciler{ Client: mgr.GetClient(), @@ -230,9 +240,11 @@ func main() { setupLog.Error(err, "unable to create controller", "controller", "Busybox") os.Exit(1) } - if err = (&examplecomv1alpha1.Memcached{}).SetupWebhookWithManager(mgr); err != nil { - setupLog.Error(err, "unable to create webhook", "webhook", "Memcached") - os.Exit(1) + if os.Getenv("ENABLE_WEBHOOKS") != "false" { + if err = (&examplecomv1alpha1.Memcached{}).SetupWebhookWithManager(mgr); err != nil { + setupLog.Error(err, "unable to create webhook", "webhook", "Memcached") + os.Exit(1) + } } //+kubebuilder:scaffold:builder diff --git a/testdata/project-v4-with-deploy-image/cmd/main.go b/testdata/project-v4-with-deploy-image/cmd/main.go index 973a8f30205..8bb8383467d 100644 --- a/testdata/project-v4-with-deploy-image/cmd/main.go +++ b/testdata/project-v4-with-deploy-image/cmd/main.go @@ -105,9 +105,11 @@ func main() { setupLog.Error(err, "unable to create controller", "controller", "Busybox") os.Exit(1) } - if err = (&examplecomv1alpha1.Memcached{}).SetupWebhookWithManager(mgr); err != nil { - setupLog.Error(err, "unable to create webhook", "webhook", "Memcached") - os.Exit(1) + if os.Getenv("ENABLE_WEBHOOKS") != "false" { + if err = (&examplecomv1alpha1.Memcached{}).SetupWebhookWithManager(mgr); err != nil { + setupLog.Error(err, "unable to create webhook", "webhook", "Memcached") + os.Exit(1) + } } //+kubebuilder:scaffold:builder diff --git a/testdata/project-v4/cmd/main.go b/testdata/project-v4/cmd/main.go index 72c3aa70315..593dc4ef7a2 100644 --- a/testdata/project-v4/cmd/main.go +++ b/testdata/project-v4/cmd/main.go @@ -96,9 +96,11 @@ func main() { setupLog.Error(err, "unable to create controller", "controller", "Captain") os.Exit(1) } - if err = (&crewv1.Captain{}).SetupWebhookWithManager(mgr); err != nil { - setupLog.Error(err, "unable to create webhook", "webhook", "Captain") - os.Exit(1) + if os.Getenv("ENABLE_WEBHOOKS") != "false" { + if err = (&crewv1.Captain{}).SetupWebhookWithManager(mgr); err != nil { + setupLog.Error(err, "unable to create webhook", "webhook", "Captain") + os.Exit(1) + } } if err = (&controller.FirstMateReconciler{ Client: mgr.GetClient(), @@ -107,9 +109,11 @@ func main() { setupLog.Error(err, "unable to create controller", "controller", "FirstMate") os.Exit(1) } - if err = (&crewv1.FirstMate{}).SetupWebhookWithManager(mgr); err != nil { - setupLog.Error(err, "unable to create webhook", "webhook", "FirstMate") - os.Exit(1) + if os.Getenv("ENABLE_WEBHOOKS") != "false" { + if err = (&crewv1.FirstMate{}).SetupWebhookWithManager(mgr); err != nil { + setupLog.Error(err, "unable to create webhook", "webhook", "FirstMate") + os.Exit(1) + } } if err = (&controller.AdmiralReconciler{ Client: mgr.GetClient(), @@ -118,9 +122,11 @@ func main() { setupLog.Error(err, "unable to create controller", "controller", "Admiral") os.Exit(1) } - if err = (&crewv1.Admiral{}).SetupWebhookWithManager(mgr); err != nil { - setupLog.Error(err, "unable to create webhook", "webhook", "Admiral") - os.Exit(1) + if os.Getenv("ENABLE_WEBHOOKS") != "false" { + if err = (&crewv1.Admiral{}).SetupWebhookWithManager(mgr); err != nil { + setupLog.Error(err, "unable to create webhook", "webhook", "Admiral") + os.Exit(1) + } } if err = (&controller.LakerReconciler{ Client: mgr.GetClient(),