Skip to content

sig-release: Blockade changes to critical k/release tooling#13328

Merged
k8s-ci-robot merged 1 commit intokubernetes:masterfrom
justaugustus:k-r-blockades
Jul 9, 2019
Merged

sig-release: Blockade changes to critical k/release tooling#13328
k8s-ci-robot merged 1 commit intokubernetes:masterfrom
justaugustus:k-r-blockades

Conversation

@justaugustus
Copy link
Copy Markdown
Member

@justaugustus justaugustus commented Jul 4, 2019

ref: kubernetes/release#816
Signed-off-by: Stephen Augustus [email protected]

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 4, 2019
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. area/prow Issues or PRs related to prow sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Jul 4, 2019
@justaugustus
Copy link
Copy Markdown
Member Author

/hold
(I think I have a few more patterns to add)

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 4, 2019
@justaugustus
Copy link
Copy Markdown
Member Author

Done.
/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 4, 2019
@justaugustus
Copy link
Copy Markdown
Member Author

/assign @cblecker @fejta
/cc @kubernetes/sig-release-admins @kubernetes/release-engineering @nikhita

@cblecker
Copy link
Copy Markdown
Member

cblecker commented Jul 5, 2019

/hold

Why wouldn't we just do this with OWNERS files?

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 5, 2019
@justaugustus
Copy link
Copy Markdown
Member Author

@cblecker -- This is essentially saying I want explicit approval from a repo admin (SIG Release Chair) before changing one of these tools. We have top-level approvers in k/release that I still want to be able to approve other changes without impact.

As the tools are scattered across the repo, I need an extra gate to protect them and I heard that required_reviewers doesn't actually get respected?
Some of this could probably be obviated if all of the tools were in a single (or a few) subdirectories with no_parent_owners: true, but at this moment, I don't have a clear picture of what could break if I move things around.

@alvaroaleman
Copy link
Copy Markdown
Member

/uncc

@k8s-ci-robot k8s-ci-robot removed the request for review from alvaroaleman July 7, 2019 08:07
@cjwagner
Copy link
Copy Markdown
Member

cjwagner commented Jul 8, 2019

Sounds like using blockade is most appropriate here, but just as an FYI Tide support blocking merge to entire branches or repos using a merge blocking issue: https://github.com/kubernetes/test-infra/blob/master/prow/cmd/tide/config.md#merge-blocker-issues

blocker_label: tide/merge-blocker

@justaugustus
Copy link
Copy Markdown
Member Author

@cjwagner -- Whoa, that's cool. Thanks for the tip! Agreed that blockade might still be the right path here.

@fejta
Copy link
Copy Markdown
Contributor

fejta commented Jul 8, 2019

/unassign
/assign @cjwagner

No concerns with the general intent

@k8s-ci-robot k8s-ci-robot assigned cjwagner and unassigned fejta Jul 8, 2019
@cblecker
Copy link
Copy Markdown
Member

cblecker commented Jul 8, 2019

I started writing something up and then apparently closed the tab 🤦‍♂ .

Basically, I still feel like this is an anti-pattern (blockading files, and then manually removing the label each time you need to change them). It provides a different contributing structure than normal, and requires manual intervention.

I could be convinced to be okay with this for a limited period of time to help stabilize the situation (30d?). Ultimately though, reorganizing files (either move the scripts all together, or move the other stuff all together) and then using OWNERS files should be the goal.

@justaugustus
Copy link
Copy Markdown
Member Author

@cblecker -- yep, the intent for the blockade is definitely temporary!
I want to rearrange the tools but I don't feel comfortable doing so until we can identify where they're used and have jobs to protect changes to them. Much of that work is already in flight. :)

@cblecker
Copy link
Copy Markdown
Member

cblecker commented Jul 9, 2019

What's a reasonable time frame for this work?

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 9, 2019
@justaugustus
Copy link
Copy Markdown
Member Author

Spoke to @cblecker on Slack.
Setting a deadline for 8/8/19 and added a comment to remove the blockade afterwards.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 9, 2019
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

LGTM label has been added.

DetailsGit tree hash: c47a292f5d6f4bab026f0f7c6713822a3d3660a0

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cblecker, justaugustus

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:

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 Jul 9, 2019
@justaugustus
Copy link
Copy Markdown
Member Author

Thanks again, Christoph!
/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 9, 2019
@k8s-ci-robot k8s-ci-robot merged commit 973a6e6 into kubernetes:master Jul 9, 2019
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

@justaugustus: Updated the plugins configmap in namespace default using the following files:

  • key plugins.yaml using file prow/plugins.yaml
Details

In response to this:

ref: kubernetes/release#816
Signed-off-by: Stephen Augustus [email protected]

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.

Comment thread prow/plugins.yaml
- repos:
- kubernetes/release
blockregexps:
- ^anago|branchff|build\/|changelog-update|compile-release-tools|debian\/|find_green_build|gcb\/|gcbmgr|lib\/|prin|push-build.sh|release-notify|relnotes|rpm\/
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

why not .*? :P

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/prow Issues or PRs related to prow cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants