check for nil gates in setup, not reconcile.

Signed-off-by: Scott Nichols <[email protected]>

Author: n3wscott

pkg/reconciler/customresourcesgate/reconciler.go

@@ -20,8 +20,6 @@ package customresourcesgate
 
 import (
 	"context"
-	"reflect"
-
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -39,12 +37,6 @@ type Reconciler struct {
 
 // Reconcile reconciles CustomResourceDefinitions and reports ready and unready GVKs to the gate.
 func (r *Reconciler) Reconcile(_ context.Context, crd *apiextensionsv1.CustomResourceDefinition) (ctrl.Result, error) {
-	// If there is no gate, then we don't need to do work.
-	if r.gate == nil || reflect.ValueOf(r.gate).IsNil() {
-		r.log.Debug("Gate is not set, skipping reconciliation")
-		return ctrl.Result{}, nil
-	}
-
 	established := isEstablished(crd)
 	gkvs := toGVKs(crd)
 

pkg/reconciler/customresourcesgate/reconciler_test.go

@@ -317,43 +317,6 @@ func TestReconcile(t *testing.T) {
 		args   args
 		want   want
 	}{
-		"NilGateSkipsReconciliation": {
-			reason: "Should skip reconciliation when gate is nil",
-			fields: fields{
-				gate: nil,
-			},
-			args: args{
-				ctx: context.Background(),
-				crd: &apiextensionsv1.CustomResourceDefinition{
-					ObjectMeta: metav1.ObjectMeta{
-						Name: "testresources.example.com",
-					},
-					Spec: apiextensionsv1.CustomResourceDefinitionSpec{
-						Group: "example.com",
-						Names: apiextensionsv1.CustomResourceDefinitionNames{
-							Kind: "TestResource",
-						},
-						Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
-							{Name: "v1", Served: true},
-						},
-					},
-					Status: apiextensionsv1.CustomResourceDefinitionStatus{
-						Conditions: []apiextensionsv1.CustomResourceDefinitionCondition{
-							{
-								Type:   apiextensionsv1.Established,
-								Status: apiextensionsv1.ConditionTrue,
-							},
-						},
-					},
-				},
-			},
-			want: want{
-				result:     ctrl.Result{},
-				err:        nil,
-				trueCalls:  []schema.GroupVersionKind{},
-				falseCalls: []schema.GroupVersionKind{},
-			},
-		},
 		"EstablishedCRDCallsGateTrue": {
 			reason: "Should call gate.True for all GVKs when CRD is established",
 			fields: fields{

pkg/reconciler/customresourcesgate/setup.go

@@ -17,6 +17,9 @@ limitations under the License.
 package customresourcesgate
 
 import (
+	"errors"
+	"reflect"
+
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -27,6 +30,10 @@ import (
 // Setup adds a controller that reconciles CustomResourceDefinitions to support delayed start of controllers.
 // o.Gate is expected to be something like *gate.Gate[schema.GroupVersionKind].
 func Setup(mgr ctrl.Manager, o controller.Options) error {
+	if o.Gate == nil || reflect.ValueOf(o.Gate).IsNil() {
+		return errors.New("gate is required")
+	}
+
 	r := &Reconciler{
 		log:  o.Logger,
 		gate: o.Gate,