fix(prow/plugins/approve): approving with full config OWNERS controlled by wuhuizuo · Pull Request #29970 · kubernetes/test-infra

wuhuizuo · 2023-06-29T04:26:25Z

What

How

Make it fixed without massive refactoring, also do not change the behavior and mostly approve notifies.

k8s-ci-robot · 2023-06-29T04:26:34Z

Hi @wuhuizuo. 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.

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

matthyx · 2023-06-29T05:09:40Z

/ok-to-test

matthyx

@wuhuizuo clever... I see what you mean by not refactoring
I did try a refactoring with generics for this plugin #12440 maybe we could revisit it together?

Changes: - kubernetes/test-infra#29762 - kubernetes/test-infra#29970 - other changes from upstream. Signed-off-by: wuhuizuo <wuhuizuo@126.com>

…#629) Changes: - kubernetes/test-infra#29762 - kubernetes/test-infra#29970 - other changes from upstream. Signed-off-by: wuhuizuo <wuhuizuo@126.com>

Signed-off-by: wuhuizuo <wuhuizuo@126.com>

`NoParentOwners` should only worked when none people got. For an example: ``` # file sub/OWNERS options: no_parent_owners: true filters: "\\.yaml": approvers: [alice] ``` But only the file `func_test.go` changed in the PR, it should use the parent OWNERS file. Signed-off-by: wuhuizuo <wuhuizuo@126.com>

wuhuizuo · 2023-07-17T10:26:00Z

May the integration test job failed by flaky tests.

wuhuizuo · 2023-07-17T10:26:09Z

/retest

wuhuizuo · 2023-07-20T08:43:16Z

@wuhuizuo clever... I see what you mean by not refactoring I did try a refactoring with generics for this plugin #12440 maybe we could revisit it together?

@matthyx My pleasure! Looking forward to hearing your specific thoughts.

Also I added a new commit to solve the issue when there is no default filter and the inherit from parent is disabled, PTAL:
dcd9b36

wuhuizuo · 2023-09-11T09:01:02Z

ping @matthyx @cjwagner 😄 could you review it?

matthyx · 2023-09-28T19:31:58Z

prow/plugins/approve/approvers/owners.go

 		}
 	}
+
+	// todo: make it better.


matthyx

/lgtm

matthyx · 2023-09-28T19:34:53Z

/assign @droslean

droslean · 2023-09-29T13:50:29Z

/label tide/merge-method-squash
/approve

k8s-ci-robot · 2023-09-29T13:50:41Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: droslean, matthyx, wuhuizuo

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:

~~prow/OWNERS~~ [droslean]

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

The limitation has been fixed by kubernetes/test-infra#29970

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 29, 2023

k8s-ci-robot requested review from cjwagner and matthyx June 29, 2023 04:26

k8s-ci-robot added area/prow Issues or PRs related to prow area/prow/plugins Issues or PRs related to prow's plugins for the hook component sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Jun 29, 2023

wuhuizuo changed the title ~~Feature/fix approve plugin 2~~ fix(prow/plugins/approve): approving with full config OWNERS controlled Jun 29, 2023

wuhuizuo mentioned this pull request Jun 29, 2023

approve plugin makes assumptions about OWNERS file implementation #7690

Closed

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 Jun 29, 2023

matthyx approved these changes Jun 29, 2023

View reviewed changes

k8s-ci-robot assigned matthyx Jun 29, 2023

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 29, 2023

ti-chi-bot bot deleted the feature/fix-approve-plugin-2 branch June 29, 2023 05:46

wuhuizuo restored the feature/fix-approve-plugin-2 branch June 29, 2023 05:46

wuhuizuo mentioned this pull request Jun 29, 2023

fix(apps/gc/prow/release): bump hook image tag to v20230629-a95a424 PingCAP-QE/ee-ops#629

Merged

wuhuizuo mentioned this pull request Jul 5, 2023

Strengthen configuration change approval pingcap/tidb#45183

Closed

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 15, 2023

wuhuizuo added 3 commits July 17, 2023 10:54

fix(prow/plugins/approve): support get approvers when used full config

9dd4dd4

Signed-off-by: wuhuizuo <wuhuizuo@126.com>

fix(prow/plugins/approve): fix Approvers.UnapprovedFiles method

273ac97

Signed-off-by: wuhuizuo <wuhuizuo@126.com>

fix(prow/plugins/approve): fix Owners.GetSuggestedApprovers method

6b35632

Signed-off-by: wuhuizuo <wuhuizuo@126.com>

wuhuizuo force-pushed the feature/fix-approve-plugin-2 branch from 0f00a19 to 6b35632 Compare July 17, 2023 04:29

k8s-ci-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 17, 2023

wuhuizuo mentioned this pull request Jul 17, 2023

Add prow OWNERS file to pingcap/tidb repo to control approving for important scopes PingCAP-QE/ci#2277

Closed

ti-chi-bot bot deleted the feature/fix-approve-plugin-2 branch August 8, 2023 04:01

wuhuizuo restored the feature/fix-approve-plugin-2 branch September 11, 2023 09:02

matthyx reviewed Sep 28, 2023

View reviewed changes

prow/plugins/approve/approvers/owners.go

}

}

// todo: make it better.

Copy link

Contributor

matthyx Sep 28, 2023

Choose a reason for hiding this comment

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

😅

matthyx approved these changes Sep 28, 2023

View reviewed changes

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 28, 2023

k8s-ci-robot assigned droslean Sep 28, 2023

k8s-ci-robot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Sep 29, 2023

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 29, 2023

k8s-ci-robot merged commit 76c82f1 into kubernetes:master Sep 29, 2023

wuhuizuo deleted the feature/fix-approve-plugin-2 branch October 8, 2023 19:07

VannTen added a commit to VannTen/community-1 that referenced this pull request May 30, 2024

Remove warning about approve plugin and filters

4f96132

The limitation has been fixed by kubernetes/test-infra#29970

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(prow/plugins/approve): approving with full config OWNERS controlled#29970

fix(prow/plugins/approve): approving with full config OWNERS controlled#29970
k8s-ci-robot merged 4 commits intokubernetes:masterfrom
ti-community-infra:feature/fix-approve-plugin-2

wuhuizuo commented Jun 29, 2023 •

edited

Loading

Uh oh!

k8s-ci-robot commented Jun 29, 2023

Uh oh!

matthyx commented Jun 29, 2023

Uh oh!

matthyx left a comment

Uh oh!

wuhuizuo commented Jul 17, 2023

Uh oh!

wuhuizuo commented Jul 17, 2023

Uh oh!

wuhuizuo commented Jul 20, 2023 •

edited

Loading

Uh oh!

wuhuizuo commented Sep 11, 2023

Uh oh!

matthyx Sep 28, 2023

Uh oh!

matthyx left a comment

Uh oh!

matthyx commented Sep 28, 2023

Uh oh!

droslean commented Sep 29, 2023

Uh oh!

k8s-ci-robot commented Sep 29, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Comments

Conversation

wuhuizuo commented Jun 29, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What

How

Uh oh!

k8s-ci-robot commented Jun 29, 2023

Uh oh!

matthyx commented Jun 29, 2023

Uh oh!

matthyx left a comment

Choose a reason for hiding this comment

Uh oh!

wuhuizuo commented Jul 17, 2023

Uh oh!

wuhuizuo commented Jul 17, 2023

Uh oh!

wuhuizuo commented Jul 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wuhuizuo commented Sep 11, 2023

Uh oh!

matthyx Sep 28, 2023

Choose a reason for hiding this comment

Uh oh!

matthyx left a comment

Choose a reason for hiding this comment

Uh oh!

matthyx commented Sep 28, 2023

Uh oh!

droslean commented Sep 29, 2023

Uh oh!

k8s-ci-robot commented Sep 29, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Comments

wuhuizuo commented Jun 29, 2023 •

edited

Loading

wuhuizuo commented Jul 20, 2023 •

edited

Loading