Update tests for changed beahviour

Signed-off-by: Mangirdas Judeikis <Mangirdas@Judeikis.LT>
On-behalf-of: @SAP mangirdas.judeikis@sap.com

Author: mjudeikis

Makefile

@@ -349,7 +349,7 @@ test-e2e-sharded-minimal: build-all
 
 # This is just easy target to run 2 shard test server locally until manually killed.
 # You can targer test to it by running:
-# go test ./test/e2e/apibinding/... --kcp-kubeconfig=${WORK_DIR:-.}/.kcp/admin.kubeconfig --shard-kubeconfigs=root=${WORK_DIR:-.}/.kcp-0/admin.kubeconfig -run=^TestAPIBindingEndpointSlicesSharded$
+# go test ./test/e2e/apibinding/... --kcp-kubeconfig=$(pwd)/.kcp/admin.kubeconfig --shard-kubeconfigs=root=$(pwd)/.kcp-0/admin.kubeconfig -run=^TestAPIBinding$
 test-run-sharded-server: WORK_DIR ?= $(PWD)
 test-run-sharded-server: LOG_DIR ?= $(WORK_DIR)/.kcp
 test-run-sharded-server:

test/e2e/apibinding/apibinding_logicalcluster_test.go

@@ -22,6 +22,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/davecgh/go-spew/spew"
 	"github.com/stretchr/testify/require"
 
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -32,6 +33,7 @@ import (
 	kcpapiextensionsclientset "github.com/kcp-dev/client-go/apiextensions/client"
 	kcpdynamic "github.com/kcp-dev/client-go/dynamic"
 
+	"github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
 	apisv1alpha2 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha2"
 	corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
 	"github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions"
@@ -132,8 +134,13 @@ func TestAPIBindingLogicalCluster(t *testing.T) {
 		return kcpClusterClient.Cluster(consumerPath).ApisV1alpha2().APIBindings().Get(ctx, exportName, metav1.GetOptions{})
 	}, kcptestinghelpers.Is(apisv1alpha2.PermissionClaimsValid), "unable to see valid claims")
 
-	export, err := kcpClusterClient.Cluster(providerPath).ApisV1alpha2().APIExports().Get(ctx, exportName, metav1.GetOptions{})
-	require.NoError(t, err)
+	t.Logf("Waiting for APIExportEndpointSlice to be available")
+	var exportEndpointSlice *v1alpha1.APIExportEndpointSlice
+	kcptestinghelpers.Eventually(t, func() (bool, string) {
+		var err error
+		exportEndpointSlice, err = kcpClusterClient.Cluster(providerPath).ApisV1alpha1().APIExportEndpointSlices().Get(ctx, exportName, metav1.GetOptions{})
+		return err == nil && len(exportEndpointSlice.Status.APIExportEndpoints) > 0, fmt.Sprintf("failed to get APIExportEndpointSlice: %v, %s", err, spew.Sdump(exportEndpointSlice))
+	}, wait.ForeverTestTimeout, time.Second*1)
 
 	rawConfig, err := server.RawConfig()
 	require.NoError(t, err)
@@ -143,8 +150,7 @@ func TestAPIBindingLogicalCluster(t *testing.T) {
 	kcptestinghelpers.Eventually(t, func() (bool, string) {
 		items := []unstructured.Unstructured{}
 
-		//nolint:staticcheck // SA1019 VirtualWorkspaces is deprecated but not removed yet
-		for _, vw := range export.Status.VirtualWorkspaces {
+		for _, vw := range exportEndpointSlice.Status.APIExportEndpoints {
 			vwClusterClient, err := kcpdynamic.NewForConfig(apiexportVWConfig(t, rawConfig, vw.URL))
 			require.NoError(t, err)
 
@@ -265,8 +271,13 @@ func TestAPIBindingCRDs(t *testing.T) {
 		return kcpClusterClient.Cluster(consumerPath).ApisV1alpha2().APIBindings().Get(ctx, exportName, metav1.GetOptions{})
 	}, kcptestinghelpers.Is(apisv1alpha2.PermissionClaimsValid), "unable to see valid claims")
 
-	export, err := kcpClusterClient.Cluster(providerPath).ApisV1alpha2().APIExports().Get(ctx, exportName, metav1.GetOptions{})
-	require.NoError(t, err)
+	t.Logf("Waiting for APIExportEndpointSlice to be available")
+	var exportEndpointSlice *v1alpha1.APIExportEndpointSlice
+	kcptestinghelpers.Eventually(t, func() (bool, string) {
+		var err error
+		exportEndpointSlice, err = kcpClusterClient.Cluster(providerPath).ApisV1alpha1().APIExportEndpointSlices().Get(ctx, exportName, metav1.GetOptions{})
+		return err == nil && len(exportEndpointSlice.Status.APIExportEndpoints) > 0, fmt.Sprintf("failed to get APIExportEndpointSlice: %v. %s", err, spew.Sdump(exportEndpointSlice))
+	}, time.Second*60, time.Second*1)
 
 	rawConfig, err := server.RawConfig()
 	require.NoError(t, err)
@@ -276,8 +287,7 @@ func TestAPIBindingCRDs(t *testing.T) {
 	kcptestinghelpers.Eventually(t, func() (bool, string) {
 		items := []unstructured.Unstructured{}
 
-		//nolint:staticcheck // SA1019 VirtualWorkspaces is deprecated but not removed yet
-		for _, vw := range export.Status.VirtualWorkspaces {
+		for _, vw := range exportEndpointSlice.Status.APIExportEndpoints {
 			vwClusterClient, err := kcpdynamic.NewForConfig(apiexportVWConfig(t, rawConfig, vw.URL))
 			require.NoError(t, err)
 

test/e2e/apibinding/apibinding_protected_test.go

@@ -30,11 +30,9 @@ import (
 	"k8s.io/client-go/restmapper"
 
 	kcpdynamic "github.com/kcp-dev/client-go/dynamic"
-	"github.com/kcp-dev/logicalcluster/v3"
 
 	"github.com/kcp-dev/kcp/config/helpers"
 	apisv1alpha2 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha2"
-	"github.com/kcp-dev/kcp/sdk/apis/tenancy"
 	"github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions"
 	kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster"
 	kcptesting "github.com/kcp-dev/kcp/sdk/testing"
@@ -129,38 +127,3 @@ func TestProtectedAPI(t *testing.T) {
 		return resourceExists(resources, "tlsroutes")
 	}, wait.ForeverTestTimeout, time.Millisecond*100, "consumer workspace %q discovery is missing tlsroutes resource", consumerPath)
 }
-
-// TestProtectedAPIFromServiceExports is testing if we can access service exports
-// from root workspace. See https://github.com/kcp-dev/kcp/issues/2184 for more details.
-func TestProtectedAPIFromServiceExports(t *testing.T) {
-	t.Parallel()
-	framework.Suite(t, "control-plane")
-
-	server := kcptesting.SharedKcpServer(t)
-
-	ctx, cancel := context.WithCancel(context.Background())
-	t.Cleanup(cancel)
-
-	rootWorkspace := logicalcluster.NewPath("root")
-	cfg := server.BaseConfig(t)
-
-	kcpClusterClient, err := kcpclientset.NewForConfig(cfg)
-	require.NoError(t, err, "failed to construct kcp cluster client for server")
-
-	t.Logf("Get tenancy APIExport from root workspace")
-	tenanciesRoot, err := kcpClusterClient.ApisV1alpha2().APIExports().Cluster(rootWorkspace).Get(ctx, tenancy.GroupName, metav1.GetOptions{})
-	require.NoError(t, err)
-
-	t.Logf("Construct VirtualWorkspace client")
-	//nolint:staticcheck // SA1019 VirtualWorkspaces is deprecated but not removed yet
-	vwURL := tenanciesRoot.Status.VirtualWorkspaces[0].URL
-	cfgVW := server.RootShardSystemMasterBaseConfig(t)
-	cfgVW.Host = vwURL
-
-	vwClient, err := kcpclientset.NewForConfig(cfgVW)
-	require.NoError(t, err)
-
-	t.Logf("Make sure we can access tenancy API from VirtualWorkspace")
-	_, err = vwClient.TenancyV1alpha1().Workspaces().List(ctx, metav1.ListOptions{})
-	require.NoError(t, err)
-}

test/e2e/apibinding/apibinding_test.go

@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"path"
 	"reflect"
+	"sort"
 	"strings"
 	"testing"
 	"time"
@@ -49,6 +50,7 @@ import (
 	apisv1alpha2 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha2"
 	"github.com/kcp-dev/kcp/sdk/apis/core"
 	corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
+	tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
 	"github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions"
 	kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster"
 	kcptesting "github.com/kcp-dev/kcp/sdk/testing"
@@ -163,21 +165,47 @@ func TestAPIBinding(t *testing.T) {
 	t.Parallel()
 
 	server := kcptesting.SharedKcpServer(t)
+	cfg := server.BaseConfig(t)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	t.Cleanup(cancel)
 
+	t.Logf("Check if we can access shards")
+	var shards *corev1alpha1.ShardList
+	{
+		kcpClusterClient, err := kcpclientset.NewForConfig(cfg)
+		require.NoError(t, err, "failed to construct kcp cluster client for server")
+
+		shards, err = kcpClusterClient.Cluster(core.RootCluster.Path()).CoreV1alpha1().Shards().List(ctx, metav1.ListOptions{})
+		require.NoError(t, err, "failed to list shards")
+	}
+
+	t.Logf("Shards: %v", shards.Items)
+
 	orgPath, _ := framework.NewOrganizationFixture(t, server) //nolint:staticcheck // TODO: switch to NewWorkspaceFixture.
-	provider1Path, provider1 := kcptesting.NewWorkspaceFixture(t, server, orgPath, kcptesting.WithName("service-provider-1"))
+	var provider1Path, provider2Path logicalcluster.Path
+	var provider1, provider2 *tenancyv1alpha1.Workspace
+	if len(shards.Items) == 1 {
+		provider1Path, provider1 = kcptesting.NewWorkspaceFixture(t, server, orgPath, kcptesting.WithName("service-provider-1"), kcptesting.WithShard(shards.Items[0].Name))
+		provider2Path, provider2 = kcptesting.NewWorkspaceFixture(t, server, orgPath, kcptesting.WithName("service-provider-2"), kcptesting.WithShard(shards.Items[0].Name))
+	} else {
+		provider1Path, provider1 = kcptesting.NewWorkspaceFixture(t, server, orgPath, kcptesting.WithName("service-provider-1"), kcptesting.WithShard(shards.Items[0].Name))
+		provider2Path, provider2 = kcptesting.NewWorkspaceFixture(t, server, orgPath, kcptesting.WithName("service-provider-2"), kcptesting.WithShard(shards.Items[1].Name))
+	}
 	provider1ClusterName := logicalcluster.Name(provider1.Spec.Cluster)
-	provider2Path, provider2 := kcptesting.NewWorkspaceFixture(t, server, orgPath, kcptesting.WithName("service-provider-2"))
 	provider2ClusterName := logicalcluster.Name(provider2.Spec.Cluster)
-	consumer1Path, _ := kcptesting.NewWorkspaceFixture(t, server, orgPath, kcptesting.WithName("consumer-1-bound-against-1"))
-	consumer2Path, _ := kcptesting.NewWorkspaceFixture(t, server, orgPath, kcptesting.WithName("consumer-2-bound-against-1"))
-	consumer3Path, consumer3Workspace := kcptesting.NewWorkspaceFixture(t, server, orgPath, kcptesting.WithName("consumer-3-bound-against-2"))
-	consumer3ClusterName := logicalcluster.Name(consumer3Workspace.Spec.Cluster)
 
-	cfg := server.BaseConfig(t)
+	consumer1Path, _ := kcptesting.NewWorkspaceFixture(t, server, orgPath, kcptesting.WithName("consumer-1-bound-against-1"), kcptesting.WithShard(shards.Items[0].Name))
+	var consumer2Path, consumer3Path logicalcluster.Path
+	var consumer3Workspace *tenancyv1alpha1.Workspace
+	if len(shards.Items) == 1 {
+		consumer2Path, _ = kcptesting.NewWorkspaceFixture(t, server, orgPath, kcptesting.WithName("consumer-2-bound-against-1"), kcptesting.WithShard(shards.Items[0].Name))
+		consumer3Path, consumer3Workspace = kcptesting.NewWorkspaceFixture(t, server, orgPath, kcptesting.WithName("consumer-3-bound-against-2"), kcptesting.WithShard(shards.Items[0].Name))
+	} else {
+		consumer2Path, _ = kcptesting.NewWorkspaceFixture(t, server, orgPath, kcptesting.WithName("consumer-2-bound-against-1"), kcptesting.WithShard(shards.Items[1].Name))
+		consumer3Path, consumer3Workspace = kcptesting.NewWorkspaceFixture(t, server, orgPath, kcptesting.WithName("consumer-3-bound-against-2"), kcptesting.WithShard(shards.Items[1].Name))
+	}
+	consumer3ClusterName := logicalcluster.Name(consumer3Workspace.Spec.Cluster)
 
 	kcpClusterClient, err := kcpclientset.NewForConfig(cfg)
 	require.NoError(t, err, "failed to construct kcp cluster client for server")
@@ -187,8 +215,6 @@ func TestAPIBinding(t *testing.T) {
 
 	shardVirtualWorkspaceURLs := sets.New[string]()
 	t.Logf("Getting a list of VirtualWorkspaceURLs assigned to Shards")
-	shards, err := kcpClusterClient.Cluster(core.RootCluster.Path()).CoreV1alpha1().Shards().List(ctx, metav1.ListOptions{})
-	require.NoError(t, err)
 	// Filtering out shards that are not schedulable
 	var shardItems []corev1alpha1.Shard
 	for _, s := range shards.Items {
@@ -365,25 +391,27 @@ func TestAPIBinding(t *testing.T) {
 			expectedURLs = append(expectedURLs, u.String())
 		}
 
-		t.Logf("Make sure the APIExport gets status.virtualWorkspaceURLs set")
+		t.Logf("Make sure the APIExportEndpointSlice gets status.virtualWorkspaceURLs set")
 		kcptestinghelpers.Eventually(t, func() (bool, string) {
-			e, err := kcpClusterClient.Cluster(serviceProviderClusterName.Path()).ApisV1alpha2().APIExports().Get(ctx, exportName, metav1.GetOptions{})
+			apiExportEndpointSlice, err := kcpClusterClient.Cluster(serviceProviderClusterName.Path()).ApisV1alpha1().APIExportEndpointSlices().Get(ctx, exportName, metav1.GetOptions{})
 			if err != nil {
-				t.Logf("Unexpected error getting APIExport %s|%s: %v", serviceProviderClusterName.Path(), exportName, err)
+				t.Logf("Unexpected error getting APIExportEndpointSlice %s|%s: %v", serviceProviderClusterName.Path(), exportName, err)
 			}
 
 			var actualURLs []string
-			//nolint:staticcheck // SA1019 VirtualWorkspaces is deprecated but not removed yet
-			for _, u := range e.Status.VirtualWorkspaces {
+			for _, u := range apiExportEndpointSlice.Status.APIExportEndpoints {
 				actualURLs = append(actualURLs, u.URL)
 			}
-
+			sort.Strings(expectedURLs)
+			sort.Strings(actualURLs)
+			t.Logf("Expected URLs: %v", expectedURLs)
+			t.Logf("Actual URLs: %v", actualURLs)
 			if !reflect.DeepEqual(expectedURLs, actualURLs) {
 				return false, fmt.Sprintf("Unexpected URLs. Diff: %s", cmp.Diff(expectedURLs, actualURLs))
 			}
 
 			return true, ""
-		}, wait.ForeverTestTimeout, 100*time.Millisecond, "APIExport %s|%s didn't get status.virtualWorkspaceURLs set correctly",
+		}, wait.ForeverTestTimeout, 100*time.Millisecond, "APIExportEndpointSlices %s|%s didn't get status.virtualWorkspaceURLs set correctly",
 			serviceProviderClusterName, exportName)
 	}
 
@@ -438,15 +466,14 @@ func TestAPIBinding(t *testing.T) {
 	t.Logf("=== Verify that %s|%s export virtual workspace shows cowboys", provider2Path, exportName)
 	rawConfig, err := server.RawConfig()
 	require.NoError(t, err)
-	export2, err := kcpClusterClient.Cluster(provider2Path).ApisV1alpha2().APIExports().Get(ctx, exportName, metav1.GetOptions{})
+	apiExportEndpointSlice2, err := kcpClusterClient.Cluster(provider2Path).ApisV1alpha1().APIExportEndpointSlices().Get(ctx, exportName, metav1.GetOptions{})
 	require.NoError(t, err)
 
 	kcptestinghelpers.Eventually(t, func() (bool, string) {
 		foundOnShards := 0
 		var listErrs []error
 
-		//nolint:staticcheck // SA1019 VirtualWorkspaces is deprecated but not removed yet
-		for _, vw := range export2.Status.VirtualWorkspaces {
+		for _, vw := range apiExportEndpointSlice2.Status.APIExportEndpoints {
 			vw2ClusterClient, err := kcpdynamic.NewForConfig(apiexportVWConfig(t, rawConfig, vw.URL))
 			require.NoError(t, err)
 
@@ -476,8 +503,7 @@ func TestAPIBinding(t *testing.T) {
 			return false, "couldn't list via virtual workspaces because the user is not ready yet"
 		}
 
-		//nolint:staticcheck // SA1019 VirtualWorkspaces is deprecated but not removed yet
-		require.Equal(t, 1, foundOnShards, "cowboys not found exactly on one shard, but on %d/%d", foundOnShards, len(export2.Status.VirtualWorkspaces))
+		require.Equal(t, 1, foundOnShards, "cowboys not found exactly on one shard, but on %d/%d", foundOnShards, len(apiExportEndpointSlice2.Status.APIExportEndpoints))
 
 		return true, ""
 	}, wait.ForeverTestTimeout, 100*time.Millisecond, "expected to have cowboys exactly on one shard")

test/e2e/framework/util.go

@@ -32,7 +32,7 @@ import (
 	"github.com/kcp-dev/kcp/pkg/authorization"
 	bootstrappolicy "github.com/kcp-dev/kcp/pkg/authorization/bootstrap"
 	"github.com/kcp-dev/kcp/pkg/server"
-	apisv1alpha2 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha2"
+	apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
 	tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
 	kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster"
 	testing2 "github.com/kcp-dev/kcp/sdk/testing"
@@ -84,12 +84,10 @@ func VirtualWorkspaceURL(ctx context.Context, kcpClusterClient kcpclientset.Clus
 }
 
 // ExportVirtualWorkspaceURLs returns the URLs of the virtual workspaces of the
-// given APIExport.
-func ExportVirtualWorkspaceURLs(export *apisv1alpha2.APIExport) []string {
-	//nolint:staticcheck // SA1019 VirtualWorkspaces is deprecated but not removed yet
-	urls := make([]string, 0, len(export.Status.VirtualWorkspaces))
-	//nolint:staticcheck // SA1019 VirtualWorkspaces is deprecated but not removed yet
-	for _, vw := range export.Status.VirtualWorkspaces {
+// given APIExportEndpointSlice.
+func ExportVirtualWorkspaceURLs(export *apisv1alpha1.APIExportEndpointSlice) []string {
+	urls := make([]string, 0, len(export.Status.APIExportEndpoints))
+	for _, vw := range export.Status.APIExportEndpoints {
 		urls = append(urls, vw.URL)
 	}
 	return urls

test/e2e/reconciler/apiexportendpointslice/apiexportendpointslice_test.go

@@ -275,19 +275,6 @@ func TestAPIBindingEndpointSlicesSharded(t *testing.T) {
 		}
 	}
 
-	// TODO(mjudeikis): This will be deprecated when we deperecate APIExport urls.
-	t.Logf("Check that APIExport has 2 virtual workspaces")
-	{
-		kcpClusterClient, err := kcpclientset.NewForConfig(cfg)
-		require.NoError(t, err, "failed to construct kcp cluster client for server")
-
-		apiExport, err := kcpClusterClient.Cluster(providerPath).ApisV1alpha2().APIExports().Get(ctx, "today-cowboys", metav1.GetOptions{})
-		require.NoError(t, err)
-
-		//nolint:staticcheck // SA1019 VirtualWorkspaces is deprecated but not removed yet
-		require.Len(t, apiExport.Status.VirtualWorkspaces, len(shards.Items))
-	}
-
 	t.Logf("Create a topology PartitionSet for the providers")
 	var partition *topologyv1alpha1.Partition
 	{