Rename as requested in review

Signed-off-by: David Festal <dfestal@redhat.com>
kcp-dev · Feb 7, 2023 · 77af933 · 77af933
1 parent 17a6ba8
commit 77af933
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 32 deletions.
diff --git a/test/e2e/framework/syncer.go b/test/e2e/framework/syncer.go
@@ -130,10 +130,10 @@ func WithDownstreamPreparation(prepare func(config *rest.Config, isFakePCluster
 	}
 }
 
-// Create creates a SyncTarget resource through the `workload sync` CLI command,
+// CreateSyncTargetAndApplyToDownstream creates a SyncTarget resource through the `workload sync` CLI command,
 // applies the syncer-related resources in the physical cluster.
 // No resource will be effectively synced after calling this method.
-func (sf *syncerFixture) Create(t *testing.T) *appliedSyncerFixture {
+func (sf *syncerFixture) CreateSyncTargetAndApplyToDownstream(t *testing.T) *appliedSyncerFixture {
 	t.Helper()
 
 	artifactDir, _, err := ScratchDirs(t)

diff --git a/test/e2e/reconciler/cluster/controller_test.go b/test/e2e/reconciler/cluster/controller_test.go
@@ -195,7 +195,7 @@ func TestClusterController(t *testing.T) {
 					require.NoError(t, err)
 					t.Log("Installing test CRDs into sink cluster...")
 					fixturewildwest.FakePClusterCreate(t, sinkCrdClient.ApiextensionsV1().CustomResourceDefinitions(), metav1.GroupResource{Group: wildwest.GroupName, Resource: "cowboys"})
-				})).Create(t).StartSyncer(t)
+				})).CreateSyncTargetAndApplyToDownstream(t).StartSyncer(t)
 
 			t.Logf("Bind second user workspace to location workspace")
 			framework.NewBindCompute(t, wsPath, source).Bind(t)

diff --git a/test/e2e/reconciler/deployment/deployment_coordinator_test.go b/test/e2e/reconciler/deployment/deployment_coordinator_test.go
@@ -71,15 +71,15 @@ func TestDeploymentCoordinator(t *testing.T) {
 	eastSyncer := framework.NewSyncerFixture(t, upstreamServer, locationWorkspacePath,
 		framework.WithSyncTargetName("east"),
 		framework.WithSyncedUserWorkspaces(workloadWorkspace1, workloadWorkspace2),
-	).Create(t).StartSyncer(t)
+	).CreateSyncTargetAndApplyToDownstream(t).StartSyncer(t)
 
 	_, err = kcpClusterClient.Cluster(locationWorkspacePath).WorkloadV1alpha1().SyncTargets().Patch(ctx, "east", types.JSONPatchType, []byte(`[{"op":"add","path":"/metadata/labels/region","value":"east"}]`), metav1.PatchOptions{})
 	require.NoError(t, err)
 
 	westSyncer := framework.NewSyncerFixture(t, upstreamServer, locationWorkspacePath,
 		framework.WithSyncTargetName("west"),
 		framework.WithSyncedUserWorkspaces(workloadWorkspace1, workloadWorkspace2),
-	).Create(t).StartSyncer(t)
+	).CreateSyncTargetAndApplyToDownstream(t).StartSyncer(t)
 
 	_, err = kcpClusterClient.Cluster(locationWorkspacePath).WorkloadV1alpha1().SyncTargets().Patch(ctx, "west", types.JSONPatchType, []byte(`[{"op":"add","path":"/metadata/labels/region","value":"west"}]`), metav1.PatchOptions{})
 	require.NoError(t, err)

diff --git a/test/e2e/reconciler/locationworkspace/local_apiexport_test.go b/test/e2e/reconciler/locationworkspace/local_apiexport_test.go
@@ -70,7 +70,7 @@ func TestSyncTargetLocalExport(t *testing.T) {
 		framework.WithExtraResources("services"),
 		framework.WithSyncTargetName(syncTargetName),
 		framework.WithSyncedUserWorkspaces(computeWorkspace),
-	).Create(t).StartSyncer(t)
+	).CreateSyncTargetAndApplyToDownstream(t).StartSyncer(t)
 
 	framework.Eventually(t, func() (bool, string) {
 		syncTarget, err := kcpClients.Cluster(computePath).WorkloadV1alpha1().SyncTargets().Get(ctx, syncTargetName, metav1.GetOptions{})

diff --git a/test/e2e/reconciler/locationworkspace/multiple_apiexports_test.go b/test/e2e/reconciler/locationworkspace/multiple_apiexports_test.go
@@ -123,7 +123,7 @@ func TestMultipleExports(t *testing.T) {
 			)
 			require.NoError(t, err)
 		}),
-	).Create(t).StartSyncer(t)
+	).CreateSyncTargetAndApplyToDownstream(t).StartSyncer(t)
 
 	t.Logf("syncTarget should have one resource to sync")
 	require.Eventually(t, func() bool {

diff --git a/test/e2e/reconciler/locationworkspace/rootcompute_test.go b/test/e2e/reconciler/locationworkspace/rootcompute_test.go
@@ -80,7 +80,7 @@ func TestRootComputeWorkspace(t *testing.T) {
 			)
 			require.NoError(t, err)
 		}),
-	).Create(t).StartSyncer(t)
+	).CreateSyncTargetAndApplyToDownstream(t).StartSyncer(t)
 
 	require.Eventually(t, func() bool {
 		syncTarget, err := kcpClients.Cluster(computePath).WorkloadV1alpha1().SyncTargets().Get(ctx, syncTargetName, metav1.GetOptions{})

diff --git a/test/e2e/reconciler/locationworkspace/synctarget_test.go b/test/e2e/reconciler/locationworkspace/synctarget_test.go
@@ -98,7 +98,7 @@ func TestSyncTargetExport(t *testing.T) {
 	syncTarget := framework.NewSyncerFixture(t, source, computePath,
 		framework.WithAPIExports(fmt.Sprintf("%s:%s", schemaPath.String(), cowboysAPIExport.Name)),
 		framework.WithSyncTargetName(syncTargetName),
-	).Create(t).StartSyncer(t)
+	).CreateSyncTargetAndApplyToDownstream(t).StartSyncer(t)
 
 	require.Eventually(t, func() bool {
 		syncTarget, err := kcpClients.Cluster(computePath).WorkloadV1alpha1().SyncTargets().Get(ctx, syncTargetName, metav1.GetOptions{})

diff --git a/test/e2e/reconciler/namespace/controller_test.go b/test/e2e/reconciler/namespace/controller_test.go
@@ -95,7 +95,7 @@ func TestNamespaceScheduler(t *testing.T) {
 				// so that there's a ready cluster to schedule to.
 				syncerFixture := framework.NewSyncerFixture(t, server, server.path,
 					framework.WithExtraResources("services"),
-				).Create(t).StartAPIImporter(t).StartHeartBeat(t)
+				).CreateSyncTargetAndApplyToDownstream(t).StartAPIImporter(t).StartHeartBeat(t)
 				syncTargetName := syncerFixture.SyncerConfig.SyncTargetName
 
 				t.Logf("Bind to location workspace")

diff --git a/test/e2e/reconciler/scheduling/api_compatibility_test.go b/test/e2e/reconciler/scheduling/api_compatibility_test.go
@@ -55,14 +55,14 @@ func TestSchedulingOnSupportedAPI(t *testing.T) {
 		framework.WithSyncTargetName(firstSyncTargetName),
 		framework.WithSyncedUserWorkspaces(userWS),
 		framework.WithAPIExports(""),
-	).Create(t).StartAPIImporter(t).StartHeartBeat(t)
+	).CreateSyncTargetAndApplyToDownstream(t).StartAPIImporter(t).StartHeartBeat(t)
 
 	secondSyncTargetName := fmt.Sprintf("secondsynctarget-%d", +rand.Intn(1000000))
 	t.Logf("Creating a SyncTarget with global kubernetes APIExports in %s,and start both the Syncer APIImporter and Syncer HeartBeat", locationPath)
 	_ = framework.NewSyncerFixture(t, source, locationPath,
 		framework.WithSyncTargetName(secondSyncTargetName),
 		framework.WithSyncedUserWorkspaces(userWS),
-	).Create(t).StartAPIImporter(t).StartHeartBeat(t)
+	).CreateSyncTargetAndApplyToDownstream(t).StartAPIImporter(t).StartHeartBeat(t)
 
 	placementName := "placement-test-supportedapi"
 	t.Logf("Bind to location workspace")

diff --git a/test/e2e/reconciler/scheduling/controller_test.go b/test/e2e/reconciler/scheduling/controller_test.go
@@ -72,7 +72,7 @@ func TestScheduling(t *testing.T) {
 		framework.WithExtraResources("services"),
 		framework.WithSyncTargetName(syncTargetName),
 		framework.WithSyncedUserWorkspaces(userWorkspace, secondUserWorkspace),
-	).Create(t).StartSyncer(t)
+	).CreateSyncTargetAndApplyToDownstream(t).StartSyncer(t)
 
 	t.Logf("Wait for APIResourceImports to show up in the negotiation workspace")
 	require.Eventually(t, func() bool {

diff --git a/test/e2e/reconciler/scheduling/multi_placements_test.go b/test/e2e/reconciler/scheduling/multi_placements_test.go
@@ -65,15 +65,15 @@ func TestMultiPlacement(t *testing.T) {
 		framework.WithSyncTargetName(firstSyncTargetName),
 		framework.WithExtraResources("services"),
 		framework.WithSyncedUserWorkspaces(userWorkspace),
-	).Create(t).StartSyncer(t)
+	).CreateSyncTargetAndApplyToDownstream(t).StartSyncer(t)
 
 	secondSyncTargetName := "second-synctarget"
 	t.Logf("Creating a SyncTarget and syncer in %s", locationPath)
 	secondSyncerFixture := framework.NewSyncerFixture(t, source, locationPath,
 		framework.WithExtraResources("services"),
 		framework.WithSyncTargetName(secondSyncTargetName),
 		framework.WithSyncedUserWorkspaces(userWorkspace),
-	).Create(t).StartSyncer(t)
+	).CreateSyncTargetAndApplyToDownstream(t).StartSyncer(t)
 
 	t.Log("Label synctarget")
 	patchData1 := `{"metadata":{"labels":{"loc":"loc1"}}}`

diff --git a/test/e2e/reconciler/scheduling/placement_scheduler_test.go b/test/e2e/reconciler/scheduling/placement_scheduler_test.go
@@ -67,7 +67,7 @@ func TestPlacementUpdate(t *testing.T) {
 		framework.WithSyncTargetName(firstSyncTargetName),
 		framework.WithSyncedUserWorkspaces(userWorkspace),
 		framework.WithExtraResources("services"),
-	).Create(t).StartSyncer(t)
+	).CreateSyncTargetAndApplyToDownstream(t).StartSyncer(t)
 
 	t.Log("Wait for \"default\" location")
 	require.Eventually(t, func() bool {

diff --git a/test/e2e/syncer/dns/dns_test.go b/test/e2e/syncer/dns/dns_test.go
@@ -60,7 +60,7 @@ func TestDNSResolution(t *testing.T) {
 
 	syncer := framework.NewSyncerFixture(t, upstreamServer, locationWorkspacePath,
 		framework.WithSyncedUserWorkspaces(workloadWorkspace1, workloadWorkspace2),
-	).Create(t).StartSyncer(t)
+	).CreateSyncTargetAndApplyToDownstream(t).StartSyncer(t)
 	syncer.WaitForSyncTargetReady(ctx, t)
 
 	downstreamKubeClient, err := kubernetes.NewForConfig(syncer.DownstreamConfig)

diff --git a/test/e2e/syncer/syncer_test.go b/test/e2e/syncer/syncer_test.go
@@ -85,7 +85,7 @@ func TestSyncerLifecycle(t *testing.T) {
 				metav1.GroupResource{Group: "core.k8s.io", Resource: "persistentvolumes"},
 			)
 			require.NoError(t, err)
-		})).Create(t).StartSyncer(t)
+		})).CreateSyncTargetAndApplyToDownstream(t).StartSyncer(t)
 
 	ctx, cancelFunc := context.WithCancel(context.Background())
 	t.Cleanup(cancelFunc)
@@ -621,7 +621,7 @@ func TestCordonUncordonDrain(t *testing.T) {
 	// response.
 	syncerFixture := framework.NewSyncerFixture(t, upstreamServer, wsPath,
 		framework.WithExtraResources("services"),
-	).Create(t).StartSyncer(t)
+	).CreateSyncTargetAndApplyToDownstream(t).StartSyncer(t)
 	syncTargetName := syncerFixture.SyncerConfig.SyncTargetName
 
 	ctx, cancelFunc := context.WithCancel(context.Background())

diff --git a/test/e2e/syncer/tunnels_test.go b/test/e2e/syncer/tunnels_test.go
@@ -73,7 +73,7 @@ func TestSyncerTunnel(t *testing.T) {
 
 	syncerFixture := framework.NewSyncerFixture(t, upstreamServer, synctargetWsName.Path(),
 		framework.WithSyncedUserWorkspaces(userWs),
-	).Create(t).StartSyncer(t)
+	).CreateSyncTargetAndApplyToDownstream(t).StartSyncer(t)
 
 	syncerFixture.WaitForSyncTargetReady(ctx, t)
 

diff --git a/test/e2e/virtual/syncer/virtualworkspace_test.go b/test/e2e/virtual/syncer/virtualworkspace_test.go
@@ -232,7 +232,7 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
 						)
 						require.NoError(t, err)
 					}),
-				).Create(t).StartAPIImporter(t).StartHeartBeat(t)
+				).CreateSyncTargetAndApplyToDownstream(t).StartAPIImporter(t).StartHeartBeat(t)
 
 				kubelikeSyncer.StopHeartBeat(t)
 				kubelikeSyncer.StartHeartBeat(t)
@@ -254,7 +254,7 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
 						logWithTimestampf(t, "Installing test CRDs into sink cluster...")
 						fixturewildwest.FakePClusterCreate(t, sinkCrdClient.ApiextensionsV1().CustomResourceDefinitions(), metav1.GroupResource{Group: wildwest.GroupName, Resource: "cowboys"})
 					}),
-				).Create(t).StartAPIImporter(t).StartHeartBeat(t)
+				).CreateSyncTargetAndApplyToDownstream(t).StartAPIImporter(t).StartHeartBeat(t)
 
 				kubelikeVWDiscoverClusterClient, err := kcpdiscovery.NewForConfig(kubelikeSyncer.SyncerVirtualWorkspaceConfig)
 				require.NoError(t, err)
@@ -341,7 +341,7 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
 						logWithTimestampf(t, "Installing test CRDs into sink cluster...")
 						fixturewildwest.FakePClusterCreate(t, sinkCrdClient.ApiextensionsV1().CustomResourceDefinitions(), metav1.GroupResource{Group: wildwest.GroupName, Resource: "cowboys"})
 					}),
-				).Create(t).StartAPIImporter(t).StartHeartBeat(t)
+				).CreateSyncTargetAndApplyToDownstream(t).StartAPIImporter(t).StartHeartBeat(t)
 
 				logWithTimestampf(t, "Create two service accounts")
 				_, err := kubeClusterClient.Cluster(wildwestLocationPath).CoreV1().ServiceAccounts("default").Create(ctx, &corev1.ServiceAccount{
@@ -461,7 +461,7 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
 						logWithTimestampf(t, "Installing test CRDs into sink cluster...")
 						fixturewildwest.FakePClusterCreate(t, sinkCrdClient.ApiextensionsV1().CustomResourceDefinitions(), metav1.GroupResource{Group: wildwest.GroupName, Resource: "cowboys"})
 					}),
-				).Create(t).StartAPIImporter(t).StartHeartBeat(t)
+				).CreateSyncTargetAndApplyToDownstream(t).StartAPIImporter(t).StartHeartBeat(t)
 
 				logWithTimestampf(t, "Bind wildwest location workspace to itself")
 				framework.NewBindCompute(t, wildwestLocationPath, server,
@@ -619,7 +619,7 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
 						logWithTimestampf(t, "Installing test CRDs into sink cluster...")
 						fixturewildwest.FakePClusterCreate(t, sinkCrdClient.ApiextensionsV1().CustomResourceDefinitions(), metav1.GroupResource{Group: wildwest.GroupName, Resource: "cowboys"})
 					}),
-				).Create(t).StartAPIImporter(t).StartHeartBeat(t)
+				).CreateSyncTargetAndApplyToDownstream(t).StartAPIImporter(t).StartHeartBeat(t)
 
 				logWithTimestampf(t, "Bind consumer workspace to wildwest location workspace")
 				framework.NewBindCompute(t, consumerPath, server,
@@ -774,7 +774,7 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
 						logWithTimestampf(t, "Installing test CRDs into sink cluster...")
 						fixturewildwest.FakePClusterCreate(t, sinkCrdClient.ApiextensionsV1().CustomResourceDefinitions(), metav1.GroupResource{Group: wildwest.GroupName, Resource: "cowboys"})
 					}),
-				).Create(t).StartAPIImporter(t).StartHeartBeat(t)
+				).CreateSyncTargetAndApplyToDownstream(t).StartAPIImporter(t).StartHeartBeat(t)
 
 				_, err = kcpClusterClient.Cluster(wildwestLocationPath).WorkloadV1alpha1().SyncTargets().Patch(ctx, "wildwest-north", types.JSONPatchType, []byte(`[{"op":"add","path":"/metadata/labels/region","value":"north"}]`), metav1.PatchOptions{})
 				require.NoError(t, err)
@@ -793,7 +793,7 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
 						logWithTimestampf(t, "Installing test CRDs into sink cluster...")
 						fixturewildwest.FakePClusterCreate(t, sinkCrdClient.ApiextensionsV1().CustomResourceDefinitions(), metav1.GroupResource{Group: wildwest.GroupName, Resource: "cowboys"})
 					}),
-				).Create(t).StartAPIImporter(t).StartHeartBeat(t)
+				).CreateSyncTargetAndApplyToDownstream(t).StartAPIImporter(t).StartHeartBeat(t)
 
 				_, err = kcpClusterClient.Cluster(wildwestLocationPath).WorkloadV1alpha1().SyncTargets().Patch(ctx, "wildwest-south", types.JSONPatchType, []byte(`[{"op":"add","path":"/metadata/labels/region","value":"south"}]`), metav1.PatchOptions{})
 				require.NoError(t, err)
@@ -997,7 +997,7 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
 						logWithTimestampf(t, "Installing test CRDs into sink cluster...")
 						fixturewildwest.FakePClusterCreate(t, sinkCrdClient.ApiextensionsV1().CustomResourceDefinitions(), metav1.GroupResource{Group: wildwest.GroupName, Resource: "cowboys"})
 					}),
-				).Create(t).StartAPIImporter(t).StartHeartBeat(t)
+				).CreateSyncTargetAndApplyToDownstream(t).StartAPIImporter(t).StartHeartBeat(t)
 
 				_, err = kcpClusterClient.Cluster(wildwestLocationPath).WorkloadV1alpha1().SyncTargets().Patch(ctx, "wildwest-north", types.JSONPatchType, []byte(`[{"op":"add","path":"/metadata/labels/region","value":"north"}]`), metav1.PatchOptions{})
 				require.NoError(t, err)
@@ -1018,7 +1018,7 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
 						logWithTimestampf(t, "Installing test CRDs into sink cluster...")
 						fixturewildwest.FakePClusterCreate(t, sinkCrdClient.ApiextensionsV1().CustomResourceDefinitions(), metav1.GroupResource{Group: wildwest.GroupName, Resource: "cowboys"})
 					}),
-				).Create(t).StartAPIImporter(t).StartHeartBeat(t)
+				).CreateSyncTargetAndApplyToDownstream(t).StartAPIImporter(t).StartHeartBeat(t)
 
 				_, err = kcpClusterClient.Cluster(wildwestLocationPath).WorkloadV1alpha1().SyncTargets().Patch(ctx, "wildwest-south", types.JSONPatchType, []byte(`[{"op":"add","path":"/metadata/labels/region","value":"south"}]`), metav1.PatchOptions{})
 				require.NoError(t, err)
@@ -1325,7 +1325,7 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
 						logWithTimestampf(t, "Installing test CRDs into sink cluster...")
 						fixturewildwest.FakePClusterCreate(t, sinkCrdClient.ApiextensionsV1().CustomResourceDefinitions(), metav1.GroupResource{Group: wildwest.GroupName, Resource: "cowboys"})
 					}),
-				).Create(t).StartAPIImporter(t).StartHeartBeat(t)
+				).CreateSyncTargetAndApplyToDownstream(t).StartAPIImporter(t).StartHeartBeat(t)
 
 				logWithTimestampf(t, "Bind consumer workspace to wildwest location workspace")
 				framework.NewBindCompute(t, consumerPath, server,
@@ -1433,7 +1433,7 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
 						logWithTimestampf(t, "Installing test CRDs into sink cluster...")
 						fixturewildwest.FakePClusterCreate(t, sinkCrdClient.ApiextensionsV1().CustomResourceDefinitions(), metav1.GroupResource{Group: wildwest.GroupName, Resource: "cowboys"})
 					}),
-				).Create(t).StartAPIImporter(t).StartHeartBeat(t)
+				).CreateSyncTargetAndApplyToDownstream(t).StartAPIImporter(t).StartHeartBeat(t)
 
 				logWithTimestampf(t, "Bind consumer workspace to wildwest location workspace")
 				framework.NewBindCompute(t, consumerPath, server,
@@ -1948,7 +1948,7 @@ func TestUpsyncerVirtualWorkspace(t *testing.T) {
 					)
 					require.NoError(t, err)
 				}),
-			).Create(t).StartAPIImporter(t).StartHeartBeat(t)
+			).CreateSyncTargetAndApplyToDownstream(t).StartAPIImporter(t).StartHeartBeat(t)
 
 			logWithTimestampf(t, "Bind upsyncer workspace")
 			framework.NewBindCompute(t, upsyncerPath, server,