wait for Kube resource instead of APIBinding to make e2e tests more reliable

On-behalf-of: @SAP christoph.mewes@sap.com

Author: xrstf

test/utils/wait.go

@@ -18,12 +18,10 @@ package utils
 
 import (
 	"context"
-	"slices"
 	"testing"
 	"time"
 
-	kcpapisv1alpha1 "github.com/kcp-dev/sdk/apis/apis/v1alpha1"
-
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -49,32 +47,21 @@ func WaitForBoundAPI(t *testing.T, ctx context.Context, client ctrlruntimeclient
 	t.Helper()
 
 	t.Logf("Waiting for API %s/%s to be bound in kcp…", gvr.Group, gvr.Resource)
-	err := wait.PollUntilContextTimeout(ctx, 500*time.Millisecond, 1*time.Minute, false, func(ctx context.Context) (bool, error) {
-		apiBindings := &kcpapisv1alpha1.APIBindingList{}
-		err := client.List(ctx, apiBindings)
-		if err != nil {
-			return false, err
-		}
 
-		for _, binding := range apiBindings.Items {
-			if bindingHasGVR(binding, gvr) {
-				return true, nil
-			}
-		}
-
-		return false, nil
+	// Wait for actual resource availability instead of checking the APIBinding, because this is more
+	// reliable, especially on slower CI environments.
+	err := wait.PollUntilContextTimeout(ctx, 500*time.Millisecond, 1*time.Minute, false, func(ctx context.Context) (bool, error) {
+		// Try to list resources of this type - if the resource isn't ready, this will fail
+		list := &unstructured.UnstructuredList{}
+		list.SetGroupVersionKind(schema.GroupVersionKind{
+			Group:   gvr.Group,
+			Version: gvr.Version,
+			Kind:    gvr.Resource, // This will be corrected by the client
+		})
+
+		return client.List(ctx, list) == nil, nil
 	})
 	if err != nil {
 		t.Fatalf("Failed to wait for API %v to become available: %v", gvr, err)
 	}
 }
-
-func bindingHasGVR(binding kcpapisv1alpha1.APIBinding, gvr schema.GroupVersionResource) bool {
-	for _, bound := range binding.Status.BoundResources {
-		if bound.Group == gvr.Group && bound.Resource == gvr.Resource && slices.Contains(bound.StorageVersions, gvr.Version) {
-			return true
-		}
-	}
-
-	return false
-}