Merge pull request #2217 from manics/master2main

Rename master branch to main
jupyterhub · May 22, 2021 · c1e9400 · c1e9400
2 parents 4fdc808 + 35bb49f
commit c1e9400
Show file tree

Hide file tree

Showing 32 changed files with 86 additions and 86 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -3,7 +3,7 @@
 #
 name: Publish
 
-# Trigger the workflow's on pushed tags or commits to main/master branch.
+# Trigger the workflow on pushed tags or commits to main branch.
 on:
   pull_request:
     paths-ignore:
@@ -60,7 +60,7 @@ jobs:
                   # any tag
                   ref.startswith("refs/tags/")
                   # or default branch
-                  or ref in {"refs/heads/main", "refs/heads/master"}
+                  or ref == "refs/heads/main"
               )
           ):
               publishing = "true"

diff --git a/.gitignore b/.gitignore
@@ -48,7 +48,7 @@ tags
 # GCloud Credentials
 data8-travis-creds.json
 
-#### Python .gitignore from https://github.com/github/gitignore/blob/master/Python.gitignore
+#### Python .gitignore from https://github.com/github/gitignore/blob/HEAD/Python.gitignore
 ####
 # Byte-compiled / optimized / DLL files
 __pycache__/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -64,20 +64,20 @@ to share insights that can be useful to others.
 
 #### Notable dependencies updated
 
-| Dependency                                                                       | Version in 0.10.6 | Version in 0.11.0 | Changelog link                                                                              | Note                               |
-| -------------------------------------------------------------------------------- | ----------------- | ----------------- | ------------------------------------------------------------------------------------------- | ---------------------------------- |
-| [jupyterhub](https://github.com/jupyterhub/jupyterhub)                           | 1.2.2             | 1.3.0             | [Changelog](https://jupyterhub.readthedocs.io/en/stable/changelog.html)                     | Run in the `hub` pod               |
-| [kubespawner](https://github.com/jupyterhub/kubespawner)                         | 0.14.1            | 0.15.0            | [Changelog](https://jupyterhub-kubespawner.readthedocs.io/en/latest/changelog.html)         | Run in the `hub` pod               |
-| [oauthenticator](https://github.com/jupyterhub/oauthenticator)                   | 0.12.1            | 0.12.3            | [Changelog](https://oauthenticator.readthedocs.io/en/latest/changelog.html)                 | Run in the `hub` pod               |
-| [ldapauthenticator](https://github.com/jupyterhub/ldapauthenticator)             | 1.3.2             | 1.3.2             | [Changelog](https://github.com/jupyterhub/ldapauthenticator/blob/master/CHANGELOG.md)       | Run in the `hub` pod               |
-| [ltiauthenticator](https://github.com/jupyterhub/ltiauthenticator)               | 0.4.0             | 1.0.0             | [Changelog](https://github.com/jupyterhub/ltiauthenticator/blob/master/CHANGELOG.md)        | Run in the `hub` pod               |
-| [nativeauthenticator](https://github.com/jupyterhub/nativeauthenticator)         | 0.0.6             | 0.0.6             | [Changelog](https://github.com/jupyterhub/nativeauthenticator/blob/master/CHANGELOG.md)     | Run in the `hub` pod               |
-| [jupyterhub-idle-culler](https://github.com/jupyterhub/jupyterhub-idle-culler)   | 1.0               | 1.0               | -                                                                                           | Run in the `hub` pod               |
-| [configurable-http-proxy](https://github.com/jupyterhub/configurable-http-proxy) | 4.2.2             | 4.2.2             | [Changelog](https://github.com/jupyterhub/configurable-http-proxy/blob/master/CHANGELOG.md) | Run in the `proxy` pod             |
-| [traefik](https://github.com/traefik/traefik)                                    | v2.3.2            | v2.3.7            | [Changelog](https://github.com/traefik/traefik/blob/master/CHANGELOG.md)                    | Run in the `autohttps` pod         |
-| [kube-scheduler](https://github.com/kubernetes/kube-scheduler)                   | v1.19.2           | v1.19.7           | -                                                                                           | Run in the `user-scheduler` pod(s) |
-
-For a detailed list of how Python dependencies have change in the `hub` Pod's Docker image, inspect the [images/hub/requirements.txt](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/master/images/hub/requirements.txt) file.
+| Dependency                                                                       | Version in 0.10.6 | Version in 0.11.0 | Changelog link                                                                            | Note                               |
+| -------------------------------------------------------------------------------- | ----------------- | ----------------- | ----------------------------------------------------------------------------------------- | ---------------------------------- |
+| [jupyterhub](https://github.com/jupyterhub/jupyterhub)                           | 1.2.2             | 1.3.0             | [Changelog](https://jupyterhub.readthedocs.io/en/stable/changelog.html)                   | Run in the `hub` pod               |
+| [kubespawner](https://github.com/jupyterhub/kubespawner)                         | 0.14.1            | 0.15.0            | [Changelog](https://jupyterhub-kubespawner.readthedocs.io/en/latest/changelog.html)       | Run in the `hub` pod               |
+| [oauthenticator](https://github.com/jupyterhub/oauthenticator)                   | 0.12.1            | 0.12.3            | [Changelog](https://oauthenticator.readthedocs.io/en/latest/changelog.html)               | Run in the `hub` pod               |
+| [ldapauthenticator](https://github.com/jupyterhub/ldapauthenticator)             | 1.3.2             | 1.3.2             | [Changelog](https://github.com/jupyterhub/ldapauthenticator/blob/HEAD/CHANGELOG.md)       | Run in the `hub` pod               |
+| [ltiauthenticator](https://github.com/jupyterhub/ltiauthenticator)               | 0.4.0             | 1.0.0             | [Changelog](https://github.com/jupyterhub/ltiauthenticator/blob/HEAD/CHANGELOG.md)        | Run in the `hub` pod               |
+| [nativeauthenticator](https://github.com/jupyterhub/nativeauthenticator)         | 0.0.6             | 0.0.6             | [Changelog](https://github.com/jupyterhub/nativeauthenticator/blob/HEAD/CHANGELOG.md)     | Run in the `hub` pod               |
+| [jupyterhub-idle-culler](https://github.com/jupyterhub/jupyterhub-idle-culler)   | 1.0               | 1.0               | -                                                                                         | Run in the `hub` pod               |
+| [configurable-http-proxy](https://github.com/jupyterhub/configurable-http-proxy) | 4.2.2             | 4.2.2             | [Changelog](https://github.com/jupyterhub/configurable-http-proxy/blob/HEAD/CHANGELOG.md) | Run in the `proxy` pod             |
+| [traefik](https://github.com/traefik/traefik)                                    | v2.3.2            | v2.3.7            | [Changelog](https://github.com/traefik/traefik/blob/HEAD/CHANGELOG.md)                    | Run in the `autohttps` pod         |
+| [kube-scheduler](https://github.com/kubernetes/kube-scheduler)                   | v1.19.2           | v1.19.7           | -                                                                                         | Run in the `user-scheduler` pod(s) |
+
+For a detailed list of how Python dependencies have change in the `hub` Pod's Docker image, inspect the [images/hub/requirements.txt](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/HEAD/images/hub/requirements.txt) file.
 
 #### Enhancements made
 
@@ -345,21 +345,21 @@ the Helm chart to easier comply with PodSecurityPolicies by default.
 
 #### Notable dependencies updated
 
-| Dependency                                                                       | Version in previous release | Version in this release | Changelog link                                                                              | Note                               |
-| -------------------------------------------------------------------------------- | --------------------------- | ----------------------- | ------------------------------------------------------------------------------------------- | ---------------------------------- |
-| [jupyterhub](https://github.com/jupyterhub/jupyterhub)                           | 1.1.0                       | 1.2.0                   | [Changelog](https://jupyterhub.readthedocs.io/en/stable/changelog.html)                     | Run in the `hub` pod               |
-| [kubespawner](https://github.com/jupyterhub/kubespawner)                         | 0.11.1                      | 0.14.1                  | [Changelog](https://jupyterhub-kubespawner.readthedocs.io/en/latest/changelog.html)         | Run in the `hub` pod               |
-| [oauthenticator](https://github.com/jupyterhub/oauthenticator)                   | 0.11.0                      | 0.12.0                  | [Changelog](https://oauthenticator.readthedocs.io/en/latest/changelog.html)                 | Run in the `hub` pod               |
-| [ldapauthenticator](https://github.com/jupyterhub/ldapauthenticator)             | 1.3.0                       | 1.3.2                   | [Changelog](https://github.com/jupyterhub/ldapauthenticator/blob/master/CHANGELOG.md)       | Run in the `hub` pod               |
-| [ltiauthenticator](https://github.com/jupyterhub/ltiauthenticator)               | 0.4.0                       | 0.4.0                   | [Changelog](https://github.com/jupyterhub/ltiauthenticator/blob/master/CHANGELOG.md)        | Run in the `hub` pod               |
-| [nativeauthenticator](https://github.com/jupyterhub/nativeauthenticator)         | 0.0.5                       | 0.0.5                   | [Changelog](https://github.com/jupyterhub/nativeauthenticator/blob/master/CHANGELOG.md)     | Run in the `hub` pod               |
-| [jupyterhub-idle-culler](https://github.com/jupyterhub/jupyterhub-idle-culler)   | -                           | v1.0                    | -                                                                                           | Run in the `hub` pod               |
-| [configurable-http-proxy](https://github.com/jupyterhub/configurable-http-proxy) | 4.2.1                       | 4.2.2                   | [Changelog](https://github.com/jupyterhub/configurable-http-proxy/blob/master/CHANGELOG.md) | Run in the `proxy` pod             |
-| [traefik](https://github.com/traefik/traefik)                                    | v2.1                        | v2.3.2                  | [Changelog](https://github.com/traefik/traefik/blob/master/CHANGELOG.md)                    | Run in the `autohttps` pod         |
-| [kube-scheduler](https://github.com/kubernetes/kube-scheduler)                   | v1.13.12                    | v1.19.2                 | -                                                                                           | Run in the `user-scheduler` pod(s) |
+| Dependency                                                                       | Version in previous release | Version in this release | Changelog link                                                                            | Note                               |
+| -------------------------------------------------------------------------------- | --------------------------- | ----------------------- | ----------------------------------------------------------------------------------------- | ---------------------------------- |
+| [jupyterhub](https://github.com/jupyterhub/jupyterhub)                           | 1.1.0                       | 1.2.0                   | [Changelog](https://jupyterhub.readthedocs.io/en/stable/changelog.html)                   | Run in the `hub` pod               |
+| [kubespawner](https://github.com/jupyterhub/kubespawner)                         | 0.11.1                      | 0.14.1                  | [Changelog](https://jupyterhub-kubespawner.readthedocs.io/en/latest/changelog.html)       | Run in the `hub` pod               |
+| [oauthenticator](https://github.com/jupyterhub/oauthenticator)                   | 0.11.0                      | 0.12.0                  | [Changelog](https://oauthenticator.readthedocs.io/en/latest/changelog.html)               | Run in the `hub` pod               |
+| [ldapauthenticator](https://github.com/jupyterhub/ldapauthenticator)             | 1.3.0                       | 1.3.2                   | [Changelog](https://github.com/jupyterhub/ldapauthenticator/blob/HEAD/CHANGELOG.md)       | Run in the `hub` pod               |
+| [ltiauthenticator](https://github.com/jupyterhub/ltiauthenticator)               | 0.4.0                       | 0.4.0                   | [Changelog](https://github.com/jupyterhub/ltiauthenticator/blob/HEAD/CHANGELOG.md)        | Run in the `hub` pod               |
+| [nativeauthenticator](https://github.com/jupyterhub/nativeauthenticator)         | 0.0.5                       | 0.0.5                   | [Changelog](https://github.com/jupyterhub/nativeauthenticator/blob/HEAD/CHANGELOG.md)     | Run in the `hub` pod               |
+| [jupyterhub-idle-culler](https://github.com/jupyterhub/jupyterhub-idle-culler)   | -                           | v1.0                    | -                                                                                         | Run in the `hub` pod               |
+| [configurable-http-proxy](https://github.com/jupyterhub/configurable-http-proxy) | 4.2.1                       | 4.2.2                   | [Changelog](https://github.com/jupyterhub/configurable-http-proxy/blob/HEAD/CHANGELOG.md) | Run in the `proxy` pod             |
+| [traefik](https://github.com/traefik/traefik)                                    | v2.1                        | v2.3.2                  | [Changelog](https://github.com/traefik/traefik/blob/HEAD/CHANGELOG.md)                    | Run in the `autohttps` pod         |
+| [kube-scheduler](https://github.com/kubernetes/kube-scheduler)                   | v1.13.12                    | v1.19.2                 | -                                                                                         | Run in the `user-scheduler` pod(s) |
 
 For a detailed list of how Python dependencies have change in the `hub` Pod's
-Docker image, inspect the [images/hub/requirements.txt](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/master/images/hub/requirements.txt) file.
+Docker image, inspect the [images/hub/requirements.txt](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/HEAD/images/hub/requirements.txt) file.
 
 #### Enhancements made
 
@@ -1421,7 +1421,7 @@ done
 
 ```sh
 # Update helm
-curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash
+curl https://raw.githubusercontent.com/kubernetes/helm/HEAD/scripts/get | bash
 
 # Update tiller (on the cluster)
 helm init --upgrade --service-account=tiller
@@ -2267,7 +2267,7 @@ you read through it!
 
 #### Autoscaling improvements
 
-Some cloud providers support the [kubernetes node autoscaler](https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler),
+Some cloud providers support the [kubernetes node autoscaler](https://github.com/kubernetes/autoscaler/tree/HEAD/cluster-autoscaler),
 which can add / remove nodes depending on how much your
 cluster is being used. In this release, we made a few
 changes to let z2jh interact better with the autoscaler!

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -4,7 +4,7 @@ Welcome dear open source colleague! As this is a [Jupyter](https://jupyter.org)
 project please start by looking at the [Jupyter contributor
 guide](https://jupyter.readthedocs.io/en/latest/contributing/content-contributor.html),
 and follow [Project Jupyter's Code of
-Conduct](https://github.com/jupyter/governance/blob/master/conduct/code_of_conduct.md)
+Conduct](https://github.com/jupyter/governance/blob/HEAD/conduct/code_of_conduct.md)
 to help us sustain a warm and welcoming collaborative environment.
 
 If you don't have [git](https://www.git-scm.com/) already, install it and clone

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 [![GitHub](https://img.shields.io/badge/issue_tracking-github-blue?logo=github)](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/issues)
 [![Discourse](https://img.shields.io/badge/help_forum-discourse-blue?logo=discourse)](https://discourse.jupyter.org/c/jupyterhub/z2jh-k8s)
 [![Gitter](https://img.shields.io/badge/social_chat-gitter-blue?logo=gitter)](https://gitter.im/jupyterhub/jupyterhub)
-[![Contribute](https://img.shields.io/badge/I_want_to_contribute!-grey?logo=jupyter)](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/master/CONTRIBUTING.md)
+[![Contribute](https://img.shields.io/badge/I_want_to_contribute!-grey?logo=jupyter)](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/HEAD/CONTRIBUTING.md)
 
 This repo contains a _Helm chart_ for JupyterHub and a guide to use it. Together
 they allow you to make a JupyterHub available to a very large group of users

diff --git a/RELEASE.md b/RELEASE.md
@@ -35,7 +35,7 @@ These images version/tags are set in [values.yaml](jupyterhub/values.yaml), cons
 - [ ] [kube-scheduler](https://github.com/kubernetes/kube-scheduler)
   - [Available image tags](https://gcr.io/google_containers/kube-scheduler-amd64)
   - values.yaml entry: `scheduling.userScheduler.image`
-- [ ] [kubernetes/pause](https://github.com/kubernetes/kubernetes/tree/master/build/pause)
+- [ ] [kubernetes/pause](https://github.com/kubernetes/kubernetes/tree/HEAD/build/pause)
   - values.yaml entry: `prePuller.pause.image`
 
 Also the images we build are based on some image specified in the `FROM` statement, consider if we want to bump those versions as well.
@@ -62,10 +62,10 @@ Also the images we build are based on some image specified in the `FROM` stateme
 
   - [ ] Create and push a git tag
     ```bash
-    git checkout master
-    git reset --hard <upstream>/master
-    git tag -a x.y.z-beta.1 -m x.y.z-beta.1 <commit on master>
-    git push --follow-tags <upstream> master
+    git checkout main
+    git reset --hard <upstream>/main
+    git tag -a x.y.z-beta.1 -m x.y.z-beta.1 <commit on main>
+    git push --follow-tags <upstream> main
     ```
 
 - Announce the x.y.z-beta.1 release
@@ -86,10 +86,10 @@ Also the images we build are based on some image specified in the `FROM` stateme
   - [ ] Create and push a git tag.
 
     ```bash
-    git checkout master
-    git reset --hard <upstream>/master
+    git checkout main
+    git reset --hard <upstream>/main
     git tag -a x.y.z -m x.y.z HEAD
-    git push --follow-tags <upstream> master
+    git push --follow-tags <upstream> main
     ```
 
   - [ ] Create a GitHub release.

diff --git a/ci/common b/ci/common
@@ -10,7 +10,7 @@
 
 setup_helm () {
     echo "setup helm ${HELM_VERSION}"
-    curl -sf https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | DESIRED_VERSION=${HELM_VERSION} bash
+    curl -sf https://raw.githubusercontent.com/helm/helm/HEAD/scripts/get-helm-3 | DESIRED_VERSION=${HELM_VERSION} bash
 }
 
 await_pebble() {

diff --git a/dev-config-pebble.yaml b/dev-config-pebble.yaml
@@ -1,7 +1,7 @@
 # This configuration is meant to map lookups of local.jovyan.org to the
 # ClusterIP of JupyterHub's proxy-public service
 #
-# ref: https://github.com/jupyterhub/pebble-helm-chart/blob/master/pebble/values.yaml
+# ref: https://github.com/jupyterhub/pebble-helm-chart/blob/HEAD/pebble/values.yaml
 #
 coredns:
   corefileSegment: |-