Skip to content

Try prevent flaking by placing org and ws on same shard #3931

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

Open
ntnn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Try prevent flaking by placing org and ws on same shard #3931

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
13 changes: 12 additions & 1 deletion test/e2e/reconciler/workspacedeletion/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,12 @@ func TestWorkspaceDeletion(t *testing.T) {
{
name: "create and clean workspace",
work: func(ctx context.Context, t *testing.T, server runningServer) {
orgPath, _ := kcptesting.NewWorkspaceFixture(t, server, core.RootCluster.Path(), kcptesting.WithType(core.RootCluster.Path(), "organization"))
// The kcptesting.WithRootShard was added due to the
// test flaking in CI, it is not actually required for
// the test execution. However we observed that this
// subtest was flaking while the next subtest - which is
// pinning the workspaces to the root shard - was not.
orgPath, _ := kcptesting.NewWorkspaceFixture(t, server, core.RootCluster.Path(), kcptesting.WithRootShard(), kcptesting.WithType(core.RootCluster.Path(), "organization"))
Copy link
Contributor

@gman0 gman0 Mar 20, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add a comment for the rationale behind this change? Something like in the PR's description would suffice.


t.Logf("Create a workspace with a shard")
workspace, err := server.kcpClusterClient.Cluster(orgPath).TenancyV1alpha1().Workspaces().Create(ctx, &tenancyv1alpha1.Workspace{
Expand Down Expand Up @@ -194,6 +199,12 @@ func TestWorkspaceDeletion(t *testing.T) {
{
name: "nested workspace cleanup when an org workspace is deleted",
work: func(ctx context.Context, t *testing.T, server runningServer) {
// On the - kcptesting.WithRootShard the test doesn't
// need the root shard explicitly, it just needs to know
// the shard to get the client for the shard.
// In a future refactor the placement on the root shard
// could be removed and the client for the correct
// shards be build dynamically.
orgPath, _ := kcptesting.NewWorkspaceFixture(t, server, core.RootCluster.Path(), kcptesting.WithRootShard(), kcptesting.WithType(core.RootCluster.Path(), "organization"))

t.Logf("Should have finalizer in org workspace")
Expand Down