Merge pull request 2i2c-org#3218 from GeorgianaElena/uc-merced-staging

Add ucmerced staging hub with profileList for Python and R images

config/clusters/2i2c/cluster.yaml

@@ -80,12 +80,25 @@ hubs:
       - basehub-common.values.yaml
       - temple.values.yaml
       - enc-temple.secret.values.yaml
+  # Temporary deploy a staging hub for UCMerced
+  # to help them transition to new user images
+  # ref: https://github.com/2i2c-org/infrastructure/issues/3188
+  - name: ucmerced-staging
+    display_name: "UC Merced staging"
+    domain: staging.ucmerced.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - basehub-common.values.yaml
+      - ucmerced-common.values.yaml
+      - ucmerced-staging.values.yaml
+      - enc-ucmerced-staging.secret.values.yaml
   - name: ucmerced
     display_name: "UC Merced"
     domain: ucmerced.2i2c.cloud
     helm_chart: basehub
     helm_chart_values_files:
       - basehub-common.values.yaml
+      - ucmerced-common.values.yaml
       - ucmerced.values.yaml
       - enc-ucmerced.secret.values.yaml
   - name: climatematch

config/clusters/2i2c/enc-ucmerced-staging.secret.values.yaml

@@ -0,0 +1,20 @@
+jupyterhub:
+    hub:
+        config:
+            CILogonOAuthenticator:
+                client_id: ENC[AES256_GCM,data:9iDY0y5uMweBLmmLVHSrMaaBa+ks85Z++1hIUeYVq56JB1AHkbJIB/5OzqO7VK+lI4qI,iv:R2eMZYX7BNyJwhKrdd9s6ydor3b4sTs2S9hiKOOihOQ=,tag:vI5nfHWPjevXSZ05NzoKPA==,type:str]
+                client_secret: ENC[AES256_GCM,data:XRK+6+m3UJTehmCPO5+POtX7ZtaKZ12vqYkiWTRYktlUlOAmn3RSfrHhom9GsT4z24HO32z/rN527J45xv4HT22KWoLvGgBeji89nIq0mqooZuIRshw=,iv:K0CitX673AYJL8bJG4u4Q897NrMh05Al27EMrlScr8w=,tag:VL/KHcVt9h0aEU15Ec7pfA==,type:str]
+sops:
+    kms: []
+    gcp_kms:
+        - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
+          created_at: "2023-10-04T06:06:23Z"
+          enc: CiUA4OM7eKk3yxkeTOgnGjZXr6ULtliMRaWHxDLwegx8M4+fNxNlEkkAq2nhVbbg2If3M2FsgzuHQeLY3ZHGPm9SGRN54fvZmS6/uaG2r5ZbpVaGYyBsMhMyjTokgNSGNpu5krAhTjtiVRUgKznGZ7FF
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2023-10-04T06:06:23Z"
+    mac: ENC[AES256_GCM,data:PwiC/t3/X1pH/IVnu80bwboLP5GbxIIRsjLN5jONuhczB5gJp8/RhnhBrNbvR1HXGya4yBpOhvtFReUcWEmT/nTqxh0OCZSW+BbxfVRv1j5n1utL9Pnx+YXGGHS8vq/YvI08IhXU5742/lkGpcx1HqKG5jan1PAIjb4wafJy8y8=,iv:5BhFPTzZ1N6JVWZ2m8YwFKBZttliuj2Ehk6EluCQKVw=,tag:aD6D38aWchgsa7kq9rVLEQ==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.7.3

config/clusters/2i2c/ucmerced-common.values.yaml

@@ -0,0 +1,38 @@
+jupyterhub:
+  custom:
+    2i2c:
+      add_staff_user_ids_to_admin_users: true
+      add_staff_user_ids_of_type: "google"
+    homepage:
+      templateVars:
+        org:
+          name: University of California, Merced
+          url: http://www.ucmerced.edu/
+          logo_url: https://brand.ucmerced.edu/sites/brand.ucmerced.edu/files/images/ucm-logo-text.png
+        designed_by:
+          name: 2i2c
+          url: https://2i2c.org
+        operated_by:
+          name: 2i2c
+          url: https://2i2c.org
+        funded_by:
+          name: University of California, Merced
+          url: http://www.ucmerced.edu/
+  hub:
+    config:
+      JupyterHub:
+        authenticator_class: cilogon
+      CILogonOAuthenticator:
+        allowed_idps:
+          urn:mace:incommon:ucmerced.edu:
+            username_derivation:
+              username_claim: "eppn"
+            allow_all: true
+          http://google.com/accounts/o8/id:
+            username_derivation:
+              username_claim: "email"
+            allowed_domains:
+              - "2i2c.org"
+      Authenticator:
+        admin_users:
+          - [email protected]

config/clusters/2i2c/ucmerced-staging.values.yaml

@@ -0,0 +1,40 @@
+jupyterhub:
+  ingress:
+    hosts:
+      - staging.ucmerced.2i2c.cloud
+    tls:
+      - secretName: https-auto-tls
+        hosts:
+          - staging.ucmerced.2i2c.cloud
+  singleuser:
+    profileList:
+      - display_name: Python
+        description: Start a Python server with JupyterLab and scientific Python stack
+        default: true
+        kubespawner_override:
+          image: jupyter/scipy-notebook:2023-06-26
+          # Launch into JupyterLab after the user logs in
+          default_url: /lab
+      - display_name: R
+        description: Start a R server with RStudio and tidyverse & Geospatial tools
+        kubespawner_override:
+          image: rocker/binder:4.3
+          default_url: /lab
+          # Ensures container working dir is homedir
+          # https://github.com/2i2c-org/infrastructure/issues/2559
+          working_dir: /home/rstudio
+          # Because this is a list, it will override our default volume mounts
+          volume_mounts:
+            # Mount the user home directory
+            - name: home
+              mountPath: /home/rstudio
+              subPath: "{username}"
+            # Mount the shared readonly directory
+            - name: home
+              mountPath: /home/rstudio/shared
+              subPath: _shared
+              readOnly: true
+  hub:
+    config:
+      CILogonOAuthenticator:
+        oauth_callback_url: https://staging.ucmerced.2i2c.cloud/hub/oauth_callback

config/clusters/2i2c/ucmerced.values.yaml

@@ -6,45 +6,11 @@ jupyterhub:
       - secretName: https-auto-tls
         hosts:
           - ucmerced.2i2c.cloud
-  custom:
-    2i2c:
-      add_staff_user_ids_to_admin_users: true
-      add_staff_user_ids_of_type: "google"
-    homepage:
-      templateVars:
-        org:
-          name: University of California, Merced
-          url: http://www.ucmerced.edu/
-          logo_url: https://brand.ucmerced.edu/sites/brand.ucmerced.edu/files/images/ucm-logo-text.png
-        designed_by:
-          name: 2i2c
-          url: https://2i2c.org
-        operated_by:
-          name: 2i2c
-          url: https://2i2c.org
-        funded_by:
-          name: University of California, Merced
-          url: http://www.ucmerced.edu/
   singleuser:
     image:
       name: quay.io/2i2c/2i2c-hubs-image
       tag: "14107b8a85fb"
   hub:
     config:
-      Authenticator:
-        admin_users:
-          - [email protected]
-      JupyterHub:
-        authenticator_class: cilogon
       CILogonOAuthenticator:
         oauth_callback_url: https://ucmerced.2i2c.cloud/hub/oauth_callback
-        allowed_idps:
-          urn:mace:incommon:ucmerced.edu:
-            username_derivation:
-              username_claim: "eppn"
-            allow_all: true
-          http://google.com/accounts/o8/id:
-            username_derivation:
-              username_claim: "email"
-            allowed_domains:
-              - "2i2c.org"