From 8484658c3347f13ab4ac3eda7b89dca5dd2f5b77 Mon Sep 17 00:00:00 2001 From: lowang-bh Date: Sat, 2 Sep 2023 18:31:29 +0800 Subject: [PATCH] fix webook generated code ignored env ENABLE_WEBHOOKS --- .../golang/v2/scaffolds/internal/templates/main.go | 8 +++++--- .../golang/v3/scaffolds/internal/templates/main.go | 8 +++++--- .../golang/v4/scaffolds/internal/templates/main.go | 8 +++++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/pkg/plugins/golang/v2/scaffolds/internal/templates/main.go b/pkg/plugins/golang/v2/scaffolds/internal/templates/main.go index c2bd6928d85..58d0aa6764c 100644 --- a/pkg/plugins/golang/v2/scaffolds/internal/templates/main.go +++ b/pkg/plugins/golang/v2/scaffolds/internal/templates/main.go @@ -114,9 +114,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/pkg/plugins/golang/v3/scaffolds/internal/templates/main.go b/pkg/plugins/golang/v3/scaffolds/internal/templates/main.go index e450584fbba..6085207d758 100644 --- a/pkg/plugins/golang/v3/scaffolds/internal/templates/main.go +++ b/pkg/plugins/golang/v3/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/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) + } } ` )