From 08d76e6f2b67722681bf853fac8985627cdd8a40 Mon Sep 17 00:00:00 2001 From: Marek Schmidt Date: Tue, 7 Apr 2026 14:02:02 +0200 Subject: [PATCH 1/2] relax skip_permissions assertions --- .../apiserversource/skip_permissions.go | 24 ++++--------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/test/rekt/features/apiserversource/skip_permissions.go b/test/rekt/features/apiserversource/skip_permissions.go index b2d1415e540..5cce8c76848 100644 --- a/test/rekt/features/apiserversource/skip_permissions.go +++ b/test/rekt/features/apiserversource/skip_permissions.go @@ -255,25 +255,17 @@ func SkipPermissionsEnabledWithRBACFeature() *feature.Feature { var obj *appsv1.Deployment for _, deployment := range objs.Items { - if strings.HasPrefix(deployment.Name, "apiserversource-two-") { + if strings.HasPrefix(deployment.Name, "apiserversource-two-") && deployment.Status.ReadyReplicas >= 1 { obj = &deployment break } } if obj == nil { - t.Fatal("could not found a Deployment prefixed with 'apiserversource-two-'") + t.Fatal("could not find a Deployment prefixed with 'apiserversource-two-' with at least 1 readyReplica") return } - if obj.Status.ReadyReplicas != 1 { - t.Fatalf("Expected 1 ready replica, got: %d", obj.Status.ReadyReplicas) - } - - if obj.Status.UnavailableReplicas != 0 { - t.Fatalf("Expected 0 unavailable replica, got: %d", obj.Status.UnavailableReplicas) - } - for _, envvar := range obj.Spec.Template.Spec.Containers[0].Env { if envvar.Name == "K_SOURCE_CONFIG" { var config apiserver.Config @@ -482,25 +474,17 @@ func SkipPermissionsDisabledWithRBACFeature() *feature.Feature { var obj *appsv1.Deployment for _, deployment := range objs.Items { - if strings.HasPrefix(deployment.Name, "apiserversource-four-") { + if strings.HasPrefix(deployment.Name, "apiserversource-four-") && deployment.Status.ReadyReplicas >= 1 { obj = &deployment break } } if obj == nil { - t.Fatal("could not found a Deployment prefixed with 'apiserversource-four-'") + t.Fatal("could not found a Deployment prefixed with 'apiserversource-four-' with at least 1 readyReplica") return } - if obj.Status.ReadyReplicas != 1 { - t.Fatalf("Expected 1 ready replica, got: %d", obj.Status.ReadyReplicas) - } - - if obj.Status.UnavailableReplicas != 0 { - t.Fatalf("Expected 0 unavailable replica, got: %d", obj.Status.UnavailableReplicas) - } - for _, envvar := range obj.Spec.Template.Spec.Containers[0].Env { if envvar.Name == "K_SOURCE_CONFIG" { var config apiserver.Config From 5d09681c9f7bda2d8b30887c8171dc8597f7d40d Mon Sep 17 00:00:00 2001 From: Marek Schmidt Date: Tue, 7 Apr 2026 14:05:49 +0200 Subject: [PATCH 2/2] consistency --- test/rekt/features/apiserversource/skip_permissions.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/rekt/features/apiserversource/skip_permissions.go b/test/rekt/features/apiserversource/skip_permissions.go index 5cce8c76848..a481418f901 100644 --- a/test/rekt/features/apiserversource/skip_permissions.go +++ b/test/rekt/features/apiserversource/skip_permissions.go @@ -481,7 +481,7 @@ func SkipPermissionsDisabledWithRBACFeature() *feature.Feature { } if obj == nil { - t.Fatal("could not found a Deployment prefixed with 'apiserversource-four-' with at least 1 readyReplica") + t.Fatal("could not find a Deployment prefixed with 'apiserversource-four-' with at least 1 readyReplica") return }