Skip to content

Commit

Permalink
run pre-commit autoformatters
Browse files Browse the repository at this point in the history
  • Loading branch information
minrk committed May 30, 2022
1 parent c7218d1 commit 140cef5
Show file tree
Hide file tree
Showing 61 changed files with 908 additions and 892 deletions.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/repo_check.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
name: "\U00002705 Repo Check"
about: "If you're concerned if your repository is acceptable for mybinder.org, we can check your repo"
labels: question

---

<!--
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/request_resources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,3 @@ body:
description: Anything else you'd like to tell us?
validations:
required: false

5 changes: 2 additions & 3 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@ jobs:
((github.event_name == 'push') && (github.ref == 'refs/heads/master')) ||
((github.event_name == 'push') && contains(github.ref, 'test-this-pr'))
runs-on: ubuntu-20.04

strategy:
fail-fast: false # Do not cancel all jobs if one fails
fail-fast: false # Do not cancel all jobs if one fails
matrix:
include:
# Now we have only one staging environment, but we have had two when
Expand Down Expand Up @@ -188,7 +187,7 @@ jobs:
# We run this job multiple times with different parameters
# - https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstrategy
strategy:
fail-fast: false # Do not cancel all jobs if one fails
fail-fast: false # Do not cancel all jobs if one fails
matrix:
include:
- federation_member: prod
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/watch-dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ jobs:
- Source code: ${{ matrix.source_url }}
- Changelog: ${{ matrix.changelog_url }}
update-chart-dependencies:
# Don't schedule runs on forks, but allow the job to execute on push and
# workflow_dispatch for CI development purposes.
Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,27 @@ Instead, you should review the [BinderHub documentation][] and the
[Site Reliability Guide](https://mybinder-sre.readthedocs.io/en/latest/index.html), the collected wisdom of operating mybinder.org.

Amongst other things the guide contains:

- [How to do a deployment](https://mybinder-sre.readthedocs.io/en/latest/deployment/how.html)
- [What happens during a deployment?](https://mybinder-sre.readthedocs.io/en/latest/deployment/what.html)
- [Incident reports for past incidents](https://mybinder-sre.readthedocs.io/en/latest/incident-reports/incident_reports_toc.html)
- [Incident report template](https://github.com/jupyterhub/mybinder.org-deploy/blob/master/docs/source/incident-reports/template-incident-report.md)

## Key Links

| | Staging | Production |
| ----------- | ------- | ---------- |
| Site |[staging.mybinder.org](https://staging.mybinder.org) | [mybinder.org](https://mybinder.org) |
| CI Deployment | [![Continuous Deployment](https://github.com/jupyterhub/mybinder.org-deploy/workflows/Continuous%20Deployment/badge.svg)](https://github.com/jupyterhub/mybinder.org-deploy/actions?query=workflow%3A%22Continuous+Deployment%22) (both) |
| Deployment checklist | staging | prod |
| Monitoring | staging | [prod](https://grafana.mybinder.org/dashboard/db/kubernetes-cluster-monitoring-binder-prod?refresh=60s&orgId=1) |

| Helm chart | dev | stable |
|-------------|-----|--------|
| JupyterHub | [dev](https://jupyterhub.github.io/helm-chart/#development-releases-jupyterhub) | [stable](https://jupyterhub.github.io/helm-chart/#stable-releases) |
| BinderHub | [dev](https://jupyterhub.github.io/helm-chart/#development-releases-binderhub)| - |
| | Staging | Production |
| -------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------- |
| Site | [staging.mybinder.org](https://staging.mybinder.org) | [mybinder.org](https://mybinder.org) |
| CI Deployment | [![Continuous Deployment](https://github.com/jupyterhub/mybinder.org-deploy/workflows/Continuous%20Deployment/badge.svg)](https://github.com/jupyterhub/mybinder.org-deploy/actions?query=workflow%3A%22Continuous+Deployment%22) (both) |
| Deployment checklist | staging | prod |
| Monitoring | staging | [prod](https://grafana.mybinder.org/dashboard/db/kubernetes-cluster-monitoring-binder-prod?refresh=60s&orgId=1) |

| Helm chart | dev | stable |
| ---------- | ------------------------------------------------------------------------------- | ------------------------------------------------------------------ |
| JupyterHub | [dev](https://jupyterhub.github.io/helm-chart/#development-releases-jupyterhub) | [stable](https://jupyterhub.github.io/helm-chart/#stable-releases) |
| BinderHub | [dev](https://jupyterhub.github.io/helm-chart/#development-releases-binderhub) | - |

[mybinder.org]: https://mybinder.org
[staging.mybinder.org]: https://staging.mybinder.org
[`jupyterhub/binderhub`]: https://github.com/jupyterhub/binderhub
[BinderHub documentation]: https://binderhub.readthedocs.io/en/latest/
[binderhub documentation]: https://binderhub.readthedocs.io/en/latest/
4 changes: 2 additions & 2 deletions WISDOM.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# A place to put the collective wisdom of the Binder project.

* When you are in an outage, focus only on fixing the outage - do not try to do anything else.
* Prefer minor annoyances happening infrequently but at regular intervals, rather than major annoyances happening rarely but at unpredictable intervals.
- When you are in an outage, focus only on fixing the outage - do not try to do anything else.
- Prefer minor annoyances happening infrequently but at regular intervals, rather than major annoyances happening rarely but at unpredictable intervals.
14 changes: 6 additions & 8 deletions config/ovh.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ binderhub:
type: manual
annotations:
kubernetes.io/ingress.class: nginx
kubernetes.io/tls-acme: 'false'
kubernetes.io/tls-acme: "false"
hosts:
- binder.mybinder.ovh
tls:
Expand All @@ -58,7 +58,7 @@ binderhub:
ingress:
annotations:
kubernetes.io/ingress.class: nginx
kubernetes.io/tls-acme: 'false'
kubernetes.io/tls-acme: "false"
hosts:
- hub-binder.mybinder.ovh
tls:
Expand Down Expand Up @@ -95,7 +95,7 @@ grafana:
ingress:
annotations:
kubernetes.io/ingress.class: nginx
kubernetes.io/tls-acme: 'false'
kubernetes.io/tls-acme: "false"
hosts:
- grafana-mybinder.mybinder.ovh
tls:
Expand Down Expand Up @@ -124,15 +124,14 @@ prometheus:
ingress:
annotations:
kubernetes.io/ingress.class: nginx
kubernetes.io/tls-acme: 'false'
kubernetes.io/tls-acme: "false"
hosts:
- prometheus-mybinder.mybinder.ovh
tls:
- hosts:
- prometheus-mybinder.mybinder.ovh
secretName: tls-crt


ingress-nginx:
controller:
hostNetwork: true
Expand All @@ -143,12 +142,11 @@ ingress-nginx:
scope:
enabled: false


static:
ingress:
annotations:
kubernetes.io/ingress.class: nginx
kubernetes.io/tls-acme: 'false'
kubernetes.io/tls-acme: "false"
hosts:
- static-mybinder.mybinder.ovh
tls:
Expand All @@ -158,7 +156,7 @@ redirector:
ingress:
annotations:
kubernetes.io/ingress.class: nginx
kubernetes.io/tls-acme: 'false'
kubernetes.io/tls-acme: "false"
tls:
secretName: tls-crt
redirects:
Expand Down
1 change: 0 additions & 1 deletion config/prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ binderhub:
userScheduler:
nodeSelector: *coreNodeSelector


grafana:
nodeSelector: *coreNodeSelector
resources:
Expand Down
5 changes: 2 additions & 3 deletions config/turing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ grafana:
ingress:
annotations:
kubernetes.io/ingress.class: nginx
kubernetes.io/tls-acme: 'true'
kubernetes.io/tls-acme: "true"
hosts:
- grafana.mybinder.turing.ac.uk
tls:
Expand All @@ -103,7 +103,7 @@ prometheus:
ingress:
annotations:
kubernetes.io/ingress.class: nginx
kubernetes.io/tls-acme: 'true'
kubernetes.io/tls-acme: "true"
hosts:
- prometheus.mybinder.turing.ac.uk
- prometheus.turing.mybinder.org
Expand All @@ -122,7 +122,6 @@ ingress-nginx:
scope:
enabled: true


static:
ingress:
hosts:
Expand Down
Loading

0 comments on commit 140cef5

Please sign in to comment.