Skip to content
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

Jump to bottom

Automated cherry pick of #114863: Use label selector for filtering out resources when pruning. #115571: Add integration test for diff --prune --selector #116147

Merged
merged 3 commits into from Mar 11, 2023
Merged

Automated cherry pick of #114863: Use label selector for filtering out resources when pruning. #115571: Add integration test for diff --prune --selector #116147

merged 3 commits into from Mar 11, 2023

Conversation

nathanmartins
Copy link

@nathanmartins nathanmartins commented Feb 28, 2023 •
edited by k8s-ci-robot

Cherry pick of #114863 #115571 on release-1.25.

#114863: Use label selector for filtering out resources when pruning.
#115571: Add integration test for diff --prune --selector

For details on the cherry pick process, see the cherry pick requests page.

Make kubectl diff --prune behave correctly with the --selector/-l flag

danlenar and others added 3 commits February 28, 2023 17:11
@danlenar @nathanmartins
Use label selector for filtering out resources when pruning. Matches …
92fff25 
…same behavior as for kubectl apply

Signed-off-by: Daniel Lenar <dlenar@vailsys.com>
@ardaguclu @nathanmartins
Add integration test for diff --prune --selector
557582e 
This PR adds new integration tests for `kubectl diff --prune -l` to
catch possible regressions in the future.
@ardaguclu @nathanmartins
Re-enable label selector
fa67514
@k8s-ci-robot k8s-ci-robot added this to the v1.25 milestone Feb 28, 2023
@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Feb 28, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @nathanmartins. Thanks for your PR.

I'm waiting for a kubernetes 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.

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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Feb 28, 2023
@k8s-ci-robot k8s-ci-robot added area/test sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/testing Categorizes an issue or PR as relevant to SIG Testing. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Feb 28, 2023
@nathanmartins
Copy link
Author

/sig cli
/priority important-soon
/kind bug

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. kind/bug Categorizes issue or PR as related to a bug. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Feb 28, 2023
@dougsland
Copy link
Member

/ok-to-test
/lgtm

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 2, 2023
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 2, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: ace5c2e9e4625e6563b2978a85edffbb1db08a43

@KnVerey
Copy link
Contributor

KnVerey commented Mar 3, 2023

/approve
/triage accepted
/release-note-edit Make kubectl diff --prune behave correctly with the --selector/-l flag

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Mar 3, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: KnVerey, nathanmartins

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 3, 2023
@KnVerey
Copy link
Contributor

KnVerey commented Mar 3, 2023

/release-note-edit

Make kubectl diff --prune behave correctly with the --selector/-l flag

@k8s-ci-robot
Copy link
Contributor

@KnVerey: /release-note-edit must be used with a release note block.

In response to this:

/release-note-edit

Make kubectl diff --prune behave correctly with the --selector/-l flag

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/test-infra repository.

@KnVerey
Copy link
Contributor

KnVerey commented Mar 3, 2023

/release-note-edit release-note Make kubectl diff --prune behave correctly with the --selector/-l flag

/cc kubernetes/release-managers

@k8s-ci-robot k8s-ci-robot requested a review from a team March 3, 2023 21:01
@KnVerey
Copy link
Contributor

KnVerey commented Mar 3, 2023

/release-note-edit

Make kubectl diff --prune behave correctly with the --selector/-l flag

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Mar 3, 2023
@Verolop
Copy link

Verolop commented Mar 10, 2023

@KnVerey @nathanmartins in order to accept this cherry pick for 1.25, I requested a LGTM for 1.26 & 1.24. We typically like to include all affected branches when merging a backport.
thanks!

@nathanmartins
Copy link
Author

@ardaguclu @danlenar, can you guys approve this, please?

Verolop
Verolop reviewed Mar 11, 2023
View reviewed changes
Copy link

@Verolop Verolop left a comment

Choose a reason for hiding this comment

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

/lgtm

@Verolop Verolop added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 11, 2023
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Mar 11, 2023
@Verolop
Copy link

Verolop commented Mar 11, 2023

@nathanmartins since it was already approved by the relevant reviewers, and one of the branches was ready to go, I LGTM'd the other two so they could make it on time for the deadline.
Thanks!

@Verolop
Copy link

Verolop commented Mar 11, 2023

/retest-required

@k8s-ci-robot k8s-ci-robot merged commit 36b707f into kubernetes:release-1.25 Mar 11, 2023
@nathanmartins nathanmartins deleted the automated-cherry-pick-of-#114863-#115571-upstream-release-1.25 branch March 13, 2023 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Verolop Verolop Verolop left review comments

@dougsland dougsland Awaiting requested review from dougsland

@KnVerey KnVerey Awaiting requested review from KnVerey

Assignees

@dougsland dougsland

@Verolop Verolop

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubectl area/test cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.25
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@nathanmartins @k8s-ci-robot @dougsland @KnVerey @Verolop @danlenar @ardaguclu