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 master branch to main #2217

Merged
merged 7 commits into from
May 22, 2021
Merged

Conversation

manics
Copy link
Member

@manics manics commented May 21, 2021

This is a copy of the workflow from jupyterhub/jupyterhub#3462

  • Replaced master with HEAD in GitHub URLs, which seems to automatically resolve to the default branch
  • Replaced a few other mentions of master where it refers to a git branch

Actions to take, in order:

  • approve this PR
  • rename the default branch to main in GitHub repo settings
  • merge this PR
  • check the publish workflow published the expected outputs

Remaining mentions of master:

$ git grep master

CHANGELOG.md:- CI: fix RTD builds on push to master [#1816](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/1816) ([@consideRatio](https://github.com/consideRatio))
CHANGELOG.md:- CI: always publish helm chart on push to master [#1765](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/1765) ([@consideRatio](https://github.com/consideRatio))
CONTRIBUTING.md:subprocess.CalledProcessError: Command '['docker', 'build', '-t', 'jupyterhub/k8s-hub:0.9-217f798', 'images/hub', '--build-arg', 'JUPYTERHUB_VERSION=git+https://github.com/jupyterhub/jupyterhub@master']' returned non-zero exit status 100.
doc/source/conf.py:# Configuration reference: https://www.sphinx-doc.org/en/master/usage/configuration.html
doc/source/conf.py:# ref: https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
doc/source/conf.py:# ref: https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
doc/source/conf.py:# The master toctree document.
doc/source/conf.py:master_doc = "index"
doc/source/conf.py:# ref: http://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-the-linkcheck-builder
doc/source/conf.py:# ref: http://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
doc/source/jupyterhub/customizing/user-environment.md:            "master",
doc/source/jupyterhub/customizing/user-environment.md:This will synchronize the master branch of the repository to a folder called
doc/source/jupyterhub/customizing/user-environment.md:                  gitpuller https://github.com/data-8/materials-fa17 master materials-fa;
doc/source/kubernetes/amazon/efs_storage.md:   Next, create a new security group for NFS traffic (target other instances in that group). Add a rule for incoming NFS traffic to the node security group and to the master security group. Change the EFS volume to use that security group.
doc/source/kubernetes/amazon/efs_storage.md:   To verify that your EFS volume is working correctly, ssh into one of the master nodes and su to root. Next,
doc/source/kubernetes/amazon/step-zero-aws-eks.md:   This is necessary for the workers to find the master plane.
doc/source/kubernetes/amazon/step-zero-aws.md:    --master-size t2.micro \
doc/source/kubernetes/amazon/step-zero-aws.md:    --master-volume-size 10 \
doc/source/kubernetes/amazon/step-zero-aws.md:    This creates a cluster where all of the masters and nodes are in private subnets and don't have external IP addresses. A mis-configured security group or insecure ssh configuration is less likely to compromise the cluster.
doc/source/kubernetes/amazon/step-zero-aws.md:    --master-count
doc/source/kubernetes/amazon/step-zero-aws.md:      Spawns more masters in one or more VPCs
doc/source/kubernetes/amazon/step-zero-aws.md:    --master-zones
doc/source/kubernetes/amazon/step-zero-aws.md:      specify zones to run the master in
doc/source/kubernetes/amazon/step-zero-aws.md:    --master/node-security-groups
doc/source/kubernetes/amazon/step-zero-aws.md:      Allows you to specify additional security groups to put the masters and nodes in by default
doc/source/kubernetes/setup-helm2.md:curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash
doc/source/resources/glossary.md:      also referred to as the master, will answer questions and update the
images/image-awaiter/main.go:	flag.StringVar(&caPath, "ca-path", "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt", "Path to CA bundle used to verify kubernetes master")
  • CHANGELOG.md uses master in some historical PR descriptions
  • CONTRIBUTING.md has master in some old log output
  • doc/source/kubernetes/setup-helm2.md is removed in Remove setup-helm2.md #2216
  • doc/source/jupyterhub/customizing/user-environment.md uses master in a gitpuller command
  • The rest are unrelated to git branch names

Avoids problems if someone accidentally pushes a new master branch
@consideRatio
Copy link
Member

Nice work let's get this done! I'll do review tonight/tomorrow. If this LGTM, can i go ahead and follow the steps you outlined or should i wait a bit?

@manics
Copy link
Member Author

manics commented May 22, 2021

It should be good to go (unless I've missed something) 😀

@consideRatio consideRatio merged commit c1e9400 into jupyterhub:master May 22, 2021
@consideRatio
Copy link
Member

consideRatio commented May 22, 2021

All steps done.

  • should we delete the master branch like in jupyterhub?
    • I deleted the master branch. All PRs referencing it closed automatically, and it seems from this response that it is not possible to change the target branch of a created PR (unless it's between branches in the same repo). So all PRs needs to be recreated =/
    • I marked all PRs that were closed with a label named master-branch-renamed-to-main.
    • I added the master branch back for now and pressed reopen on a few PRs

@consideRatio
Copy link
Member

Thanks @manics for your maintenance work ❤️❤️❤️

consideRatio pushed a commit to jupyterhub/helm-chart that referenced this pull request May 22, 2021
@manics
Copy link
Member Author

manics commented May 22, 2021

Oh, I should've said rename the master branch to main (which will automatically update all PRs) instead of creating a new branch. If there's no changes between master/main might be worth deleting main and renaming master?

@manics manics deleted the master2main branch May 22, 2021 20:45
@consideRatio
Copy link
Member

@manics ah absolutely! can you go ahead and do some magic?

@manics
Copy link
Member Author

manics commented May 22, 2021

I don't have permission to change the default branch back to master (though it looks like I've got permission to rename branches)

@consideRatio
Copy link
Member

@manics I invited you to be an admin for this repo where I'm an admin already

@manics
Copy link
Member Author

manics commented May 22, 2021

Thanks, done! I've left the temporary main branch as main-to-be-deleted in case you had anything dependent on it, otherwise you can delete it.

@consideRatio
Copy link
Member

@manics 🎉 wieee nice - main-to-be-deleted branch deleted

@consideRatio
Copy link
Member

@manics can you updated you checkpoint list with the branch rename step you did so I can use this as a reference for other repos in the org later?

@manics
Copy link
Member Author

manics commented May 23, 2021

I opened a new team-compass issue instead: jupyterhub/team-compass#412

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

Successfully merging this pull request may close these issues.

2 participants