register direct controller for samples tests

gemmahou · Aug 14, 2024 · 5ea1fff · 5ea1fff
1 parent 3903cba
commit 5ea1fff
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/config/tests/samples/create/samples_test.go b/config/tests/samples/create/samples_test.go
@@ -35,6 +35,8 @@ import (
 	klog "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
+
+	_ "github.com/GoogleCloudPlatform/k8s-config-connector/pkg/controller/direct/register"
 )
 
 func init() {

diff --git a/pkg/controller/direct/registry/registry.go b/pkg/controller/direct/registry/registry.go
@@ -70,7 +70,11 @@ func AdapterForURL(ctx context.Context, url string) (directbase.Adapter, error)
 	}
 	return nil, nil
 }
+
 func Init(ctx context.Context, config *config.ControllerConfig) error {
+	if singleton.registrations == nil {
+		return fmt.Errorf("unable to initialize registry")
+	}
 	for _, registration := range singleton.registrations {
 		model, err := registration.factory(ctx, config)
 		if err != nil {

diff --git a/pkg/controller/registration/registration_controller.go b/pkg/controller/registration/registration_controller.go
@@ -194,6 +194,7 @@ func registerDefaultController(r *ReconcileRegistration, config *config.Controll
 		JitterGen:    r.jitterGenerator,
 		Defaulters:   r.defaulters,
 	}
+
 	var schemaUpdater k8s.SchemaReferenceUpdater
 	if kccfeatureflags.UseDirectReconciler(gvk.GroupKind()) {
 		groupKind := gvk.GroupKind()