Skip to content

Commit a8ad43f

Browse files
lowang-bhlowang-bh
authored
🐛 (go/v4): Start to check ENABLE_WEBHOOKS envvar into main.go to fix issue when webhooks are used (#3578)
🐛 (go/v4): Start to check ENABLE_WEBHOOKS envvar into main.go to fix issue when webhooks are used (#3578)
1 parent 37027a3 commit a8ad43f

File tree

6 files changed

+56
-47
lines changed

6 files changed

+56
-47
lines changed

‎hack/docs/internal/cronjob-tutorial/generate_cronjob.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -362,14 +362,6 @@ CronJob controller's`+" `"+`SetupWithManager`+"`"+` method.
362362
}`, `
363363
// +kubebuilder:docs-gen:collapse=old stuff`)
364364
CheckError("fixing main.go", err)
365-
366-
err = pluginutil.ReplaceInFile(
367-
filepath.Join(sp.ctx.Dir, "cmd/main.go"),
368-
` if err = (&batchv1.CronJob{}).SetupWebhookWithManager(mgr); err != nil {
369-
setupLog.Error(err, "unable to create webhook", "webhook", "CronJob")
370-
os.Exit(1)
371-
}`, `}`)
372-
CheckError("fixing main.go", err)
373365
}
374366

375367
func updateWebhook(sp *Sample) {

‎hack/docs/internal/cronjob-tutorial/main_revisited.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,4 @@ const MainEnableWebhook = `
3737
locally, we'll put them behind an environment variable.
3838
3939
We'll just make sure to set` + " `" + `ENABLE_WEBHOOKS=false` + "`" + ` when we run locally.
40-
*/
41-
if os.Getenv("ENABLE_WEBHOOKS") != "false" {
42-
if err = (&batchv1.CronJob{}).SetupWebhookWithManager(mgr); err != nil {
43-
setupLog.Error(err, "unable to create webhook", "webhook", "CronJob")
44-
os.Exit(1)
45-
}`
40+
*/`

‎pkg/plugins/golang/v4/scaffolds/internal/templates/main.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,11 @@ const (
113113
os.Exit(1)
114114
}
115115
`
116-
webhookSetupCodeFragment = `if err = (&%s.%s{}).SetupWebhookWithManager(mgr); err != nil {
117-
setupLog.Error(err, "unable to create webhook", "webhook", "%s")
118-
os.Exit(1)
116+
webhookSetupCodeFragment = `if os.Getenv("ENABLE_WEBHOOKS") != "false" {
117+
if err = (&%s.%s{}).SetupWebhookWithManager(mgr); err != nil {
118+
setupLog.Error(err, "unable to create webhook", "webhook", "%s")
119+
os.Exit(1)
120+
}
119121
}
120122
`
121123
)

‎testdata/project-v4-multigroup/cmd/main.go

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,11 @@ func main() {
124124
setupLog.Error(err, "unable to create controller", "controller", "Captain")
125125
os.Exit(1)
126126
}
127-
if err = (&crewv1.Captain{}).SetupWebhookWithManager(mgr); err != nil {
128-
setupLog.Error(err, "unable to create webhook", "webhook", "Captain")
129-
os.Exit(1)
127+
if os.Getenv("ENABLE_WEBHOOKS") != "false" {
128+
if err = (&crewv1.Captain{}).SetupWebhookWithManager(mgr); err != nil {
129+
setupLog.Error(err, "unable to create webhook", "webhook", "Captain")
130+
os.Exit(1)
131+
}
130132
}
131133
if err = (&shipcontroller.FrigateReconciler{
132134
Client: mgr.GetClient(),
@@ -135,9 +137,11 @@ func main() {
135137
setupLog.Error(err, "unable to create controller", "controller", "Frigate")
136138
os.Exit(1)
137139
}
138-
if err = (&shipv1beta1.Frigate{}).SetupWebhookWithManager(mgr); err != nil {
139-
setupLog.Error(err, "unable to create webhook", "webhook", "Frigate")
140-
os.Exit(1)
140+
if os.Getenv("ENABLE_WEBHOOKS") != "false" {
141+
if err = (&shipv1beta1.Frigate{}).SetupWebhookWithManager(mgr); err != nil {
142+
setupLog.Error(err, "unable to create webhook", "webhook", "Frigate")
143+
os.Exit(1)
144+
}
141145
}
142146
if err = (&shipcontroller.DestroyerReconciler{
143147
Client: mgr.GetClient(),
@@ -146,9 +150,11 @@ func main() {
146150
setupLog.Error(err, "unable to create controller", "controller", "Destroyer")
147151
os.Exit(1)
148152
}
149-
if err = (&shipv1.Destroyer{}).SetupWebhookWithManager(mgr); err != nil {
150-
setupLog.Error(err, "unable to create webhook", "webhook", "Destroyer")
151-
os.Exit(1)
153+
if os.Getenv("ENABLE_WEBHOOKS") != "false" {
154+
if err = (&shipv1.Destroyer{}).SetupWebhookWithManager(mgr); err != nil {
155+
setupLog.Error(err, "unable to create webhook", "webhook", "Destroyer")
156+
os.Exit(1)
157+
}
152158
}
153159
if err = (&shipcontroller.CruiserReconciler{
154160
Client: mgr.GetClient(),
@@ -157,9 +163,11 @@ func main() {
157163
setupLog.Error(err, "unable to create controller", "controller", "Cruiser")
158164
os.Exit(1)
159165
}
160-
if err = (&shipv2alpha1.Cruiser{}).SetupWebhookWithManager(mgr); err != nil {
161-
setupLog.Error(err, "unable to create webhook", "webhook", "Cruiser")
162-
os.Exit(1)
166+
if os.Getenv("ENABLE_WEBHOOKS") != "false" {
167+
if err = (&shipv2alpha1.Cruiser{}).SetupWebhookWithManager(mgr); err != nil {
168+
setupLog.Error(err, "unable to create webhook", "webhook", "Cruiser")
169+
os.Exit(1)
170+
}
163171
}
164172
if err = (&seacreaturescontroller.KrakenReconciler{
165173
Client: mgr.GetClient(),
@@ -210,9 +218,11 @@ func main() {
210218
setupLog.Error(err, "unable to create controller", "controller", "Lakers")
211219
os.Exit(1)
212220
}
213-
if err = (&testprojectorgv1.Lakers{}).SetupWebhookWithManager(mgr); err != nil {
214-
setupLog.Error(err, "unable to create webhook", "webhook", "Lakers")
215-
os.Exit(1)
221+
if os.Getenv("ENABLE_WEBHOOKS") != "false" {
222+
if err = (&testprojectorgv1.Lakers{}).SetupWebhookWithManager(mgr); err != nil {
223+
setupLog.Error(err, "unable to create webhook", "webhook", "Lakers")
224+
os.Exit(1)
225+
}
216226
}
217227
if err = (&examplecomcontroller.MemcachedReconciler{
218228
Client: mgr.GetClient(),
@@ -230,9 +240,11 @@ func main() {
230240
setupLog.Error(err, "unable to create controller", "controller", "Busybox")
231241
os.Exit(1)
232242
}
233-
if err = (&examplecomv1alpha1.Memcached{}).SetupWebhookWithManager(mgr); err != nil {
234-
setupLog.Error(err, "unable to create webhook", "webhook", "Memcached")
235-
os.Exit(1)
243+
if os.Getenv("ENABLE_WEBHOOKS") != "false" {
244+
if err = (&examplecomv1alpha1.Memcached{}).SetupWebhookWithManager(mgr); err != nil {
245+
setupLog.Error(err, "unable to create webhook", "webhook", "Memcached")
246+
os.Exit(1)
247+
}
236248
}
237249
//+kubebuilder:scaffold:builder
238250

‎testdata/project-v4-with-deploy-image/cmd/main.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,11 @@ func main() {
105105
setupLog.Error(err, "unable to create controller", "controller", "Busybox")
106106
os.Exit(1)
107107
}
108-
if err = (&examplecomv1alpha1.Memcached{}).SetupWebhookWithManager(mgr); err != nil {
109-
setupLog.Error(err, "unable to create webhook", "webhook", "Memcached")
110-
os.Exit(1)
108+
if os.Getenv("ENABLE_WEBHOOKS") != "false" {
109+
if err = (&examplecomv1alpha1.Memcached{}).SetupWebhookWithManager(mgr); err != nil {
110+
setupLog.Error(err, "unable to create webhook", "webhook", "Memcached")
111+
os.Exit(1)
112+
}
111113
}
112114
//+kubebuilder:scaffold:builder
113115

‎testdata/project-v4/cmd/main.go

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,11 @@ func main() {
9696
setupLog.Error(err, "unable to create controller", "controller", "Captain")
9797
os.Exit(1)
9898
}
99-
if err = (&crewv1.Captain{}).SetupWebhookWithManager(mgr); err != nil {
100-
setupLog.Error(err, "unable to create webhook", "webhook", "Captain")
101-
os.Exit(1)
99+
if os.Getenv("ENABLE_WEBHOOKS") != "false" {
100+
if err = (&crewv1.Captain{}).SetupWebhookWithManager(mgr); err != nil {
101+
setupLog.Error(err, "unable to create webhook", "webhook", "Captain")
102+
os.Exit(1)
103+
}
102104
}
103105
if err = (&controller.FirstMateReconciler{
104106
Client: mgr.GetClient(),
@@ -107,9 +109,11 @@ func main() {
107109
setupLog.Error(err, "unable to create controller", "controller", "FirstMate")
108110
os.Exit(1)
109111
}
110-
if err = (&crewv1.FirstMate{}).SetupWebhookWithManager(mgr); err != nil {
111-
setupLog.Error(err, "unable to create webhook", "webhook", "FirstMate")
112-
os.Exit(1)
112+
if os.Getenv("ENABLE_WEBHOOKS") != "false" {
113+
if err = (&crewv1.FirstMate{}).SetupWebhookWithManager(mgr); err != nil {
114+
setupLog.Error(err, "unable to create webhook", "webhook", "FirstMate")
115+
os.Exit(1)
116+
}
113117
}
114118
if err = (&controller.AdmiralReconciler{
115119
Client: mgr.GetClient(),
@@ -118,9 +122,11 @@ func main() {
118122
setupLog.Error(err, "unable to create controller", "controller", "Admiral")
119123
os.Exit(1)
120124
}
121-
if err = (&crewv1.Admiral{}).SetupWebhookWithManager(mgr); err != nil {
122-
setupLog.Error(err, "unable to create webhook", "webhook", "Admiral")
123-
os.Exit(1)
125+
if os.Getenv("ENABLE_WEBHOOKS") != "false" {
126+
if err = (&crewv1.Admiral{}).SetupWebhookWithManager(mgr); err != nil {
127+
setupLog.Error(err, "unable to create webhook", "webhook", "Admiral")
128+
os.Exit(1)
129+
}
124130
}
125131
if err = (&controller.LakerReconciler{
126132
Client: mgr.GetClient(),

0 commit comments

Comments
 (0)