[release-0.31] Fix permission claim defaultSelector hiding claimed resources

[anastazya]

Summary

Manual cherry-pick of #4200 to release-0.31.

The cherry-pick had one modify/delete conflict because labels_test.go does not exist on this branch. I kept the upstream version of that test file. The resulting commit preserves the original author and the full upstream regression coverage.

Validation:

• (cd staging/src/github.com/kcp-dev/sdk && go test ./... -count=1)
• go test ./test/e2e/virtual/apiexport -run '^TestAPIExportPermissionClaimsDefaultSelector$' -count=1 -v
• git diff --check

What Type of PR Is This?

/kind bug

Related Issue(s)

Backports #4200.

Release Notes

Fix watch request via VirtualWorkspace when selectors are used.

[kcp-ci-bot]

Hi @anastazya. Thanks for your PR.

I'm waiting for a kcp-dev member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[gman0]

Why is this not just a git cherry-pick c37085bcc9f6f8fd6d5bc1b2ec315b8f5ca57409 (i.e. retaining the original author)?

git cherry-pick c37085bcc9f6f8fd6d5bc1b2ec315b8f5ca57409
git add staging/src/github.com/kcp-dev/sdk/apis/apis/v1alpha2/permissionclaims/labels_test.go
git cherry-pick --continue

Should work just fine?

[anastazya]

You're right, I overcomplicated this. The cherry-pick works with the conflict resolved as you described, and the unit and E2E tests pass. I'll replace the current commit and keep the original author.

[anastazya]

/kind bug

[xrstf]

/approve

[kcp-ci-bot]

LGTM label has been added.

Details

Git tree hash: 17c23813f9eaf809d9697ff65b04c56ed7fc5eb1

[kcp-ci-bot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: xrstf

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [xrstf]
• staging/src/github.com/kcp-dev/sdk/apis/OWNERS [xrstf]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[gman0]

https://public-prow.kcp.k8c.io/view/s3/prow-public-data/pr-logs/pull/kcp-dev_kcp/4340/pull-kcp-test-e2e-shared/2092908294225006592

=== Failed
=== FAIL: test/e2e/virtual/terminatingworkspaces TestTerminatingWorkspacesVirtualWorkspaceWatch (34.25s)
    virtualworkspace_test.go:513: Shared kcp server will target configuration "/home/prow/go/src/github.com/kcp-dev/kcp/.kcp/admin.kubeconfig"
    virtualworkspace_test.go:513: Waiting for readiness for server at https://127.0.0.1:6443
    virtualworkspace_test.go:514: Waiting for tenancy.kcp.io/v1alpha1 to be served
    virtualworkspace_test.go:514: Waiting for tenancy.kcp.io/v1alpha1 to be served
    virtualworkspace_test.go:514: Waiting for tenancy.kcp.io/v1alpha1 to be served
    virtualworkspace_test.go:514: Waiting for topology.kcp.io/v1alpha1 to be served
    virtualworkspace_test.go:514: Waiting for topology.kcp.io/v1alpha1 to be served
    virtualworkspace_test.go:514: Created root:universal workspace root:e2e-workspace-rbxkb as /clusters/927nfsi29j14cowl on shard "root"
    virtualworkspace_test.go:527: Create workspacetypes with terminators
    virtualworkspace_test.go:554: Saving test artifacts for test "TestTerminatingWorkspacesVirtualWorkspaceWatch" under "/logs/artifacts/TestTerminatingWorkspacesVirtualWorkspaceWatch/2677700476".
    virtualworkspace_test.go:559: Wait for WorkspaceTypes and their virtual workspace URLs to be ready
    virtualworkspace_test.go:586: Create clients through the virtual workspace
    virtualworkspace_test.go:610: Start watchers for virtual workspace combinations
    virtualworkspace_test.go:635: Create workspaces and put them into deletion
    virtualworkspace_test.go:664: Check that watchers have received events for workspaces
    virtualworkspace_test.go:688: never saw a watch modified event for vw "parent" and targetWs "e2e-workspace-jbvkm"

/retest