Skip to content

Commit

Permalink
Merge pull request #88 from Quansight/new_images
Browse files Browse the repository at this point in the history
Version bump to 0.1.15
  • Loading branch information
costrouc committed Sep 25, 2020
2 parents 1abd4ef + dd35f89 commit 8c13b3d
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion qhub/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.14
0.1.15
14 changes: 7 additions & 7 deletions qhub/template/configs/config_aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ amazon_web_services:
max_nodes: 2

default_images:
jupyterhub: "quansight/qhub-jupyterhub:4c8c28332be1fde32f786c54a5961b5f3d789e16"
jupyterlab: "quansight/qhub-jupyterlab:4c8c28332be1fde32f786c54a5961b5f3d789e16"
dask_worker: "quansight/qhub-dask-worker:4c8c28332be1fde32f786c54a5961b5f3d789e16"
jupyterhub: "quansight/qhub-jupyterhub:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
jupyterlab: "quansight/qhub-jupyterlab:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
dask_worker: "quansight/qhub-dask-worker:1abd4efb8428a9d851b18e89b6f6e5ef94854334"

storage:
conda_store: 20Gi
Expand All @@ -65,29 +65,29 @@ profiles:
cpu_guarantee: 1
mem_limit: 1G
mem_guarantee: 1G
image: "quansight/qhub-jupyterlab:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-jupyterlab:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
- display_name: Medium Instance
description: Stable environment with 1.5 cpu / 2 GB ram
kubespawner_override:
cpu_limit: 1.5
cpu_guarantee: 1.25
mem_limit: 2G
mem_guarantee: 2G
image: "quansight/qhub-jupyterlab:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-jupyterlab:1abd4efb8428a9d851b18e89b6f6e5ef94854334"

dask_worker:
"Small Worker":
worker_cores_limit: 1
worker_cores: 1
worker_memory_limit: 1G
worker_memory: 1G
image: "quansight/qhub-dask-worker:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-dask-worker:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
"Medium Worker":
worker_cores_limit: 1.5
worker_cores: 1.25
worker_memory_limit: 2G
worker_memory: 2G
image: "quansight/qhub-dask-worker:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-dask-worker:1abd4efb8428a9d851b18e89b6f6e5ef94854334"


environments:
Expand Down
14 changes: 7 additions & 7 deletions qhub/template/configs/config_do.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ digital_ocean:


default_images:
jupyterhub: "quansight/qhub-jupyterhub:4c8c28332be1fde32f786c54a5961b5f3d789e16"
jupyterlab: "quansight/qhub-jupyterlab:4c8c28332be1fde32f786c54a5961b5f3d789e16"
dask_worker: "quansight/qhub-dask-worker:4c8c28332be1fde32f786c54a5961b5f3d789e16"
jupyterhub: "quansight/qhub-jupyterhub:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
jupyterlab: "quansight/qhub-jupyterlab:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
dask_worker: "quansight/qhub-dask-worker:1abd4efb8428a9d851b18e89b6f6e5ef94854334"


storage:
Expand All @@ -79,7 +79,7 @@ profiles:
cpu_guarantee: 1
mem_limit: 1G
mem_guarantee: 1G
image: "quansight/qhub-jupyterlab:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-jupyterlab:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
- display_name: Medium Instance
description: Stable environment with 1.5 cpu / 2 GB ram
default: true
Expand All @@ -88,21 +88,21 @@ profiles:
cpu_guarantee: 1.25
mem_limit: 2G
mem_guarantee: 2G
image: "quansight/qhub-jupyterlab:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-jupyterlab:1abd4efb8428a9d851b18e89b6f6e5ef94854334"

dask_worker:
"Small Worker":
worker_cores_limit: 1
worker_cores: 1
worker_memory_limit: 1G
worker_memory: 1G
image: "quansight/qhub-dask-worker:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-dask-worker:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
"Medium Worker":
worker_cores_limit: 1.5
worker_cores: 1.25
worker_memory_limit: 2G
worker_memory: 2G
image: "quansight/qhub-dask-worker:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-dask-worker:1abd4efb8428a9d851b18e89b6f6e5ef94854334"


environments:
Expand Down
14 changes: 7 additions & 7 deletions qhub/template/configs/config_gcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ google_cloud_platform:
max_nodes: 5

default_images:
jupyterhub: "quansight/qhub-jupyterhub:4c8c28332be1fde32f786c54a5961b5f3d789e16"
jupyterlab: "quansight/qhub-jupyterlab:4c8c28332be1fde32f786c54a5961b5f3d789e16"
dask_worker: "quansight/qhub-dask-worker:4c8c28332be1fde32f786c54a5961b5f3d789e16"
jupyterhub: "quansight/qhub-jupyterhub:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
jupyterlab: "quansight/qhub-jupyterlab:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
dask_worker: "quansight/qhub-dask-worker:1abd4efb8428a9d851b18e89b6f6e5ef94854334"

storage:
conda_store: 20Gi
Expand All @@ -65,29 +65,29 @@ profiles:
cpu_guarantee: 1
mem_limit: 1G
mem_guarantee: 1G
image: "quansight/qhub-jupyterlab:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-jupyterlab:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
- display_name: Medium Instance
description: Stable environment with 1.5 cpu / 2 GB ram
kubespawner_override:
cpu_limit: 1.5
cpu_guarantee: 1.25
mem_limit: 2G
mem_guarantee: 2G
image: "quansight/qhub-jupyterlab:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-jupyterlab:1abd4efb8428a9d851b18e89b6f6e5ef94854334"

dask_worker:
"Small Worker":
worker_cores_limit: 1
worker_cores: 1
worker_memory_limit: 1G
worker_memory: 1G
image: "quansight/qhub-dask-worker:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-dask-worker:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
"Medium Worker":
worker_cores_limit: 1.5
worker_cores: 1.25
worker_memory_limit: 2G
worker_memory: 2G
image: "quansight/qhub-dask-worker:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-dask-worker:1abd4efb8428a9d851b18e89b6f6e5ef94854334"


environments:
Expand Down
8 changes: 4 additions & 4 deletions tests/assets/config_do_additional_node_groups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ profiles:
cpu_guarantee: 1
mem_limit: 1G
mem_guarantee: 1G
image: "quansight/qhub-jupyterlab:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-jupyterlab:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
- display_name: Medium Instance
description: Stable environment with 1.5 cpu / 2 GB ram
default: true
Expand All @@ -81,18 +81,18 @@ profiles:
cpu_guarantee: 1.25
mem_limit: 2G
mem_guarantee: 2G
image: "quansight/qhub-jupyterlab:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-jupyterlab:1abd4efb8428a9d851b18e89b6f6e5ef94854334"

dask_worker:
"Small Worker":
worker_cores_limit: 1
worker_cores: 1
worker_memory_limit: 1G
worker_memory: 1G
image: "quansight/qhub-dask-worker:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-dask-worker:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
"Medium Worker":
worker_cores_limit: 1.5
worker_cores: 1.25
worker_memory_limit: 2G
worker_memory: 2G
image: "quansight/qhub-dask-worker:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-dask-worker:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
8 changes: 4 additions & 4 deletions tests/assets/config_do_auth0_provision.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,26 +54,26 @@ profiles:
cpu_guarantee: 1
mem_limit: 1G
mem_guarantee: 1G
image: "quansight/qhub-jupyterlab:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-jupyterlab:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
- display_name: Medium Instance
description: Stable environment with 1.5 cpu / 2 GB ram
kubespawner_override:
cpu_limit: 1.5
cpu_guarantee: 1.25
mem_limit: 2G
mem_guarantee: 2G
image: "quansight/qhub-jupyterlab:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-jupyterlab:1abd4efb8428a9d851b18e89b6f6e5ef94854334"

dask_worker:
"Small Worker":
worker_cores_limit: 1
worker_cores: 1
worker_memory_limit: 1G
worker_memory: 1G
image: "quansight/qhub-dask-worker:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-dask-worker:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
"Medium Worker":
worker_cores_limit: 1.5
worker_cores: 1.25
worker_memory_limit: 2G
worker_memory: 2G
image: "quansight/qhub-dask-worker:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-dask-worker:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
18 changes: 9 additions & 9 deletions tests/assets/config_gcp_gpu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ google_cloud_platform:
count: 1

default_images:
jupyterhub: "quansight/qhub-jupyterhub:4c8c28332be1fde32f786c54a5961b5f3d789e16"
jupyterlab: "quansight/qhub-jupyterlab:4c8c28332be1fde32f786c54a5961b5f3d789e16"
dask_worker: "quansight/qhub-dask-worker:4c8c28332be1fde32f786c54a5961b5f3d789e16"
jupyterhub: "quansight/qhub-jupyterhub:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
jupyterlab: "quansight/qhub-jupyterlab:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
dask_worker: "quansight/qhub-dask-worker:1abd4efb8428a9d851b18e89b6f6e5ef94854334"

storage:
conda_store: 20Gi
Expand All @@ -71,27 +71,27 @@ profiles:
cpu_guarantee: 0.5
mem_limit: 1.7G
mem_guarantee: 1.7G
image: "quansight/qhub-jupyterlab:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-jupyterlab:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
- display_name: Medium Instance
description: Stable environment with 1.5 cpu / 2 GB ram
kubespawner_override:
cpu_limit: 1
cpu_guarantee: 1
mem_limit: 3.5G
mem_guarantee: 3.5G
image: "quansight/qhub-jupyterlab:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-jupyterlab:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
- display_name: Large Instance
description: Stable environment with 1.5 cpu / 2 GB ram
kubespawner_override:
cpu_limit: 2
cpu_guarantee: 2
mem_limit: 7G
mem_guarantee: 7G
image: "quansight/qhub-jupyterlab:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-jupyterlab:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
- display_name: GPU Instance
description: Stable environment with 1 Nvidia GPU
kubespawner_override:
image: "quansight/qhub-jupyterlab:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-jupyterlab:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
cpu_limit: 2
cpu_guarantee: 2
mem_limit: 7G
Expand All @@ -107,13 +107,13 @@ profiles:
worker_cores: 1
worker_memory_limit: 3.5G
worker_memory: 3.5G
image: "quansight/qhub-dask-worker:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-dask-worker:1abd4efb8428a9d851b18e89b6f6e5ef94854334"
"Medium Worker":
worker_cores_limit: 2
worker_cores: 2
worker_memory_limit: 7G
worker_memory: 7G
image: "quansight/qhub-dask-worker:4c8c28332be1fde32f786c54a5961b5f3d789e16"
image: "quansight/qhub-dask-worker:1abd4efb8428a9d851b18e89b6f6e5ef94854334"


environments:
Expand Down

0 comments on commit 8c13b3d

Please sign in to comment.