terminators: wait specifically for WST to be ready

On-behalf-of: SAP <[email protected]>
Signed-off-by: Simon Bein <[email protected]>

Author: SimonTheLeg

test/e2e/virtual/terminatingworkspaces/virtualworkspace_test.go

@@ -32,6 +32,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -52,10 +53,9 @@ import (
 	corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
 	"github.com/kcp-dev/kcp/sdk/apis/tenancy/termination"
 	tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
-	"github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions"
+	conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1"
 	kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster"
 	kcptesting "github.com/kcp-dev/kcp/sdk/testing"
-	kcptestinghelpers "github.com/kcp-dev/kcp/sdk/testing/helpers"
 	"github.com/kcp-dev/kcp/test/e2e/framework"
 )
 
@@ -157,12 +157,17 @@ func TestTerminatingWorkspacesVirtualWorkspaceAccess(t *testing.T) {
 		})
 	}
 
-	t.Log("Wait for WorkspaceTypes to have their type extensions resolved")
-	for _, wst := range workspaceTypes {
-		name := wst.Name
-		kcptestinghelpers.EventuallyReady(t, func() (conditions.Getter, error) {
-			return sourceKcpClusterClient.TenancyV1alpha1().Cluster(wsPath).WorkspaceTypes().Get(ctx, name, metav1.GetOptions{})
-		}, "could not wait for readiness on WorkspaceType %s|%s", wsPath.String(), name)
+	t.Log("Wait for WorkspaceTypes and their virtual workspace URLs to be ready")
+	for name, wst := range workspaceTypes {
+		wt := &tenancyv1alpha1.WorkspaceType{}
+		require.EventuallyWithT(t, func(c *assert.CollectT) {
+			wt, err = sourceKcpClusterClient.TenancyV1alpha1().Cluster(wsPath).WorkspaceTypes().Get(ctx, wst.Name, metav1.GetOptions{})
+			require.NoError(c, err)
+			require.NotEmpty(c, wt.Status.VirtualWorkspaces)
+			require.True(c, conditionIsTrue(wt.Status.Conditions, tenancyv1alpha1.WorkspaceTypeVirtualWorkspaceURLsReady))
+			require.True(c, conditionIsTrue(wt.Status.Conditions, conditionsv1alpha1.ReadyCondition))
+		}, wait.ForeverTestTimeout, 100*time.Millisecond)
+		workspaceTypes[name] = wt
 	}
 
 	t.Log("Create workspaces using the new types")
@@ -544,13 +549,15 @@ func TestTerminatingWorkspacesVirtualWorkspaceWatch(t *testing.T) {
 		})
 	}
 
-	t.Log("Wait for WorkspaceTypes to have their type extensions resolved and vw URLs published")
+	t.Log("Wait for WorkspaceTypes and their virtual workspace URLs to be ready")
 	for name, wst := range workspaceTypes {
 		wt := &tenancyv1alpha1.WorkspaceType{}
 		require.EventuallyWithT(t, func(c *assert.CollectT) {
 			wt, err = sourceKcpClusterClient.TenancyV1alpha1().Cluster(wsPath).WorkspaceTypes().Get(ctx, wst.Name, metav1.GetOptions{})
 			require.NoError(c, err)
 			require.NotEmpty(c, wt.Status.VirtualWorkspaces)
+			require.True(c, conditionIsTrue(wt.Status.Conditions, tenancyv1alpha1.WorkspaceTypeVirtualWorkspaceURLsReady))
+			require.True(c, conditionIsTrue(wt.Status.Conditions, conditionsv1alpha1.ReadyCondition))
 		}, wait.ForeverTestTimeout, 100*time.Millisecond)
 		workspaceTypes[name] = wt
 	}
@@ -679,6 +686,15 @@ func TestTerminatingWorkspacesVirtualWorkspaceWatch(t *testing.T) {
 	}
 }
 
+func conditionIsTrue(conditions conditionsv1alpha1.Conditions, conditionType conditionsv1alpha1.ConditionType) bool {
+	for _, c := range conditions {
+		if c.Type == conditionType && c.Status == corev1.ConditionTrue {
+			return true
+		}
+	}
+	return false
+}
+
 func workspaceForType(workspaceType *tenancyv1alpha1.WorkspaceType, testLabelSelector map[string]string) *tenancyv1alpha1.Workspace {
 	return &tenancyv1alpha1.Workspace{
 		ObjectMeta: metav1.ObjectMeta{