Skip to content

Make e2e tests more reliable in CI #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kcp-ci-bot merged 1 commit into from
Mar 2, 2026
Merged

Make e2e tests more reliable in CI #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions test/e2e/clusterinit/basic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,21 @@ limitations under the License.
package clusterinit

import (
"context"
"slices"
"strings"
"testing"
"time"

"github.com/go-logr/logr"

initializationv1alpha1 "github.com/kcp-dev/init-agent/sdk/apis/initialization/v1alpha1"
"github.com/kcp-dev/init-agent/test/utils"

"github.com/kcp-dev/logicalcluster/v3"
kcptenancyinitialization "github.com/kcp-dev/sdk/apis/tenancy/initialization"
kcptenancyv1alpha1 "github.com/kcp-dev/sdk/apis/tenancy/v1alpha1"

corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"
ctrlruntime "sigs.k8s.io/controller-runtime"
)

Expand Down Expand Up @@ -77,8 +72,6 @@ func TestInitializeNewCluster(t *testing.T) {
t.Fatalf("Failed to create WorkspaceType: %v", err)
}

initializer := kcptenancyinitialization.InitializerForType(wst)

utils.GrantWorkspaceAccess(t, ctx, wstClient, utils.Subject(), rbacv1.PolicyRule{
APIGroups: []string{"tenancy.kcp.io"},
Resources: []string{"workspacetypes"},
Expand Down Expand Up @@ -185,17 +178,7 @@ metadata:
}

// wait for the agent to do its work and initialize the cluster and ultimately remove the initializer
err := wait.PollUntilContextTimeout(ctx, 500*time.Millisecond, 30*time.Second, false, func(ctx context.Context) (done bool, err error) {
err = rootClient.Get(ctx, types.NamespacedName{Name: targetWorkspace}, targetWs)
if err != nil {
return false, err
}

return !slices.Contains(targetWs.Status.Initializers, initializer), nil
})
if err != nil {
t.Fatalf("Failed to wait for workspace to be initialized: %v", err)
}
targetWs = utils.WaitForWorkspaceInitialization(t, ctx, kcpClusterClient, rootCluster, targetWorkspace)

// connect into the new workspace and verify the generated content
targetClient := kcpClusterClient.Cluster(rootCluster.Join(targetWorkspace))
Expand Down
20 changes: 1 addition & 19 deletions test/e2e/clusterinit/wait_for_ready_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,20 @@ limitations under the License.
package clusterinit

import (
"context"
"slices"
"strings"
"testing"
"time"

"github.com/go-logr/logr"

initializationv1alpha1 "github.com/kcp-dev/init-agent/sdk/apis/initialization/v1alpha1"
initagenttypes "github.com/kcp-dev/init-agent/sdk/types"
"github.com/kcp-dev/init-agent/test/utils"

kcptenancyinitialization "github.com/kcp-dev/sdk/apis/tenancy/initialization"
kcptenancyv1alpha1 "github.com/kcp-dev/sdk/apis/tenancy/v1alpha1"

rbacv1 "k8s.io/api/rbac/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"
ctrlruntime "sigs.k8s.io/controller-runtime"
)

Expand Down Expand Up @@ -75,8 +70,6 @@ func TestWaitForReadyAnnotation(t *testing.T) {
t.Fatalf("Failed to create WorkspaceType: %v", err)
}

initializer := kcptenancyinitialization.InitializerForType(wst)

utils.GrantWorkspaceAccess(t, ctx, wstClient, utils.Subject(), rbacv1.PolicyRule{
APIGroups: []string{"tenancy.kcp.io"},
Resources: []string{"workspacetypes"},
Expand Down Expand Up @@ -195,18 +188,7 @@ spec:
}

// Wait for the agent to do its work and initialize the cluster.
// The initializer should only be removed AFTER the CRD's Established condition is True.
err := wait.PollUntilContextTimeout(ctx, 500*time.Millisecond, 60*time.Second, false, func(ctx context.Context) (done bool, err error) {
err = rootClient.Get(ctx, types.NamespacedName{Name: targetWorkspace}, targetWs)
if err != nil {
return false, err
}

return !slices.Contains(targetWs.Status.Initializers, initializer), nil
})
if err != nil {
t.Fatalf("Failed to wait for workspace to be initialized: %v", err)
}
targetWs = utils.WaitForWorkspaceInitialization(t, ctx, kcpClusterClient, rootCluster, targetWorkspace)

// Verify the CRD exists in the target workspace and is Established
targetClient := kcpClusterClient.Cluster(rootCluster.Join(targetWorkspace))
Expand Down
37 changes: 37 additions & 0 deletions test/utils/fixtures.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,16 @@ import (
"time"

"github.com/kcp-dev/logicalcluster/v3"
mcclient "github.com/kcp-dev/multicluster-provider/client"
kcpcorev1alpha1 "github.com/kcp-dev/sdk/apis/core/v1alpha1"
kcptenancyv1alpha1 "github.com/kcp-dev/sdk/apis/tenancy/v1alpha1"

corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
"k8s.io/apiextensions-apiserver/pkg/apihelpers"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/util/yaml"
ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -76,6 +79,40 @@ func CreateAndWaitForWorkspace(t *testing.T, ctx context.Context, client ctrlrun
return logicalcluster.Name(testWs.Spec.Cluster)
}

func WaitForWorkspaceInitialization(t *testing.T, ctx context.Context, clusterClient mcclient.ClusterClient, parentWorkspace logicalcluster.Path, workspaceName string) *kcptenancyv1alpha1.Workspace {
t.Helper()

parentClient := clusterClient.Cluster(parentWorkspace)

// wait for the agent to do its work and initialize the cluster and ultimately remove the initializer
ws := &kcptenancyv1alpha1.Workspace{}

err := wait.PollUntilContextTimeout(ctx, 500*time.Millisecond, 30*time.Second, false, func(ctx context.Context) (done bool, err error) {
err = parentClient.Get(ctx, types.NamespacedName{Name: workspaceName}, ws)
if err != nil {
return false, err
}

return len(ws.Status.Initializers) == 0, nil
})
if err != nil {
t.Fatalf("Failed to wait for workspace to be initialized: %v", err)
}

// connect into the new workspace and verify it's truly ready (there is a brief delay between
// all initializes being gone and the cluster actually being usable)
targetClient := clusterClient.Cluster(parentWorkspace.Join(workspaceName))

err = wait.PollUntilContextTimeout(ctx, 500*time.Millisecond, 30*time.Second, false, func(ctx context.Context) (done bool, err error) {
return targetClient.List(ctx, &corev1.NamespaceList{}) == nil, nil
})
if err != nil {
t.Fatalf("Failed to wait for workspace to be usable: %v", err)
}

return ws
}

func GrantWorkspaceAccess(t *testing.T, ctx context.Context, client ctrlruntimeclient.Client, rbacSubject rbacv1.Subject, extraRules ...rbacv1.PolicyRule) {
t.Helper()

Expand Down