Merge pull request #678 from sergenyalcin/register-webhooks-seperately

Decouple conversion webhook registration from leader election

Author: sergenyalcin

pkg/pipeline/templates/controller.go.tmpl

@@ -23,6 +23,15 @@ import (
 	{{ .Imports }}
 )
 
+// SetupWebhookWithManager registers the conversion webhook for {{ .CRD.Kind }}.
+func SetupWebhookWithManager(mgr ctrl.Manager) error {
+	if err := ctrl.NewWebhookManagedBy(mgr, &{{ .TypePackageAlias }}{{ .CRD.Kind }}{}).
+		Complete(); err != nil {
+		return errors.Wrap(err, "cannot register webhook for the kind {{ .TypePackageAlias }}{{ .CRD.Kind }}")
+	}
+	return nil
+}
+
 // SetupGated adds a controller that reconciles {{ .CRD.Kind }} managed resources.
 func SetupGated(mgr ctrl.Manager, o tjcontroller.Options) error {
 	o.Options.Gate.Register(func() {
@@ -122,15 +131,6 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error {
 		opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics))
 	}
 
-	// register webhooks for the kind {{ .TypePackageAlias }}{{ .CRD.Kind }}
-	// if they're enabled.
-	if o.StartWebhooks {
-		if err := ctrl.NewWebhookManagedBy(mgr, &{{ .TypePackageAlias }}{{ .CRD.Kind }}{}).
-			Complete(); err != nil {
-			return errors.Wrap(err, "cannot register webhook for the kind {{ .TypePackageAlias }}{{ .CRD.Kind }}")
-		}
-	}
-
 	if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil {
 		stateMetricsRecorder := statemetrics.NewMRStateRecorder(
 			mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &{{ .TypePackageAlias }}{{ .CRD.Kind }}List{}, o.MetricOptions.PollStateMetricInterval,

pkg/pipeline/templates/setup.go.tmpl

@@ -38,4 +38,18 @@ func SetupGated{{ .Group }}(mgr ctrl.Manager, o controller.Options) error {
 		}
 	}
 	return nil
+}
+
+// SetupWebhookWithManager{{ .Group }} registers conversion webhooks for all resource kinds in the group.
+func SetupWebhookWithManager{{ .Group }}(mgr ctrl.Manager) error {
+	for _, setup := range []func(ctrl.Manager) error{
+		{{- range $alias := .Aliases }}
+		{{ $alias }}SetupWebhookWithManager,
+		{{- end }}
+	} {
+		if err := setup(mgr); err != nil {
+			return err
+		}
+	}
+	return nil
 }