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

rename the default branch to "main" #2589

Closed
5 of 6 tasks
neolit123 opened this issue Oct 12, 2021 · 9 comments
Closed
5 of 6 tasks

rename the default branch to "main" #2589

neolit123 opened this issue Oct 12, 2021 · 9 comments
Labels
kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lifecycle/active Indicates that an issue or PR is actively being worked on by a contributor. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. wg/naming Categorizes an issue or PR as relevant to WG Naming.

Comments

@neolit123
Copy link
Member

neolit123 commented Oct 12, 2021

the k8s project is following the new rules of inclusive naming and the default branch of repositories should be renamed from "master" to "main".

steps for repos are outline here:
https://www.kubernetes.dev/resources/rename/

the kubeadm repository surface exposure is fairly limited, since it does not have any importable parts (we assume...at least).

things we have to do as well:

@neolit123 neolit123 added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. wg/naming Categorizes an issue or PR as relevant to WG Naming. labels Oct 12, 2021
@neolit123 neolit123 added this to the v1.23 milestone Oct 12, 2021
@RA489
Copy link
Contributor

RA489 commented Oct 18, 2021

/cc

@neolit123 neolit123 added the lifecycle/active Indicates that an issue or PR is actively being worked on by a contributor. label Oct 18, 2021
@neolit123
Copy link
Member Author

adding myself as admin here to be able to perform the rename:
kubernetes/org#3056

People with write permissions to a repository can rename a branch in the repository. People with admin permissions can rename the default branch.

https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/renaming-a-branch

@neolit123
Copy link
Member Author

neolit123 commented Oct 26, 2021

searching at https://cs.k8s.io/ for kubeadm master branch refs, i cannot seem to find anything else active / not out-of-date.
we have a few outdated design / docs blog posts that are probably not going to be updated to use main regardless.

i think this is good to go.

use this to update your local k/kubeadm clone:

$ git branch -m master main
$ git fetch origin
$ git branch -u origin/main main
$ git remote set-head origin -a

https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/renaming-a-branch#updating-a-local-clone-after-a-branch-name-changes

@neolit123
Copy link
Member Author

neolit123 commented Oct 26, 2021

@kubernetes/owners
hello, we updated tests/docs, renamed the actual branch and notified the SIG ML.
is there anything else that has to be done on your side?

note: the guide here https://www.kubernetes.dev/resources/rename/ says to ping the github team.

EDIT: *.k8s.io/foo might need an update to use main when appropriate - e.g. notice the blue text on top when opening repos that already moved to main:
https://git.k8s.io/kubeadm/OWNERS
https://sigs.k8s.io/cluster-api/OWNERS
^ likely because it uses master and then github redirects to main.

@nikhita
Copy link
Member

nikhita commented Oct 27, 2021

@kubernetes/owners
hello, we updated tests/docs, renamed the actual branch and notified the SIG ML.
is there anything else that has to be done on your side?

No, everything looks great. Thanks for taking this up!

@nikhita
Copy link
Member

nikhita commented Oct 27, 2021

Probably unrelated to the branch rename...there's a webhook configured for the kubeadm repo (you should be able to view this with admin access). The webhook deliveries are failing. They look unrelated to the branch rename and have been failing for quite sometime. Might be worth considering removing it? I'm not sure what it's about.

Screenshot from 2021-10-27 13-15-08

@shivanshuraj1333
Copy link

@neolit123 do we've any pending tasks here? I'm happy to contribute if there's any :)

@neolit123
Copy link
Member Author

neolit123 commented Oct 27, 2021

Probably unrelated to the branch rename...there's a webhook configured for the kubeadm repo

I suspect this is something that happened circa 2017 where a mac app called Ship accidentally installed its hooks automaticaly on all repositories where an authorized github account has admin access.

I will remove the webhook.

https://news.ycombinator.com/item?id=13495216
https://www.realartists.com/docs/2.0/index.html

@neolit123
Copy link
Member Author

@shivanshu1333
Nope. We can close this issue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lifecycle/active Indicates that an issue or PR is actively being worked on by a contributor. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. wg/naming Categorizes an issue or PR as relevant to WG Naming.
Projects
None yet
Development

No branches or pull requests

4 participants