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

Remove 'ephemeral hub' type #361

Merged
merged 1 commit into from
Apr 27, 2021
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
1 change: 0 additions & 1 deletion .github/actions/deploy/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ runs:
cd hub-templates
helm dep up base-hub
helm dep up daskhub
helm dep up ephemeral-hub
shell: bash
- name: Setup gcloud auth for docker
# FIXME: Add more auth providers & registries here as needed
Expand Down
54 changes: 0 additions & 54 deletions config/hubs/2i2c.cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,34 +83,6 @@ hubs:
- [email protected]
- [email protected]
admin_users: *dask_staging_users
- name: ephemeral
domain: ephemeral.pilot.2i2c.cloud
template: ephemeral-hub
auth0:
enabled: false
config:
base-hub:
jupyterhub:
homepage:
templateVars:
org:
name: 2i2c Staging
url: https://2i2c.org
logo_url: https://2i2c.org/media/logo.png
designed_by:
name: 2i2c
url: https://2i2c.org
operated_by:
name: 2i2c
url: https://2i2c.org
funded_by:
name: 2i2c
url: https://2i2c.org
hub:
# No more than 5 active servers at any given time
activeServerLimit: 5
singleuser:
events: false
- name: justiceinnovationlab
domain: justiceinnovationlab.pilot.2i2c.cloud
template: base-hub
Expand Down Expand Up @@ -210,32 +182,6 @@ hubs:
- [email protected]
- [email protected]
admin_users: *wur_users
- name: callysto
domain: callysto.pilot.2i2c.cloud
template: ephemeral-hub
auth0:
enabled: false
config:
base-hub:
jupyterhub:
homepage:
templateVars:
org:
name: Callysto Canada
logo_url: https://callysto.ca/wp-content/uploads/2018/03/header-logo1.png
url: https://callysto.ca/
designed_by:
name: 2i2c
url: https://2i2c.org
operated_by:
name: 2i2c
url: https://2i2c.org
funded_by:
name: JROST & IOI
url: https://investinopen.org/blog/jrost-rapid-response-fund-awardees
hub:
# No more than 15 active servers at any given time
activeServerLimit: 15
- name: peddie
domain: peddie.pilot.2i2c.cloud
template: base-hub
Expand Down
1 change: 0 additions & 1 deletion config/hubs/schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ properties:
enum:
- base-hub
- daskhub
- ephemeral-hub
auth0:
additionalProperties: false
type: object
Expand Down
17 changes: 2 additions & 15 deletions docs/topic/hub-templates.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,6 @@ Currently there are three hub templates available:
It provides a base JupyterHub, user storage and culling configuration that satisfies most of the
pilot hubs usage requirements.

- `ephemeral-hub`

The **ephemeral-hub template** helps deploying temporary, transient binder-style hubs.
- Doesn't require any user authentication.
- Permits limiting of resources:
* memory / CPU limits
* maximum number of concurrent user servers
- Has more aggressive culling:
- Stops server after 30min of idleness
- Desn't let servers run for more than 8h
- Has no persistent storage
- Doesn't use or configures a home page template

- `daskhub`

The **daskhub template** helps deploying dask-enabled hubs.
Expand All @@ -46,14 +33,14 @@ the hub domain, how the JupyterHub landing page will look like and authenticatio
Because the templates are structured in a **hierarchical** model, so are their helm charts.
The [jupyterhub helm chart](https://jupyterhub.github.io/helm-chart/) is a subchart of the base-hub and
the base-hub chart along with the [dask-gateway](https://dask.org/dask-gateway-helm-repo/) one are
subcharts of the daskhub. The ephemeral-hub chart also subcharts the base-hub.
subcharts of the daskhub.

**Visual of the helm-chart hierarchy:**
```{figure} ../images/helm-charts-hierarchy.png
```
% The editable version of the diagram is here: https://docs.google.com/presentation/d/1KMyrTd3wdR715tPGuzIHkHqScXBlLpeiksIM2x7EI0g/edit?usp=sharing

This hierachy is the reason why when adding a new hub using the `daskhub` or the `ephemeral-hub` template, the jupyterhub
This hierachy is the reason why when adding a new hub using the `daskhub`
specific configuration under `config/hubs` needs to be nested under a `base-hub` key, indicating that we are overriding configuration
from the *base-hub/jupyterhub* parent chart.

Expand Down
21 changes: 0 additions & 21 deletions hub-templates/ephemeral-hub/.helmignore

This file was deleted.

10 changes: 0 additions & 10 deletions hub-templates/ephemeral-hub/Chart.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions hub-templates/ephemeral-hub/requirements.lock

This file was deleted.

41 changes: 0 additions & 41 deletions hub-templates/ephemeral-hub/values.yaml

This file was deleted.