From b8628155ab32a6eeed346875f338704858aeff3b Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Tue, 18 May 2021 01:21:02 +0530 Subject: [PATCH 1/2] Move homepage under custom.homepage Ref https://github.com/2i2c-org/pilot-hubs/issues/414 In preparation for strict schema validation of helm config from https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/2200 --- config/hubs/2i2c.cluster.yaml | 298 ++++++++++++------------ config/hubs/carbonplan.cluster.yaml | 33 ++- config/hubs/cloudbank.cluster.yaml | 341 ++++++++++++++-------------- config/hubs/farallon.cluster.yaml | 35 ++- config/hubs/paleohack.cluster.yaml | 31 +-- hub-templates/basehub/values.yaml | 2 +- 6 files changed, 378 insertions(+), 362 deletions(-) diff --git a/config/hubs/2i2c.cluster.yaml b/config/hubs/2i2c.cluster.yaml index 6a8f5d0c37..bd54581255 100644 --- a/config/hubs/2i2c.cluster.yaml +++ b/config/hubs/2i2c.cluster.yaml @@ -18,21 +18,22 @@ hubs: repo: https://github.com/jupyterhub/nbgitpuller branch: gh-pages 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 + custom: + 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: config: Authenticator: @@ -57,21 +58,21 @@ hubs: projectId: two-eye-two-see scratchBucket: enabled: true - homepage: - templateVars: - org: - name: 2i2c Dask 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 + homepage: + templateVars: + org: + name: 2i2c Dask 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 singleuser: image: name: pangeo/pangeo-notebook @@ -92,21 +93,22 @@ hubs: connection: github config: jupyterhub: - homepage: - templateVars: - org: - name: Justice Innovation Lab - logo_url: "https://images.squarespace-cdn.com/content/5ee35ddb35affc21b29c0fd6/1596634079158-KLDENW5BSW2HQW4ZO0EH/JIL-Logo-Digital.png?format=1500w&content-type=image%2Fpng" - url: https://www.justiceinnovationlab.org/ - designed_by: - name: 2i2c - url: https://2i2c.org - operated_by: - name: 2i2c - url: https://2i2c.org - funded_by: - name: 2i2c - url: https://2i2c.org + custom: + homepage: + templateVars: + org: + name: Justice Innovation Lab + logo_url: "https://images.squarespace-cdn.com/content/5ee35ddb35affc21b29c0fd6/1596634079158-KLDENW5BSW2HQW4ZO0EH/JIL-Logo-Digital.png?format=1500w&content-type=image%2Fpng" + url: https://www.justiceinnovationlab.org/ + 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: config: Authenticator: @@ -123,21 +125,22 @@ hubs: connection: github config: jupyterhub: - homepage: - templateVars: - org: - name: Purdue Fort Wayne - logo_url: https://upload.wikimedia.org/wikipedia/en/thumb/1/14/Purdue_Fort_Wayne_Mastodons_logo.svg/400px-Purdue_Fort_Wayne_Mastodons_logo.svg.png - url: https://www.pfw.edu/ - 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 + custom: + homepage: + templateVars: + org: + name: Purdue Fort Wayne + logo_url: https://upload.wikimedia.org/wikipedia/en/thumb/1/14/Purdue_Fort_Wayne_Mastodons_logo.svg/400px-Purdue_Fort_Wayne_Mastodons_logo.svg.png + url: https://www.pfw.edu/ + 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: config: Authenticator: @@ -156,21 +159,22 @@ hubs: connection: google-oauth2 config: jupyterhub: - homepage: - templateVars: - org: - name: Wageningen University and Research - logo_url: https://www.wur.nl/upload/58340fb4-e33a-4d0b-af17-8d596fa93663_WUR_RGB_standard.png - url: https://www.wur.nl/en/wageningen-university.htm - 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 + custom: + homepage: + templateVars: + org: + name: Wageningen University and Research + logo_url: https://www.wur.nl/upload/58340fb4-e33a-4d0b-af17-8d596fa93663_WUR_RGB_standard.png + url: https://www.wur.nl/en/wageningen-university.htm + 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 singleuser: memory: limit: 2G @@ -191,21 +195,22 @@ hubs: connection: google-oauth2 config: jupyterhub: - homepage: - templateVars: - org: - name: Peddie Academy - logo_url: https://resources.finalsite.net/images/f_auto,q_auto,t_image_size_1/v1564687841/peddie/l4yufwwdksquxu2yetv6/PeddieSealPMS289.png - url: http://peddie.org/ - 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 + custom: + homepage: + templateVars: + org: + name: Peddie Academy + logo_url: https://resources.finalsite.net/images/f_auto,q_auto,t_image_size_1/v1564687841/peddie/l4yufwwdksquxu2yetv6/PeddieSealPMS289.png + url: http://peddie.org/ + 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: config: Authenticator: @@ -225,13 +230,6 @@ hubs: config: basehub: jupyterhub: - custom: - cloudResources: - provider: gcp - gcp: - projectId: two-eye-two-see - scratchBucket: - enabled: true singleuser: image: name: catalystcoop/pudl-jupyter @@ -239,21 +237,28 @@ hubs: memory: limit: 6G guarantee: 4G - homepage: - templateVars: - org: - name: Catalyst Cooperative - logo_url: https://catalyst.coop/files/2018/06/SimpleSquareWalking.png - url: https://catalyst.coop/ - designed_by: - name: 2i2c - url: https://2i2c.org - operated_by: - name: 2i2c - url: https://2i2c.org - funded_by: - name: 2i2c - url: https://2i2c.org + custom: + cloudResources: + provider: gcp + gcp: + projectId: two-eye-two-see + scratchBucket: + enabled: true + homepage: + templateVars: + org: + name: Catalyst Cooperative + logo_url: https://catalyst.coop/files/2018/06/SimpleSquareWalking.png + url: https://catalyst.coop/ + 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: config: Authenticator: @@ -272,21 +277,22 @@ hubs: connection: github config: jupyterhub: - homepage: - templateVars: - org: - name: EarthLab - logo_url: https://pbs.twimg.com/profile_images/1102342372438925312/64xKJFPk.png - url: https://www.colorado.edu/earthlab/ - 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 + custom: + homepage: + templateVars: + org: + name: EarthLab + logo_url: https://pbs.twimg.com/profile_images/1102342372438925312/64xKJFPk.png + url: https://www.colorado.edu/earthlab/ + 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: config: Authenticator: @@ -304,6 +310,10 @@ hubs: config: basehub: jupyterhub: + singleuser: + image: + name: pangeo/pangeo-notebook + tag: 2021.02.19 custom: cloudResources: provider: gcp @@ -311,25 +321,21 @@ hubs: projectId: two-eye-two-see scratchBucket: enabled: true - singleuser: - image: - name: pangeo/pangeo-notebook - tag: 2021.02.19 - homepage: - templateVars: - org: - name: "SWOT Ocean Pangeo Team" - logo_url: https://2i2c.org/media/logo.png - url: https://2i2c.org - designed_by: - name: 2i2c - url: https://2i2c.org - operated_by: - name: 2i2c - url: https://2i2c.org - funded_by: - name: 2i2c - url: https://2i2c.org + homepage: + templateVars: + org: + name: "SWOT Ocean Pangeo Team" + logo_url: https://2i2c.org/media/logo.png + url: https://2i2c.org + 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: config: Authenticator: diff --git a/config/hubs/carbonplan.cluster.yaml b/config/hubs/carbonplan.cluster.yaml index 66972b88e3..6eef4b2acc 100644 --- a/config/hubs/carbonplan.cluster.yaml +++ b/config/hubs/carbonplan.cluster.yaml @@ -9,8 +9,6 @@ hubs: auth0: connection: github config: &carbonPlanHubConfig - scratchBucket: - enabled: false basehub: nfsPVC: nfs: @@ -30,21 +28,22 @@ hubs: operator: "Exists" effect: "NoSchedule" jupyterhub: - homepage: - templateVars: - org: - name: Carbon Plan - logo_url: https://pbs.twimg.com/profile_images/1262387945971101697/5q_X3Ruk_400x400.jpg - url: https://carbonplan.org - designed_by: - name: 2i2c - url: https://2i2c.org - operated_by: - name: 2i2c - url: https://2i2c.org - funded_by: - name: Carbon Plan - url: https://carbonplan.org + custom: + homepage: + templateVars: + org: + name: Carbon Plan + logo_url: https://pbs.twimg.com/profile_images/1262387945971101697/5q_X3Ruk_400x400.jpg + url: https://carbonplan.org + designed_by: + name: 2i2c + url: https://2i2c.org + operated_by: + name: 2i2c + url: https://2i2c.org + funded_by: + name: Carbon Plan + url: https://carbonplan.org singleuser: initContainers: # Need to explicitly fix ownership here, since EFS doesn't do anonuid diff --git a/config/hubs/cloudbank.cluster.yaml b/config/hubs/cloudbank.cluster.yaml index 8751273d8e..c58f288417 100644 --- a/config/hubs/cloudbank.cluster.yaml +++ b/config/hubs/cloudbank.cluster.yaml @@ -14,21 +14,22 @@ hubs: connection: google-oauth2 config: jupyterhub: - homepage: - templateVars: - org: - name: Spelman College - logo_url: https://www.spelman.edu/images/communications/splogotagblk.png - url: https://www.spelman.edu/ - designed_by: - name: 2i2c - url: https://2i2c.org - operated_by: - name: CloudBank - url: http://cloudbank.org/ - funded_by: - name: CloudBank - url: http://cloudbank.org/ + custom: + homepage: + templateVars: + org: + name: Spelman College + logo_url: https://www.spelman.edu/images/communications/splogotagblk.png + url: https://www.spelman.edu/ + designed_by: + name: 2i2c + url: https://2i2c.org + operated_by: + name: CloudBank + url: http://cloudbank.org/ + funded_by: + name: CloudBank + url: http://cloudbank.org/ hub: config: Authenticator: @@ -48,21 +49,22 @@ hubs: connection: google-oauth2 config: jupyterhub: - homepage: - templateVars: - org: - name: City College SF - logo_url: https://www.ccsf.edu/sites/default/files/inline-images/asset-th-logo-black.png - url: https://www.ccsf.edu/ - designed_by: - name: 2i2c - url: https://2i2c.org - operated_by: - name: CloudBank - url: http://cloudbank.org/ - funded_by: - name: CloudBank - url: http://cloudbank.org/ + custom: + homepage: + templateVars: + org: + name: City College SF + logo_url: https://www.ccsf.edu/sites/default/files/inline-images/asset-th-logo-black.png + url: https://www.ccsf.edu/ + designed_by: + name: 2i2c + url: https://2i2c.org + operated_by: + name: CloudBank + url: http://cloudbank.org/ + funded_by: + name: CloudBank + url: http://cloudbank.org/ hub: config: Authenticator: @@ -83,21 +85,22 @@ hubs: connection: google-oauth2 config: jupyterhub: - homepage: - templateVars: - org: - name: El Camino College - logo_url: https://www.elcamino.edu/_resources/images/logo.png - url: https://www.elcamino.edu/ - designed_by: - name: 2i2c - url: https://2i2c.org - operated_by: - name: CloudBank - url: http://cloudbank.org/ - funded_by: - name: CloudBank - url: http://cloudbank.org/ + custom: + homepage: + templateVars: + org: + name: El Camino College + logo_url: https://www.elcamino.edu/_resources/images/logo.png + url: https://www.elcamino.edu/ + designed_by: + name: 2i2c + url: https://2i2c.org + operated_by: + name: CloudBank + url: http://cloudbank.org/ + funded_by: + name: CloudBank + url: http://cloudbank.org/ singleuser: memory: @@ -121,21 +124,22 @@ hubs: connection: google-oauth2 config: jupyterhub: - homepage: - templateVars: - org: - name: Howard University - logo_url: https://upload.wikimedia.org/wikipedia/en/a/a3/Howard_University_seal.svg - url: https://home.howard.edu/ - designed_by: - name: 2i2c - url: https://2i2c.org - operated_by: - name: CloudBank - url: http://cloudbank.org/ - funded_by: - name: CloudBank - url: http://cloudbank.org/ + custom: + homepage: + templateVars: + org: + name: Howard University + logo_url: https://upload.wikimedia.org/wikipedia/en/a/a3/Howard_University_seal.svg + url: https://home.howard.edu/ + designed_by: + name: 2i2c + url: https://2i2c.org + operated_by: + name: CloudBank + url: http://cloudbank.org/ + funded_by: + name: CloudBank + url: http://cloudbank.org/ hub: config: Authenticator: @@ -155,21 +159,22 @@ hubs: connection: google-oauth2 config: jupyterhub: - homepage: - templateVars: - org: - name: Skyline College - logo_url: http://skylinecollege.edu/mcpr/images/logos/png/skyline_logo_horiz_cmyk.png - url: https://www.skylinecollege.edu/ - designed_by: - name: 2i2c - url: https://2i2c.org - operated_by: - name: CloudBank - url: http://cloudbank.org/ - funded_by: - name: CloudBank - url: http://cloudbank.org/ + custom: + homepage: + templateVars: + org: + name: Skyline College + logo_url: http://skylinecollege.edu/mcpr/images/logos/png/skyline_logo_horiz_cmyk.png + url: https://www.skylinecollege.edu/ + designed_by: + name: 2i2c + url: https://2i2c.org + operated_by: + name: CloudBank + url: http://cloudbank.org/ + funded_by: + name: CloudBank + url: http://cloudbank.org/ hub: config: Authenticator: @@ -189,21 +194,22 @@ hubs: connection: google-oauth2 config: jupyterhub: - homepage: - templateVars: - org: - name: 2i2c / CloudBank Hubs Demo - logo_url: https://www.cloudbank.org/sites/default/files/file_fields/logo.png - url: https://2i2c.org/pilot/ - designed_by: - name: 2i2c - url: https://2i2c.org - operated_by: - name: CloudBank - url: http://cloudbank.org/ - funded_by: - name: CloudBank - url: http://cloudbank.org/ + custom: + homepage: + templateVars: + org: + name: 2i2c / CloudBank Hubs Demo + logo_url: https://www.cloudbank.org/sites/default/files/file_fields/logo.png + url: https://2i2c.org/pilot/ + designed_by: + name: 2i2c + url: https://2i2c.org + operated_by: + name: CloudBank + url: http://cloudbank.org/ + funded_by: + name: CloudBank + url: http://cloudbank.org/ hub: config: Authenticator: @@ -222,21 +228,22 @@ hubs: connection: google-oauth2 config: jupyterhub: - homepage: - templateVars: - org: - name: Lassen College - logo_url: https://www.lassencollege.edu/about/governance/graphic-standards/Documents/District-Logo-Standards/LCC-Athletic-Logo-on-blk.jpg - url: http://www.lassencollege.edu/ - designed_by: - name: 2i2c - url: https://2i2c.org - operated_by: - name: CloudBank - url: http://cloudbank.org/ - funded_by: - name: CloudBank - url: http://cloudbank.org/ + custom: + homepage: + templateVars: + org: + name: Lassen College + logo_url: https://www.lassencollege.edu/about/governance/graphic-standards/Documents/District-Logo-Standards/LCC-Athletic-Logo-on-blk.jpg + url: http://www.lassencollege.edu/ + designed_by: + name: 2i2c + url: https://2i2c.org + operated_by: + name: CloudBank + url: http://cloudbank.org/ + funded_by: + name: CloudBank + url: http://cloudbank.org/ hub: config: Authenticator: @@ -255,21 +262,22 @@ hubs: connection: google-oauth2 config: jupyterhub: - homepage: - templateVars: - org: - name: Clovis College - logo_url: https://www.scccd.edu/_files/images/clovis-logo-bubble-6.png - url: https://www.cloviscollege.edu/ - designed_by: - name: 2i2c - url: https://2i2c.org - operated_by: - name: CloudBank - url: http://cloudbank.org/ - funded_by: - name: CloudBank - url: http://cloudbank.org/ + custom: + homepage: + templateVars: + org: + name: Clovis College + logo_url: https://www.scccd.edu/_files/images/clovis-logo-bubble-6.png + url: https://www.cloviscollege.edu/ + designed_by: + name: 2i2c + url: https://2i2c.org + operated_by: + name: CloudBank + url: http://cloudbank.org/ + funded_by: + name: CloudBank + url: http://cloudbank.org/ hub: config: Authenticator: @@ -288,21 +296,22 @@ hubs: connection: google-oauth2 config: jupyterhub: - homepage: - templateVars: - org: - name: Santa Barbara City College - logo_url: https://upload.wikimedia.org/wikipedia/commons/thumb/a/a6/Santa_Barbara_City_College.svg/1200px-Santa_Barbara_City_College.svg.png - url: https://www.sbcc.edu/ - designed_by: - name: 2i2c - url: https://2i2c.org - operated_by: - name: CloudBank - url: http://cloudbank.org/ - funded_by: - name: CloudBank - url: http://cloudbank.org/ + custom: + homepage: + templateVars: + org: + name: Santa Barbara City College + logo_url: https://upload.wikimedia.org/wikipedia/commons/thumb/a/a6/Santa_Barbara_City_College.svg/1200px-Santa_Barbara_City_College.svg.png + url: https://www.sbcc.edu/ + designed_by: + name: 2i2c + url: https://2i2c.org + operated_by: + name: CloudBank + url: http://cloudbank.org/ + funded_by: + name: CloudBank + url: http://cloudbank.org/ hub: config: Authenticator: @@ -323,21 +332,22 @@ hubs: connection: google-oauth2 config: jupyterhub: - homepage: - templateVars: - org: - name: Mills College - logo_url: https://upload.wikimedia.org/wikipedia/commons/4/40/Mills_College_wordmark.svg - url: https://www.mills.edu/ - designed_by: - name: 2i2c - url: https://2i2c.org - operated_by: - name: CloudBank - url: http://cloudbank.org/ - funded_by: - name: CloudBank - url: http://cloudbank.org/ + custom: + homepage: + templateVars: + org: + name: Mills College + logo_url: https://upload.wikimedia.org/wikipedia/commons/4/40/Mills_College_wordmark.svg + url: https://www.mills.edu/ + designed_by: + name: 2i2c + url: https://2i2c.org + operated_by: + name: CloudBank + url: http://cloudbank.org/ + funded_by: + name: CloudBank + url: http://cloudbank.org/ hub: config: Authenticator: @@ -358,21 +368,22 @@ hubs: connection: google-oauth2 config: jupyterhub: - homepage: - templateVars: - org: - name: Palomar Community College - logo_url: https://www2.palomar.edu/pages/guidelines/files/2016/03/webGuide_screened_2-color_light.jpg - url: https://www2.palomar.edu/ - designed_by: - name: 2i2c - url: https://2i2c.org - operated_by: - name: CloudBank - url: http://cloudbank.org/ - funded_by: - name: CloudBank - url: http://cloudbank.org/ + custom: + homepage: + templateVars: + org: + name: Palomar Community College + logo_url: https://www2.palomar.edu/pages/guidelines/files/2016/03/webGuide_screened_2-color_light.jpg + url: https://www2.palomar.edu/ + designed_by: + name: 2i2c + url: https://2i2c.org + operated_by: + name: CloudBank + url: http://cloudbank.org/ + funded_by: + name: CloudBank + url: http://cloudbank.org/ hub: config: Authenticator: diff --git a/config/hubs/farallon.cluster.yaml b/config/hubs/farallon.cluster.yaml index 07164f8f32..a177ca3d1f 100644 --- a/config/hubs/farallon.cluster.yaml +++ b/config/hubs/farallon.cluster.yaml @@ -9,15 +9,13 @@ hubs: auth0: connection: github config: - scratchBucket: - enabled: false basehub: nfsPVC: nfs: # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html mountOptions: - rsize=1048576 - - wsize=1048576 + - wsize=1048576 - timeo=600 - soft # We pick soft over hard, so NFS lockups don't lead to hung processes - retrans=2 @@ -30,21 +28,22 @@ hubs: operator: "Exists" effect: "NoSchedule" jupyterhub: - homepage: - templateVars: - org: - name: Farallon Institute - logo_url: https://2i2c.org/media/logo.png - url: http://www.faralloninstitute.org/ - designed_by: - name: 2i2c - url: https://2i2c.org - operated_by: - name: 2i2c - url: https://2i2c.org - funded_by: - name: Farallon Institute - urL: http://www.faralloninstitute.org/ + custom: + homepage: + templateVars: + org: + name: Farallon Institute + logo_url: https://2i2c.org/media/logo.png + url: http://www.faralloninstitute.org/ + designed_by: + name: 2i2c + url: https://2i2c.org + operated_by: + name: 2i2c + url: https://2i2c.org + funded_by: + name: Farallon Institute + urL: http://www.faralloninstitute.org/ singleuser: initContainers: # Need to explicitly fix ownership here, since EFS doesn't do anonuid diff --git a/config/hubs/paleohack.cluster.yaml b/config/hubs/paleohack.cluster.yaml index 79d50b5fbc..e5517cdc92 100644 --- a/config/hubs/paleohack.cluster.yaml +++ b/config/hubs/paleohack.cluster.yaml @@ -20,22 +20,23 @@ hubs: userScheduler: # Each user gets almost 1 anyway enabled: true - homepage: - templateVars: - org: - name: "PaleoHack 2021" - logo_url: "https://raw.githubusercontent.com/LinkedEarth/Logos/master/pyleoclim_logo_full_white.png" + custom: + homepage: + templateVars: + org: + name: "PaleoHack 2021" + logo_url: "https://raw.githubusercontent.com/LinkedEarth/Logos/master/pyleoclim_logo_full_white.png" - url: "https://linkedearth.github.io/paleoHackathon/" - designed_by: - name: 2i2c - url: https://2i2c.org - operated_by: - name: 2i2c - url: https://2i2c.org - funded_by: - name: "NSF Paleo Perspectives on Climate Change program" - url: "https://www.nsf.gov/funding/pgm_summ.jsp?pims_id=5750" + url: "https://linkedearth.github.io/paleoHackathon/" + designed_by: + name: 2i2c + url: https://2i2c.org + operated_by: + name: 2i2c + url: https://2i2c.org + funded_by: + name: "NSF Paleo Perspectives on Climate Change program" + url: "https://www.nsf.gov/funding/pgm_summ.jsp?pims_id=5750" singleuser: memory: limit: 4G diff --git a/hub-templates/basehub/values.yaml b/hub-templates/basehub/values.yaml index 2d5566f89e..1c384b3e59 100644 --- a/hub-templates/basehub/values.yaml +++ b/hub-templates/basehub/values.yaml @@ -247,7 +247,7 @@ jupyterhub: c.JupyterHub.template_paths = ['/usr/local/share/jupyterhub/custom_templates/'] c.JupyterHub.template_vars = { - 'custom':get_config('homepage.templateVars') + 'custom':get_config('custom.homepage.templateVars') } 05-custom-admin: | from z2jh import get_config From 88583112b938a92a3dcd2091ea581de0e3e617f2 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Tue, 18 May 2021 01:28:28 +0530 Subject: [PATCH 2/2] Tell docs to look under custom for homepage vars --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 7f21eb1378..a7b4390091 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -86,7 +86,7 @@ hub['domain'] = hub['domain'][0] hub_list.append({ - 'name': hub_config['homepage']['templateVars']['org']['name'], + 'name': hub_config['custom']['homepage']['templateVars']['org']['name'], 'domain': f"[{hub['domain']}](https://{hub['domain']})", "id": hub['name'], "template": hub['template'],