From e13ae1bc884e2cb9ffda62ce6d550bc1e47fabb9 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Wed, 11 Oct 2023 17:21:42 +0300 Subject: [PATCH] Update profile list config and set the unlisted_choice_experiment image as the hub image used --- config/clusters/2i2c/jackeddy.values.yaml | 209 +++++++++++----------- 1 file changed, 108 insertions(+), 101 deletions(-) diff --git a/config/clusters/2i2c/jackeddy.values.yaml b/config/clusters/2i2c/jackeddy.values.yaml index 93f7b4ccaf..2c5c03c765 100644 --- a/config/clusters/2i2c/jackeddy.values.yaml +++ b/config/clusters/2i2c/jackeddy.values.yaml @@ -45,101 +45,6 @@ basehub: # Allow jupyterlab option to show hidden files in browser ContentsManager: allow_hidden: true - profileList: - requests: - # Configuration setup based on https://github.com/2i2c-org/infrastructure/issues/2121. - # Allocate resources from a n2-highmem-16 node, instead of a - # n2-highmem-4 node to help reduce startup times. - # Based on past usages of this hub, it is highly possible it will use notable - # amounts of RAM. - # The choice of this node, will avoid putting only two users requesting ~16 GB on - # a ~32 GB node (if we went with a n2-highmem-4) and will instead allow for - # at least eight users to fit per node on a n2-highmem-16 machine. - # ref: https://github.com/2i2c-org/infrastructure/issues/3166#issuecomment-1755630637 - display_name: Resource Allocation - choices: - mem_1_9: - display_name: 1.9 GB RAM, upto 3.75 CPUs - description: Fastest spinup time - kubespawner_override: - mem_guarantee: 1992701952 - mem_limit: 1992701952 - cpu_guarantee: 0.234375 - cpu_limit: 3.75 - node_selector: - node.kubernetes.io/instance-type: n2-highmem-16 - default: true - mem_3_7: - display_name: 3.7 GB RAM, upto 3.75 CPUs - kubespawner_override: - mem_guarantee: 3985403904 - mem_limit: 3985403904 - cpu_guarantee: 0.46875 - cpu_limit: 3.75 - node_selector: - node.kubernetes.io/instance-type: n2-highmem-16 - mem_7_4: - display_name: 7.4 GB RAM, upto 3.75 CPUs - kubespawner_override: - mem_guarantee: 7970807808 - mem_limit: 7970807808 - cpu_guarantee: 0.9375 - cpu_limit: 3.75 - node_selector: - node.kubernetes.io/instance-type: n2-highmem-16 - mem_14_8: - display_name: 14.8 GB RAM, upto 3.75 CPUs - kubespawner_override: - mem_guarantee: 15941615616 - mem_limit: 15941615616 - cpu_guarantee: 1.875 - cpu_limit: 3.75 - node_selector: - node.kubernetes.io/instance-type: n2-highmem-16 - mem_29_7: - display_name: 29.7 GB RAM, upto 3.75 CPUs - kubespawner_override: - mem_guarantee: 31883231232 - mem_limit: 31883231232 - cpu_guarantee: 3.75 - cpu_limit: 3.75 - node_selector: - node.kubernetes.io/instance-type: n2-highmem-16 - mem_60_6: - display_name: 60.6 GB RAM, upto 15.72 CPUs - kubespawner_override: - mem_guarantee: 65105797120 - mem_limit: 65105797120 - cpu_guarantee: 7.86 - cpu_limit: 15.72 - node_selector: - node.kubernetes.io/instance-type: n2-highmem-16 - mem_121_3: - display_name: 121.3 GB RAM, upto 15.72 CPUs - kubespawner_override: - mem_guarantee: 130211594240 - mem_limit: 130211594240 - cpu_guarantee: 15.72 - cpu_limit: 15.72 - node_selector: - node.kubernetes.io/instance-type: n2-highmem-16 - image: &profile_list_profile_options_image - display_name: Image - # https://infrastructure.2i2c.org/howto/features/allow-unlisted-profile-choice/ - unlisted_choice: &profile_list_unlisted_choice - enabled: True - display_name: "Custom image" - validation_regex: "^.+:.+$" - validation_message: "Must be a publicly available docker image, of form :" - kubespawner_override: - image: "{value}" - choices: - pangeo: - display_name: Base Pangeo Notebook - default: true - slug: "pangeo" - kubespawner_override: - image: "pangeo/pangeo-notebook:2023.10.03" # https://infrastructure.2i2c.org/howto/features/dedicated-nodepool/ nodeSelector: # Applied to all profile options @@ -152,7 +57,115 @@ basehub: # https://infrastructure.2i2c.org/howto/features/github GH_SCOPED_CREDS_CLIENT_ID: "Iv1.37646d01f3f58a80" GH_SCOPED_CREDS_APP_URL: https://github.com/apps/jack-eddy-jupyterhub-push-access + profileList: + - display_name: "Image and resource allocation" + description: "Choose the user image and what resources to be allocated for the server" + slug: only-choice + profile_options: + requests: + # Configuration setup based on https://github.com/2i2c-org/infrastructure/issues/2121. + # Allocate resources from a n2-highmem-16 node, instead of a + # n2-highmem-4 node to help reduce startup times. + # Based on past usages of this hub, it is highly possible it will use notable + # amounts of RAM. + # The choice of this node, will avoid putting only two users requesting ~16 GB on + # a ~32 GB node (if we went with a n2-highmem-4) and will instead allow for + # at least eight users to fit per node on a n2-highmem-16 machine. + # ref: https://github.com/2i2c-org/infrastructure/issues/3166#issuecomment-1755630637 + display_name: Resource Allocation + choices: + mem_1_9: + display_name: 1.9 GB RAM, upto 3.75 CPUs + description: Fastest spinup time + kubespawner_override: + mem_guarantee: 1992701952 + mem_limit: 1992701952 + cpu_guarantee: 0.234375 + cpu_limit: 3.75 + node_selector: + node.kubernetes.io/instance-type: n2-highmem-16 + default: true + mem_3_7: + display_name: 3.7 GB RAM, upto 3.75 CPUs + kubespawner_override: + mem_guarantee: 3985403904 + mem_limit: 3985403904 + cpu_guarantee: 0.46875 + cpu_limit: 3.75 + node_selector: + node.kubernetes.io/instance-type: n2-highmem-16 + mem_7_4: + display_name: 7.4 GB RAM, upto 3.75 CPUs + kubespawner_override: + mem_guarantee: 7970807808 + mem_limit: 7970807808 + cpu_guarantee: 0.9375 + cpu_limit: 3.75 + node_selector: + node.kubernetes.io/instance-type: n2-highmem-16 + mem_14_8: + display_name: 14.8 GB RAM, upto 3.75 CPUs + kubespawner_override: + mem_guarantee: 15941615616 + mem_limit: 15941615616 + cpu_guarantee: 1.875 + cpu_limit: 3.75 + node_selector: + node.kubernetes.io/instance-type: n2-highmem-16 + mem_29_7: + display_name: 29.7 GB RAM, upto 3.75 CPUs + kubespawner_override: + mem_guarantee: 31883231232 + mem_limit: 31883231232 + cpu_guarantee: 3.75 + cpu_limit: 3.75 + node_selector: + node.kubernetes.io/instance-type: n2-highmem-16 + mem_60_6: + display_name: 60.6 GB RAM, upto 15.72 CPUs + kubespawner_override: + mem_guarantee: 65105797120 + mem_limit: 65105797120 + cpu_guarantee: 7.86 + cpu_limit: 15.72 + node_selector: + node.kubernetes.io/instance-type: n2-highmem-16 + mem_121_3: + display_name: 121.3 GB RAM, upto 15.72 CPUs + kubespawner_override: + mem_guarantee: 130211594240 + mem_limit: 130211594240 + cpu_guarantee: 15.72 + cpu_limit: 15.72 + node_selector: + node.kubernetes.io/instance-type: n2-highmem-16 + image: + display_name: Image + # https://infrastructure.2i2c.org/howto/features/allow-unlisted-profile-choice/ + unlisted_choice: + enabled: True + display_name: "Custom image" + validation_regex: "^.+:.+$" + validation_message: "Must be a publicly available docker image, of form :" + kubespawner_override: + image: "{value}" + choices: + pangeo: + display_name: Base Pangeo Notebook + default: true + slug: "pangeo" + kubespawner_override: + image: "pangeo/pangeo-notebook:2023.10.03" hub: + allowNamedServers: true + image: + name: quay.io/2i2c/unlisted-choice-experiment + tag: "0.0.1-0.dev.git.7130.h0bdc2d30" + networkPolicy: + # FIXME: For dask gateway + enabled: false + readinessProbe: + enabled: false config: JupyterHub: authenticator_class: github @@ -170,12 +183,6 @@ basehub: admin_users: - dan800 # Dan Marsh - rmcgranaghan # Ryan McGranaghan - allowNamedServers: true - networkPolicy: - # FIXME: For dask gateway - enabled: false - readinessProbe: - enabled: false dask-gateway: gateway: extraConfig: