Wire in migration controller

Signed-off-by: Erik Godding Boye <[email protected]>

Author: erikgb

cmd/trust-manager/app/app.go

@@ -33,6 +33,7 @@ import (
 
 	"github.com/cert-manager/trust-manager/cmd/trust-manager/app/options"
 	trustapi "github.com/cert-manager/trust-manager/pkg/apis/trust/v1alpha1"
+	trustmanagerapi "github.com/cert-manager/trust-manager/pkg/apis/trustmanager/v1alpha2"
 	"github.com/cert-manager/trust-manager/pkg/bundle"
 	"github.com/cert-manager/trust-manager/pkg/webhook"
 )
@@ -70,6 +71,7 @@ func NewCommand() *cobra.Command {
 			scheme := runtime.NewScheme()
 			utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 			utilruntime.Must(trustapi.AddToScheme(scheme))
+			utilruntime.Must(trustmanagerapi.AddToScheme(scheme))
 
 			mgr, err := ctrl.NewManager(opts.RestConfig, ctrl.Options{
 				Scheme:                        scheme,
@@ -113,7 +115,10 @@ func NewCommand() *cobra.Command {
 			// Register webhook handlers with manager.
 			log.Info("registering webhook endpoints")
 			if err := webhook.SetupWebhookWithManager(mgr); err != nil {
-				return fmt.Errorf("failed to register webhook: %w", err)
+				return fmt.Errorf("failed to register Bundle webhook: %w", err)
+			}
+			if err := (&webhook.ClusterBundle{}).SetupWebhookWithManager(mgr); err != nil {
+				return fmt.Errorf("failed to register ClusterBundle webhook: %w", err)
 			}
 
 			// Start all runnables and controller

pkg/bundle/controller.go

@@ -114,6 +114,10 @@ func SetupWithManager(
 		return fmt.Errorf("failed to register Bundle controller: %w", err)
 	}
 
+	if err := (&controller.BundleReconciler{Client: mgr.GetClient()}).SetupWithManager(mgr); err != nil {
+		return fmt.Errorf("failed to register Bundle migration controller: %w", err)
+	}
+
 	return nil
 }
 

test/integration/bundle/integration.go

@@ -80,6 +80,7 @@ var _ = BeforeSuite(func() {
 	Expect(err).NotTo(HaveOccurred())
 
 	Expect(webhook.SetupWebhookWithManager(mgr)).Should(Succeed())
+	Expect((&webhook.ClusterBundle{}).SetupWebhookWithManager(mgr)).Should(Succeed())
 
 	go func() {
 		defer GinkgoRecover()