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.

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

github-management: add docs for master to main migration #5609

Merged
merged 1 commit into from
Mar 9, 2021

Conversation

nikhita
Copy link
Member

@nikhita nikhita commented Mar 7, 2021

Ref: kubernetes/org#2222

This document is meant to be used by repos without too much traffic,
if they wish to migrate the default branch from master to main.

/hold
for review

/assign @spiffxp @mrbobbytables @cblecker

@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 Mar 7, 2021
@k8s-ci-robot 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. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 7, 2021
@k8s-ci-robot k8s-ci-robot added area/github-management Issues or PRs related to GitHub Management subproject sig/contributor-experience Categorizes an issue or PR as relevant to SIG Contributor Experience. labels Mar 7, 2021
Copy link
Member

@mrbobbytables mrbobbytables left a comment

Choose a reason for hiding this comment

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

Non-blocking, but a few suggestions and follow up items :)

It may also be worth publishing this on k8s.dev so we can just link people something like: k8s.dev/rename

github-management/default-branch-migration.md Outdated Show resolved Hide resolved
github-management/default-branch-migration.md Outdated Show resolved Hide resolved
github-management/default-branch-migration.md Show resolved Hide resolved
github-management/default-branch-migration.md Show resolved Hide resolved
@nikhita nikhita force-pushed the main-migration-docs-01 branch from fd3deb8 to de33b48 Compare March 7, 2021 13:16
@mrbobbytables mrbobbytables added this to the v1.21 milestone Mar 7, 2021
@spiffxp
Copy link
Member

spiffxp commented Mar 7, 2021

I'll review tomorrow, but I'm also fine if this merges before then; I can open a followup PR if I have specific concerns.

@nikhita
Copy link
Member Author

nikhita commented Mar 8, 2021

I'll review tomorrow, but I'm also fine if this merges before then; I can open a followup PR if I have specific concerns.

@spiffxp I'm good with waiting until you have a chance to review :)

Copy link
Member

@spiffxp spiffxp left a comment

Choose a reason for hiding this comment

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

Huge huge thanks for putting this together. I have a few questions but can't say I feel strongly about blocking on any of them vs refining, except for the "pre-rename" suggestion.

Check if any of the prowjobs (presubmits, postsubmits or periodics)
explicitly mention the `master` branch.

- [ ] If a prowjob triggers on the `master` branch (`branches` field
Copy link
Member

Choose a reason for hiding this comment

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

I'm fine with this as written but still think / hope someone could do this en-masse and save folks the trouble

of the prowjob), add the `main` branch to the list
(see [kubernetes/test-infra#20665] for an example).

- [ ] If a prowjob mentions the `master` branch in `base_ref`,
Copy link
Member

Choose a reason for hiding this comment

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

Same here. I hope to eliminate the necessity of this step with updates to pod utils and bootstrap

Copy link
Member Author

Choose a reason for hiding this comment

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

I hope to eliminate the necessity of this step with updates to pod utils and bootstrap

just for the record, issues tracking updates to:

github-management/default-branch-migration.md Outdated Show resolved Hide resolved
PR status contexts to the new job name but this has not been tested yet.
This _may_ also impact testgrid history post-migration.

- [ ] If a prowjob calls scripts or code in your repo that explicitly
Copy link
Member

Choose a reason for hiding this comment

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

I would prefer seeding this with a few recipes/snippets on how to update scripts to refer to the default branch instead of hard coding and requiring a change in lockstep.

I'll offer some when at a keyboard

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll offer some when at a keyboard

I'm going to leave this to you :)

Copy link
Member

Choose a reason for hiding this comment

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

Since I didn't get these in before your latest round of updates, I'm going to do this as followup

Copy link
Member

Choose a reason for hiding this comment

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

#5619 to track

github-management/default-branch-migration.md Outdated Show resolved Hide resolved
github-management/default-branch-migration.md Outdated Show resolved Hide resolved
github-management/default-branch-migration.md Show resolved Hide resolved
@nikhita nikhita force-pushed the main-migration-docs-01 branch from de33b48 to 521469b Compare March 9, 2021 11:22
This document is meant to be used by repos without too much traffic,
if they wish to migrate the default branch from master to main.
Copy link
Member

@spiffxp spiffxp left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 9, 2021
@spiffxp
Copy link
Member

spiffxp commented Mar 9, 2021

/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 Mar 9, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nikhita, spiffxp

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 merged commit 192188a into kubernetes:master Mar 9, 2021
@nikhita nikhita deleted the main-migration-docs-01 branch March 9, 2021 17:35
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/github-management Issues or PRs related to GitHub Management subproject 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/contributor-experience Categorizes an issue or PR as relevant to SIG Contributor Experience. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants