Skip to content

Commit 8fd6894

Browse files
xrstfxrstf
committed
that works
On-behalf-of: @SAP [email protected]
1 parent e8e53f9 commit 8fd6894

File tree

8 files changed

+343
-459
lines changed

8 files changed

+343
-459
lines changed

‎test/e2e/apiexport/apiexport_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func TestPermissionsClaims(t *testing.T) {
9494
}
9595

9696
// let the agent do its thing
97-
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
97+
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName, "")
9898

9999
// wait for the APIExport to be updated
100100
t.Logf("Waiting for APIExport to be updated…")
@@ -336,7 +336,7 @@ func TestExistingPermissionsClaimsAreKept(t *testing.T) {
336336
}
337337

338338
// let the agent do its thing
339-
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
339+
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName, "")
340340

341341
// wait for the APIExport to be updated
342342
expectedClaims := []kcpapisv1alpha1.PermissionClaim{
@@ -463,7 +463,7 @@ func TestSchemasAreMerged(t *testing.T) {
463463
}
464464

465465
// let the agent do its thing
466-
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
466+
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName, "")
467467

468468
// wait for the APIExport to be updated
469469
t.Logf("Waiting for APIExport to be updated…")
@@ -555,7 +555,7 @@ func TestSchemaIsKeptWhenDeletingPublishedResource(t *testing.T) {
555555
}
556556

557557
// let the agent do its thing
558-
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
558+
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName, "")
559559

560560
// wait for the APIExport to be contain the new ARS
561561
t.Logf("Waiting for APIExport to be updated…")
@@ -692,7 +692,7 @@ func TestNewSchemasAreCreatedAsNeeded(t *testing.T) {
692692
}
693693

694694
// let the agent do its thing
695-
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
695+
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName, "")
696696

697697
// wait for the APIExport to be updated
698698
t.Logf("Waiting for APIExport to be updated…")

‎test/e2e/apiresourceschema/apiresourceschema_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func TestARSAreCreated(t *testing.T) {
7676
}
7777

7878
// let the agent do its thing
79-
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
79+
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName, "")
8080

8181
// wait for the APIExport to be updated
8282
t.Logf("Waiting for APIExport to be updated…")
@@ -147,7 +147,7 @@ func TestARSAreNotUpdated(t *testing.T) {
147147
}
148148

149149
// let the agent do its thing
150-
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
150+
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName, "")
151151

152152
// check ARS
153153
t.Logf("Waiting for APIResourceSchema to be created…")
@@ -254,7 +254,7 @@ func TestARSOnlyContainsSelectedCRDVersion(t *testing.T) {
254254
}
255255

256256
// let the agent do its thing
257-
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
257+
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName, "")
258258

259259
// wait for the APIExport to be updated
260260
t.Logf("Waiting for APIExport to be updated…")
@@ -336,7 +336,7 @@ func TestMultiVersionCRD(t *testing.T) {
336336
}
337337

338338
// let the agent do its thing
339-
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
339+
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName, "")
340340

341341
// wait for the APIExport to be updated
342342
t.Logf("Waiting for APIExport to be updated…")
@@ -433,7 +433,7 @@ func TestProjection(t *testing.T) {
433433
}
434434

435435
// let the agent do its thing
436-
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
436+
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName, "")
437437

438438
// wait for the APIExport to be updated
439439
t.Logf("Waiting for APIExport to be updated…")
@@ -532,7 +532,7 @@ func TestNonCRDResource(t *testing.T) {
532532
}
533533

534534
// let the agent do its thing
535-
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
535+
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName, "")
536536

537537
// wait for the APIExport to be updated
538538
t.Logf("Waiting for APIExport to be updated…")

‎test/e2e/sync/apiexportendpointslice_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func TestAPIExportEndpointSliceSameCluster(t *testing.T) {
110110
}
111111

112112
// start the agent in the background to update the APIExport with the CronTabs API;
113-
utils.RunEndpointSliceAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, endpointSlice.Name)
113+
utils.RunEndpointSliceAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, endpointSlice.Name, "")
114114

115115
// wait until the API is available
116116
teamClusterPath := logicalcluster.NewPath("root").Join(orgWorkspace).Join("team-1")
@@ -253,7 +253,7 @@ func TestAPIExportEndpointSliceDifferentCluster(t *testing.T) {
253253
}
254254

255255
// start the agent in the background to update the APIExport with the CronTabs API
256-
utils.RunEndpointSliceAgent(ctx, t, "bob", endpointKubeconfig, envtestKubeconfig, endpointSlice.Name)
256+
utils.RunEndpointSliceAgent(ctx, t, "bob", endpointKubeconfig, envtestKubeconfig, endpointSlice.Name, "")
257257

258258
// wait until the API is available
259259

‎test/e2e/sync/primary_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func TestSyncSimpleObject(t *testing.T) {
8888
}
8989

9090
// start the agent in the background to update the APIExport with the CronTabs API
91-
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
91+
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName, "")
9292

9393
// wait until the API is available
9494
kcpClusterClient := utils.GetKcpAdminClusterClient(t)
@@ -181,7 +181,7 @@ func TestSyncSimpleObjectOldNaming(t *testing.T) {
181181
}
182182

183183
// start the agent in the background to update the APIExport with the CronTabs API
184-
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
184+
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName, "")
185185

186186
// wait until the API is available
187187
kcpClusterClient := utils.GetKcpAdminClusterClient(t)
@@ -268,7 +268,7 @@ func TestSyncWithDefaultNamingRules(t *testing.T) {
268268
}
269269

270270
// start the agent in the background to update the APIExport with the CronTabs API
271-
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
271+
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName, "")
272272

273273
// wait until the API is available
274274
kcpClusterClient := utils.GetKcpAdminClusterClient(t)
@@ -371,7 +371,7 @@ func TestLocalChangesAreKept(t *testing.T) {
371371
}
372372

373373
// start the agent in the background to update the APIExport with the CronTabs API
374-
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
374+
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName, "")
375375

376376
// wait until the API is available
377377
kcpClusterClient := utils.GetKcpAdminClusterClient(t)
@@ -568,7 +568,7 @@ func TestResourceFilter(t *testing.T) {
568568
}
569569

570570
// start the agent in the background to update the APIExport with the CronTabs API
571-
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
571+
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName, "")
572572

573573
// wait until the API is available
574574
kcpClusterClient := utils.GetKcpAdminClusterClient(t)
@@ -685,7 +685,7 @@ func TestSyncingOverlyLongNames(t *testing.T) {
685685
}
686686

687687
// start the agent in the background to update the APIExport with the CronTabs API
688-
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
688+
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName, "")
689689

690690
// wait until the API is available
691691
kcpClusterClient := utils.GetKcpAdminClusterClient(t)
@@ -787,7 +787,7 @@ func TestSyncWithWorkspacePath(t *testing.T) {
787787
}
788788

789789
// start the agent in the background to update the APIExport with the CronTabs API
790-
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
790+
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName, "")
791791

792792
// wait until the API is available
793793
kcpClusterClient := utils.GetKcpAdminClusterClient(t)
@@ -912,7 +912,7 @@ func TestSyncMultiResources(t *testing.T) {
912912
}
913913

914914
// start the agent in the background to update the APIExport with the CronTabs API
915-
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
915+
utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName, "")
916916

917917
// wait until the API is available
918918
kcpClusterClient := utils.GetKcpAdminClusterClient(t)

0 commit comments

Comments
 (0)