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

Reinstate Turing in Federation #1752

Merged
merged 5 commits into from
Dec 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,10 @@ jobs:
binder_url: https://gke.mybinder.org
hub_url: https://hub.gke.mybinder.org
helm_version: "v3.3.4"
# - federation_member: turing
# binder_url: https://turing.mybinder.org
# hub_url: https://hub.mybinder.turing.ac.uk
# helm_version: "v3.3.4"
- federation_member: turing
binder_url: https://turing.mybinder.org
hub_url: https://hub.mybinder.turing.ac.uk
helm_version: "v3.3.4"
- federation_member: ovh
binder_url: https://ovh.mybinder.org
hub_url: https://hub-binder.mybinder.ovh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- release: ovh
kube_version: "1.15.7"
- release: turing
kube_version: "1.16.4"
kube_version: "1.18.1"

steps:
- name: Checkout repo
Expand Down
4 changes: 2 additions & 2 deletions config/turing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ letsencrypt:
binderhub:
config:
BinderHub:
pod_quota: 0
pod_quota: 80
hub_url: https://hub.mybinder.turing.ac.uk
badge_base_url: https://mybinder.org
sticky_builds: true
Expand Down Expand Up @@ -121,7 +121,7 @@ prometheus:
ingress-nginx:
controller:
service:
loadBalancerIP: 51.105.120.231
loadBalancerIP: 20.76.57.82


static:
Expand Down
2 changes: 1 addition & 1 deletion mybinder/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,6 @@ federationRedirect:
versions: https://ovh.mybinder.org/versions
turing:
url: https://turing.mybinder.org
weight: 0
weight: 1
health: https://turing.mybinder.org/health
versions: https://turing.mybinder.org/versions