Skip to content

Commit 54e36ec

Browse files
committed
check for deletion in e2e test
Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com>
1 parent cd5bbef commit 54e36ec

1 file changed

Lines changed: 31 additions & 35 deletions

File tree

‎test/e2e/bind/happy-case_test.go‎

Lines changed: 31 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -448,47 +448,13 @@ func testHappyCase(
448448
require.NotEqual(t, consumer.providerContractNamespace, "unknown")
449449
},
450450
},
451-
// Request included namespace, so we check it first
452-
{
453-
name: "verify provider side namespace pre-seeding and RBAC management",
454-
step: func(t *testing.T) {
455-
t.Logf("Verifying APIServiceNamespace was created from pre-seeded namespace spec")
456-
var foundPreSeededNamespace bool
457-
var actualProviderNamespace string
458-
require.Eventually(t, func() bool {
459-
// If we are operating namespaced resources - namespace will be set, if cluster - we need to use
460-
// extracted one from the cluster-scoped object.
461-
namespaces, err := providerBindClient.KubeBindV1alpha2().APIServiceNamespaces(consumer.providerContractNamespace).List(ctx, metav1.ListOptions{})
462-
if err != nil {
463-
return false
464-
}
465-
466-
for _, ns := range namespaces.Items {
467-
if ns.Name == "wild-west" && ns.Status.Namespace != "" {
468-
actualProviderNamespace = ns.Status.Namespace
469-
foundPreSeededNamespace = true
470-
return true
471-
}
472-
}
473-
return false
474-
}, wait.ForeverTestTimeout, time.Millisecond*100, "waiting for pre-seeded APIServiceNamespace to be created on provider side")
475-
require.True(t, foundPreSeededNamespace, "Pre-seeded namespace 'wild-west' should be created via APIServiceExportRequest.Spec.Namespaces")
476-
477-
providerCoreClient := framework.KubeClient(t, providerConfig).CoreV1()
478-
_, err := providerCoreClient.Namespaces().Get(ctx, actualProviderNamespace, metav1.GetOptions{})
479-
require.NoError(t, err, "Actual provider side namespace object should exist")
480-
},
481-
},
482451
{
483452
name: "verify BoundSchemas have owner references to APIServiceExport",
484453
step: func(t *testing.T) {
485454
t.Logf("Verifying BoundSchemas have owner references to APIServiceExport")
486455
export, err := providerBindClient.KubeBindV1alpha2().APIServiceExports(consumer.providerContractNamespace).Get(ctx, "test-binding", metav1.GetOptions{})
487456
require.NoError(t, err, "APIServiceExport should exist")
488457

489-
expectedVerbs := []string{"get", "list", "watch", "create", "update", "patch", "delete"}
490-
slices.Sort(expectedVerbs)
491-
492458
boundSchemas, err := providerBindClient.KubeBindV1alpha2().BoundSchemas(consumer.providerContractNamespace).List(ctx, metav1.ListOptions{})
493459
require.NoError(t, err, "should be able to list BoundSchemas")
494460
require.NotEmpty(t, boundSchemas.Items, "should have at least one BoundSchema")
@@ -517,9 +483,39 @@ func testHappyCase(
517483
t.Logf("All BoundSchemas have proper owner references")
518484
},
519485
},
486+
// Request included namespace, so we check it first
520487
{
521-
name: "verify RBAC management",
488+
name: "verify provider side namespace pre-seeding and RBAC management",
522489
step: func(t *testing.T) {
490+
t.Logf("Verifying APIServiceNamespace was created from pre-seeded namespace spec")
491+
var foundPreSeededNamespace bool
492+
var actualProviderNamespace string
493+
require.Eventually(t, func() bool {
494+
// If we are operating namespaced resources - namespace will be set, if cluster - we need to use
495+
// extracted one from the cluster-scoped object.
496+
namespaces, err := providerBindClient.KubeBindV1alpha2().APIServiceNamespaces(consumer.providerContractNamespace).List(ctx, metav1.ListOptions{})
497+
if err != nil {
498+
return false
499+
}
500+
501+
for _, ns := range namespaces.Items {
502+
if ns.Name == "wild-west" && ns.Status.Namespace != "" {
503+
actualProviderNamespace = ns.Status.Namespace
504+
foundPreSeededNamespace = true
505+
return true
506+
}
507+
}
508+
return false
509+
}, wait.ForeverTestTimeout, time.Millisecond*100, "waiting for pre-seeded APIServiceNamespace to be created on provider side")
510+
require.True(t, foundPreSeededNamespace, "Pre-seeded namespace 'wild-west' should be created via APIServiceExportRequest.Spec.Namespaces")
511+
512+
providerCoreClient := framework.KubeClient(t, providerConfig).CoreV1()
513+
_, err := providerCoreClient.Namespaces().Get(ctx, actualProviderNamespace, metav1.GetOptions{})
514+
require.NoError(t, err, "Actual provider side namespace object should exist")
515+
516+
expectedVerbs := []string{"get", "list", "watch", "create", "update", "patch", "delete"}
517+
slices.Sort(expectedVerbs)
518+
523519
switch informerScope {
524520
case kubebindv1alpha2.ClusterScope:
525521
t.Logf("Verifying RBAC resources were created for secret management in cluster scope")

0 commit comments

Comments
 (0)