Merge pull request 2i2c-org#3629 from AIDEA775/new-hub-uvri

Add UVRI hub on catalystproject-africa cluster
sgibson91 · Jan 26, 2024 · 9765ce5 · 9765ce5
2 parents ae91f9a + 71d344a
commit 9765ce5
Show file tree

Hide file tree

Showing 3 changed files with 100 additions and 0 deletions.
diff --git a/config/clusters/catalystproject-africa/cluster.yaml b/config/clusters/catalystproject-africa/cluster.yaml
@@ -34,3 +34,11 @@ hubs:
       - common.values.yaml
       - must.values.yaml
       - enc-must.secret.values.yaml
+  - name: uvri
+    display_name: "Catalyst Project, Africa - UVRI"
+    domain: uvri.af.catalystproject.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - uvri.values.yaml
+      - enc-uvri.secret.values.yaml
diff --git a/config/clusters/catalystproject-africa/enc-uvri.secret.values.yaml b/config/clusters/catalystproject-africa/enc-uvri.secret.values.yaml
@@ -0,0 +1,20 @@
+jupyterhub:
+    hub:
+        config:
+            GitHubOAuthenticator:
+                client_id: ENC[AES256_GCM,data:eg4yo+7kobztYqLXpeR3vcQtXIU=,iv:v7u+Soe3C+cj5sAhTP7Cv6HwMpNhJ2T7PsER0Hrr//M=,tag:Q9y22FgQlEIlzFiQLxXFFw==,type:str]
+                client_secret: ENC[AES256_GCM,data:BA4HqDHaWCgRqWuKikUasKh+aqTBm+Q7j4D1U0OfbOwxIx6kHKc8gQ==,iv:ZVw7RFLm4s0iSPEAiibFxOjfRxlcqNwnv18peDq/Lgk=,tag:j5fKtwvvuF3K2LdAE3LMsQ==,type:str]
+sops:
+    kms: []
+    gcp_kms:
+        - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
+          created_at: "2024-01-19T19:50:33Z"
+          enc: CiUA4OM7eMb0zTHlzhLypRrf0SjUiVx7JlJThSHKlNYroiPeRR11EkkAjTWv+k7KcyKwMMfp+QIGzPoWp+4CkmNl9pz/mAB3v8/6xFjimprYziUq99t9NrH+sdGtWua+AEgL808qn9Y6khAJ/uH4zJuN
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2024-01-19T19:50:34Z"
+    mac: ENC[AES256_GCM,data:0V0DG6N5cQ8Wgr2wuZjEDqWIk5gAgbxJj2aG6CF+Ct3nEMz1hG9kK+2QeSJTBt8Yclkb08pw62DUhGxD9MXOM0jDv8PRck7w02179sRzLZPX9tqlk61IuywINmsD5B0qozwRBiBIyGXCCQYI7FngxYPsqCrYZTKp0El6P9CXXy8=,iv:tuEYh5OWhK6YlcEh/uph0pVIzWC1SgyrwjMLUC0Rj04=,tag:CQubFcxH6Jh9Ceilq4GSqg==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1
diff --git a/config/clusters/catalystproject-africa/uvri.values.yaml b/config/clusters/catalystproject-africa/uvri.values.yaml
@@ -0,0 +1,72 @@
+jupyterhub:
+  ingress:
+    hosts: [uvri.af.catalystproject.2i2c.cloud]
+    tls:
+      - hosts: [uvri.af.catalystproject.2i2c.cloud]
+        secretName: https-auto-tls
+  custom:
+    2i2c:
+      add_staff_user_ids_to_admin_users: true
+      add_staff_user_ids_of_type: "github"
+    jupyterhubConfigurator:
+      enabled: false
+    homepage:
+      templateVars:
+        org:
+          name: Catalyst Project, Africa - UVRI
+          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: Chan Zuckerberg Initiative - Open Science
+          url: "https://chanzuckerberg.com/science/programs-resources/open-science/"
+  hub:
+    config:
+      JupyterHub:
+        authenticator_class: github
+      GitHubOAuthenticator:
+        oauth_callback_url: https://uvri.af.catalystproject.2i2c.cloud/hub/oauth_callback
+        allowed_organizations:
+          - CatalystProject-Hubs:uvri
+        scope:
+          - read:org
+      Authenticator:
+        admin_users:
+          - eddUG
+  singleuser:
+    profileList:
+      - display_name: Jupyter
+        slug: jupyter-scipy
+        description: "Python environment"
+        default: true
+        kubespawner_override:
+          image: jupyter/scipy-notebook:2023-06-27
+          default_url: /lab
+        profile_options: &profile_options
+          resource_allocation:
+            display_name: Resource Allocation
+            choices:
+              mem_8:
+                default: true
+                display_name: ~8 GB RAM, ~1.0 CPU
+                kubespawner_override:
+                  mem_guarantee: 6.684G
+                  cpu_guarantee: 0.75
+                  mem_limit: null
+                  cpu_limit: null
+                  node_selector:
+                    node.kubernetes.io/instance-type: r5.xlarge
+      - display_name: RStudio
+        description: R environment
+        kubespawner_override:
+          image: rocker/binder:4.3
+          default_url: /rstudio
+          # Ensures container working dir is homedir
+          # https://github.com/2i2c-org/infrastructure/issues/2559
+          working_dir: /home/rstudio
+        profile_options: *profile_options