-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
tracking: switch default branch to main #2120
Comments
went through the current checklist, discussing some feedback in slack here: https://kubernetes.slack.com/archives/C1TU9EB9S/p1615487742145000 |
will follow up further next week (I am unavailable friday, and it seems best to not try to switch this on a friday anyhow) |
Went through the checklist. We need to send the mailinglist notice, and we'll need help from GitHub management to update Netlify. The rest should be fine. Will aim to do this Tomorrow. |
|
/approve 👍 |
/assign @kubernetes/owners |
Ah right. Different org |
This is one of the things I have in kubernetes/community#5636, that's not possible. |
Cleaned up references in #2137. After merge we can see https://kind.sigs.k8s.io/ is at b30f419 so the netlify settings worked as well. |
Left some more feedback kubernetes/community#5636 (comment) And updated the mailinglist. This is done. Thanks all. |
see: https://k8s.dev/rename, kubernetes/org#2222
Checklist below added from kubernetes/community@198374d
Prerequisites
Ensure that your repo has low PR volume (<20 open PRs) and
less number of periodic jobs. The branch rename will re-trigger
prow on all open PRs, which will cause a huge spike in the CI load.
Create an issue in your repo to track the branch rename.
You can paste this checklist in the issue body.
If you are not a root approver for the repo, assign a root
approver for approval.
Once the issue has been approved, send a notice to your SIG's
mailing list about the potential branch rename.
Changes pre-rename
Make the following changes before renaming the branch the
master
branch.Note: There might be additional changes required that have not been
covered in this checklist.
Anytime
These changes are non-disruptive and can be made anytime before
renaming the branch.
If a prowjob triggers on the
master
branch (branches
fieldof the prowjob), add the
main
branch to the list(see [prep kubernetes/org jobs for default branch rename kubernetes/test-infra#20665] for an example).
If the [
milestone_applier
] prow config references themaster
branch,add the
main
branch to the config (see [Prep kubernetes/k8s.io for default branch rename kubernetes/test-infra#20675] for an example).If the [
branch_protection
] prow config references themaster
branch,add the
main
branch to the config.Just before rename
These changes are disruptive and should be made just before
renaming the branch.
If a prowjob mentions the
master
branch inbase_ref
,update it to the
main
branch. For a periodic job, ensure thatthe branch is renamed between periodic job runs.
If a prowjob mentions
master
in its name, rename the job toto not include the branch name. [
status-reconciler
] should automaticallymigrate the PR status contexts to the new job name but this has not been tested yet.
The job with the new name will also appear as a different job in Testgrid.
If a prowjob calls scripts or code in your repo that explicitly
reference
master
, update all references to usemain
.If the repo has netlify configured for it, ask a member of the GitHub
Management Team to rename the
master
branch tomain
in the netlify site config.It can't be controlled through the netlify config in the repo.
Approval
have been identified, assign the GitHub Management team ([@kubernetes/owners])
for approval.
Rename the default branch
master
tomain
using the GitHub UIby following the [official instructions].
Changes post-rename
After the default branch has been renamed to
main
, make the followingchanges.
Note: There might be additional changes required that have not been
covered in this checklist.
Prowjobs
master
branch in thebranches
field,remove the
master
branch (see [Update kubernetes/org job configs post default-branch-rename kubernetes/test-infra#20669] for an example).Prow config
If the [
milestone_applier
] prow config references themaster
branch,remove it from the config.
If the [
branch_protection
] prow config references themaster
branch,remove it from the config.
Other
If any docs reference the
master
branch, update tomain
(URLs will be automatically redirected).
Ensure that CI and PR tests work fine.
Trial the local development experience with a pre-rename clone.
Send a notice about the branch rename to your SIG's mailing list.
Include the link to the [GitHub instructions to rename your local branch].
/assign
The text was updated successfully, but these errors were encountered: