Skip to content

Commit c1e9400

Browse files
consideRatioconsideRatio
authored
Merge pull request #2217 from manics/master2main
Rename master branch to main
2 parents 4fdc808 + 35bb49f commit c1e9400

32 files changed

+86
-86
lines changed

‎.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
name: Publish
55

6-
# Trigger the workflow's on pushed tags or commits to main/master branch.
6+
# Trigger the workflow on pushed tags or commits to main branch.
77
on:
88
pull_request:
99
paths-ignore:
@@ -60,7 +60,7 @@ jobs:
6060
# any tag
6161
ref.startswith("refs/tags/")
6262
# or default branch
63-
or ref in {"refs/heads/main", "refs/heads/master"}
63+
or ref == "refs/heads/main"
6464
)
6565
):
6666
publishing = "true"

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ tags
4848
# GCloud Credentials
4949
data8-travis-creds.json
5050

51-
#### Python .gitignore from https://github.com/github/gitignore/blob/master/Python.gitignore
51+
#### Python .gitignore from https://github.com/github/gitignore/blob/HEAD/Python.gitignore
5252
####
5353
# Byte-compiled / optimized / DLL files
5454
__pycache__/

‎CHANGELOG.md

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -64,20 +64,20 @@ to share insights that can be useful to others.
6464

6565
#### Notable dependencies updated
6666

67-
| Dependency | Version in 0.10.6 | Version in 0.11.0 | Changelog link | Note |
68-
| -------------------------------------------------------------------------------- | ----------------- | ----------------- | ------------------------------------------------------------------------------------------- | ---------------------------------- |
69-
| [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 |
70-
| [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 |
71-
| [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 |
72-
| [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 |
73-
| [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 |
74-
| [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 |
75-
| [jupyterhub-idle-culler](https://github.com/jupyterhub/jupyterhub-idle-culler) | 1.0 | 1.0 | - | Run in the `hub` pod |
76-
| [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 |
77-
| [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 |
78-
| [kube-scheduler](https://github.com/kubernetes/kube-scheduler) | v1.19.2 | v1.19.7 | - | Run in the `user-scheduler` pod(s) |
79-
80-
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.
67+
| Dependency | Version in 0.10.6 | Version in 0.11.0 | Changelog link | Note |
68+
| -------------------------------------------------------------------------------- | ----------------- | ----------------- | ----------------------------------------------------------------------------------------- | ---------------------------------- |
69+
| [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 |
70+
| [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 |
71+
| [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 |
72+
| [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 |
73+
| [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 |
74+
| [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 |
75+
| [jupyterhub-idle-culler](https://github.com/jupyterhub/jupyterhub-idle-culler) | 1.0 | 1.0 | - | Run in the `hub` pod |
76+
| [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 |
77+
| [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 |
78+
| [kube-scheduler](https://github.com/kubernetes/kube-scheduler) | v1.19.2 | v1.19.7 | - | Run in the `user-scheduler` pod(s) |
79+
80+
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.
8181

8282
#### Enhancements made
8383

@@ -345,21 +345,21 @@ the Helm chart to easier comply with PodSecurityPolicies by default.
345345

346346
#### Notable dependencies updated
347347

348-
| Dependency | Version in previous release | Version in this release | Changelog link | Note |
349-
| -------------------------------------------------------------------------------- | --------------------------- | ----------------------- | ------------------------------------------------------------------------------------------- | ---------------------------------- |
350-
| [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 |
351-
| [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 |
352-
| [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 |
353-
| [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 |
354-
| [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 |
355-
| [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 |
356-
| [jupyterhub-idle-culler](https://github.com/jupyterhub/jupyterhub-idle-culler) | - | v1.0 | - | Run in the `hub` pod |
357-
| [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 |
358-
| [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 |
359-
| [kube-scheduler](https://github.com/kubernetes/kube-scheduler) | v1.13.12 | v1.19.2 | - | Run in the `user-scheduler` pod(s) |
348+
| Dependency | Version in previous release | Version in this release | Changelog link | Note |
349+
| -------------------------------------------------------------------------------- | --------------------------- | ----------------------- | ----------------------------------------------------------------------------------------- | ---------------------------------- |
350+
| [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 |
351+
| [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 |
352+
| [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 |
353+
| [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 |
354+
| [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 |
355+
| [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 |
356+
| [jupyterhub-idle-culler](https://github.com/jupyterhub/jupyterhub-idle-culler) | - | v1.0 | - | Run in the `hub` pod |
357+
| [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 |
358+
| [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 |
359+
| [kube-scheduler](https://github.com/kubernetes/kube-scheduler) | v1.13.12 | v1.19.2 | - | Run in the `user-scheduler` pod(s) |
360360

361361
For a detailed list of how Python dependencies have change in the `hub` Pod's
362-
Docker image, inspect the [images/hub/requirements.txt](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/master/images/hub/requirements.txt) file.
362+
Docker image, inspect the [images/hub/requirements.txt](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/HEAD/images/hub/requirements.txt) file.
363363

364364
#### Enhancements made
365365

@@ -1421,7 +1421,7 @@ done
14211421

14221422
```sh
14231423
# Update helm
1424-
curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash
1424+
curl https://raw.githubusercontent.com/kubernetes/helm/HEAD/scripts/get | bash
14251425

14261426
# Update tiller (on the cluster)
14271427
helm init --upgrade --service-account=tiller
@@ -2267,7 +2267,7 @@ you read through it!
22672267

22682268
#### Autoscaling improvements
22692269

2270-
Some cloud providers support the [kubernetes node autoscaler](https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler),
2270+
Some cloud providers support the [kubernetes node autoscaler](https://github.com/kubernetes/autoscaler/tree/HEAD/cluster-autoscaler),
22712271
which can add / remove nodes depending on how much your
22722272
cluster is being used. In this release, we made a few
22732273
changes to let z2jh interact better with the autoscaler!

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Welcome dear open source colleague! As this is a [Jupyter](https://jupyter.org)
44
project please start by looking at the [Jupyter contributor
55
guide](https://jupyter.readthedocs.io/en/latest/contributing/content-contributor.html),
66
and follow [Project Jupyter's Code of
7-
Conduct](https://github.com/jupyter/governance/blob/master/conduct/code_of_conduct.md)
7+
Conduct](https://github.com/jupyter/governance/blob/HEAD/conduct/code_of_conduct.md)
88
to help us sustain a warm and welcoming collaborative environment.
99

1010
If you don't have [git](https://www.git-scm.com/) already, install it and clone

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[![GitHub](https://img.shields.io/badge/issue_tracking-github-blue?logo=github)](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/issues)
1111
[![Discourse](https://img.shields.io/badge/help_forum-discourse-blue?logo=discourse)](https://discourse.jupyter.org/c/jupyterhub/z2jh-k8s)
1212
[![Gitter](https://img.shields.io/badge/social_chat-gitter-blue?logo=gitter)](https://gitter.im/jupyterhub/jupyterhub)
13-
[![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)
13+
[![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)
1414

1515
This repo contains a _Helm chart_ for JupyterHub and a guide to use it. Together
1616
they allow you to make a JupyterHub available to a very large group of users

‎RELEASE.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ These images version/tags are set in [values.yaml](jupyterhub/values.yaml), cons
3535
- [ ] [kube-scheduler](https://github.com/kubernetes/kube-scheduler)
3636
- [Available image tags](https://gcr.io/google_containers/kube-scheduler-amd64)
3737
- values.yaml entry: `scheduling.userScheduler.image`
38-
- [ ] [kubernetes/pause](https://github.com/kubernetes/kubernetes/tree/master/build/pause)
38+
- [ ] [kubernetes/pause](https://github.com/kubernetes/kubernetes/tree/HEAD/build/pause)
3939
- values.yaml entry: `prePuller.pause.image`
4040

4141
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
6262

6363
- [ ] Create and push a git tag
6464
```bash
65-
git checkout master
66-
git reset --hard <upstream>/master
67-
git tag -a x.y.z-beta.1 -m x.y.z-beta.1 <commit on master>
68-
git push --follow-tags <upstream> master
65+
git checkout main
66+
git reset --hard <upstream>/main
67+
git tag -a x.y.z-beta.1 -m x.y.z-beta.1 <commit on main>
68+
git push --follow-tags <upstream> main
6969
```
7070

7171
- 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
8686
- [ ] Create and push a git tag.
8787

8888
```bash
89-
git checkout master
90-
git reset --hard <upstream>/master
89+
git checkout main
90+
git reset --hard <upstream>/main
9191
git tag -a x.y.z -m x.y.z HEAD
92-
git push --follow-tags <upstream> master
92+
git push --follow-tags <upstream> main
9393
```
9494

9595
- [ ] Create a GitHub release.

‎ci/common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
setup_helm () {
1212
echo "setup helm ${HELM_VERSION}"
13-
curl -sf https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | DESIRED_VERSION=${HELM_VERSION} bash
13+
curl -sf https://raw.githubusercontent.com/helm/helm/HEAD/scripts/get-helm-3 | DESIRED_VERSION=${HELM_VERSION} bash
1414
}
1515

1616
await_pebble() {

‎dev-config-pebble.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This configuration is meant to map lookups of local.jovyan.org to the
22
# ClusterIP of JupyterHub's proxy-public service
33
#
4-
# ref: https://github.com/jupyterhub/pebble-helm-chart/blob/master/pebble/values.yaml
4+
# ref: https://github.com/jupyterhub/pebble-helm-chart/blob/HEAD/pebble/values.yaml
55
#
66
coredns:
77
corefileSegment: |-

0 commit comments

Comments
 (0)