fix(controllers): requeue only on NotFound refs (#1118)

Author: ndk

controllers/reconciler.go

@@ -13,6 +13,7 @@ import (
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/equality"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -177,9 +178,13 @@ func (r *Reconciler[T]) resolveK8sRefs(ctx context.Context, obj T) (requeue bool
 		}
 
 		if err := r.Get(ctx, ref.NamespacedName, dep); err != nil {
-			// Matching legacy behaviour: missing or not-yet-created refs trigger a soft requeue.
-			logr.FromContextOrDiscard(ctx).V(1).Info("referenced resource is not yet available", "ref", ref.NamespacedName, "gvk", ref.GroupVersionKind, "error", err)
-			return true, nil
+			if apierrors.IsNotFound(err) {
+				// Matching legacy behaviour: missing or not-yet-created refs trigger a soft requeue.
+				logr.FromContextOrDiscard(ctx).V(1).Info("referenced resource is not yet available", "ref", ref.NamespacedName, "gvk", ref.GroupVersionKind, "error", err)
+				return true, nil
+			}
+
+			return false, fmt.Errorf("getting referenced resource %s %s: %w", ref.GroupVersionKind, ref.NamespacedName, err)
 		}
 
 		if !IsReadyToUse(dep) {

controllers/reconciler_test.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/http"
 	"reflect"
@@ -888,6 +889,31 @@ func TestReconciler_resolveK8sRefs(t *testing.T) {
 		require.False(t, requeue)
 	})
 
+	t.Run("Error if dependency Get returns non-not-found error", func(t *testing.T) {
+		obj := newObjectFromYAML[v1alpha1.PostgreSQL](t, yamlPostgresWithRef)
+
+		k8sClient := fake.NewClientBuilder().
+			WithScheme(scheme).
+			WithInterceptorFuncs(interceptor.Funcs{
+				Get: func(context.Context, crclient.WithWatch, crclient.ObjectKey, crclient.Object, ...crclient.GetOption) error {
+					return errors.New("boom")
+				},
+			}).
+			Build()
+
+		r := &Reconciler[*v1alpha1.PostgreSQL]{
+			Controller: Controller{
+				Client: k8sClient,
+				Scheme: scheme,
+			},
+		}
+
+		requeue, err := r.resolveK8sRefs(t.Context(), obj)
+
+		require.EqualError(t, err, `getting referenced resource aiven.io/v1alpha1, Kind=ProjectVPC default/test-vpc: boom`)
+		require.False(t, requeue)
+	})
+
 	t.Run("Requeue if dependency is missing", func(t *testing.T) {
 		k8sClient := fake.NewClientBuilder().
 			WithScheme(scheme).