From 4575b53345712b4954ae10a2c82dd4192482c4b7 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Wed, 9 Dec 2020 16:17:11 +0000 Subject: [PATCH 1/5] Update ingress controller IP address --- config/turing.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/turing.yaml b/config/turing.yaml index 0fab3f837..56269595c 100644 --- a/config/turing.yaml +++ b/config/turing.yaml @@ -121,7 +121,7 @@ prometheus: ingress-nginx: controller: service: - loadBalancerIP: 51.105.120.231 + loadBalancerIP: 20.76.57.82 static: From dad855aed87c29191e3e6d3033ec2a34810b78dd Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Wed, 9 Dec 2020 16:17:25 +0000 Subject: [PATCH 2/5] Set pod quota to 80 --- config/turing.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/turing.yaml b/config/turing.yaml index 56269595c..ce0e35e1a 100644 --- a/config/turing.yaml +++ b/config/turing.yaml @@ -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 From 7cf71947e3d4dbdad8a292b883d6f928c9d9fd77 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Wed, 9 Dec 2020 16:17:50 +0000 Subject: [PATCH 3/5] Reinstate health checks for Turing --- mybinder/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mybinder/values.yaml b/mybinder/values.yaml index 971b403ac..952ad3388 100644 --- a/mybinder/values.yaml +++ b/mybinder/values.yaml @@ -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 From 36b921524bedd32d7798bb5cc4ef47c254b2c871 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Wed, 9 Dec 2020 16:18:12 +0000 Subject: [PATCH 4/5] Reinstate Turing in CD --- .github/workflows/cd.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index af7158eb5..15cff076b 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -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 From 148126ff4f7d94c23c326d67f36b628995f5c0ee Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Wed, 9 Dec 2020 16:32:34 +0000 Subject: [PATCH 5/5] Update k8s version for schema in lint-validate.yml --- .github/workflows/lint-validate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-validate.yml b/.github/workflows/lint-validate.yml index ccce60a76..5eebc1a22 100644 --- a/.github/workflows/lint-validate.yml +++ b/.github/workflows/lint-validate.yml @@ -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