Merge branch 'master' into patch-10

2i2c-org · Mar 20, 2024 · c437c50 · c437c50
2 parents d18e381 + 0579ad7
commit c437c50
Show file tree

Hide file tree

Showing 32 changed files with 1,234 additions and 42 deletions.
diff --git a/config/clusters/2i2c-aws-us/showcase.values.yaml b/config/clusters/2i2c-aws-us/showcase.values.yaml
@@ -89,17 +89,18 @@ basehub:
                   display_name: Jupyter SciPy
                   slug: jupyter-scipy
                   kubespawner_override:
-                    image: jupyter/scipy-notebook:2023-06-27
+                    image: quay.io/jupyter/scipy-notebook:2024-03-18
                 jupyter-datascience:
                   display_name: Jupyter DataScience
                   slug: jupyter-datascience
                   kubespawner_override:
-                    image: jupyter/datascience-notebook:2023-06-27
+                    image: quay.io/jupyter/datascience-notebook:2024-03-18
                 rocker-geospatial:
                   display_name: Rocker Geospatial
                   slug: rocker-geospatial
                   kubespawner_override:
                     image: rocker/binder:4.3
+                    image_pull_policy: Always
                     # Launch into RStudio after the user logs in
                     default_url: /rstudio
                     # Ensures container working dir is homedir
@@ -148,17 +149,18 @@ basehub:
                   display_name: Jupyter SciPy
                   slug: jupyter-scipy
                   kubespawner_override:
-                    image: jupyter/scipy-notebook:2023-06-27
+                    image: quay.io/jupyter/scipy-notebook:2024-03-18
                 jupyter-datascience:
                   display_name: Jupyter DataScience
                   slug: jupyter-datascience
                   kubespawner_override:
-                    image: jupyter/datascience-notebook:2023-06-27
+                    image: quay.io/jupyter/datascience-notebook:2024-03-18
                 rocker-geospatial:
                   display_name: Rocker Geospatial
                   slug: rocker-geospatial
                   kubespawner_override:
                     image: rocker/binder:4.3
+                    image_pull_policy: Always
                     # Launch into RStudio after the user logs in
                     default_url: /rstudio
                     # Ensures container working dir is homedir

diff --git a/config/clusters/2i2c/imagebuilding-demo.values.yaml b/config/clusters/2i2c/imagebuilding-demo.values.yaml
@@ -57,6 +57,7 @@ jupyterhub:
                 slug: geospatial
                 kubespawner_override:
                   image: rocker/binder:4.3
+                  image_pull_policy: Always
                   # Launch into RStudio after the user logs in
                   default_url: /rstudio
                   # Ensures container working dir is homedir
@@ -66,7 +67,7 @@ jupyterhub:
                 display_name: Jupyter SciPy Notebook
                 slug: scipy
                 kubespawner_override:
-                  image: jupyter/scipy-notebook:2023-06-26
+                  image: quay.io/jupyter/scipy-notebook:2024-03-18
           resources:
             display_name: Resource Allocation
             choices:

diff --git a/config/clusters/catalystproject-africa/cluster.yaml b/config/clusters/catalystproject-africa/cluster.yaml
@@ -42,3 +42,27 @@ hubs:
       - common.values.yaml
       - uvri.values.yaml
       - enc-uvri.secret.values.yaml
+  - name: wits
+    display_name: "Catalyst Project, Africa - WITS"
+    domain: wits.af.catalystproject.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - wits.values.yaml
+      - enc-wits.secret.values.yaml
+  - name: kush
+    display_name: "Catalyst Project, Africa - KUSH"
+    domain: kush.af.catalystproject.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - kush.values.yaml
+      - enc-kush.secret.values.yaml
+  - name: molerhealth
+    display_name: "Catalyst Project, Africa - MolerHealth "
+    domain: molerhealth.af.catalystproject.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - molerhealth.values.yaml
+      - enc-molerhealth.secret.values.yaml
diff --git a/config/clusters/catalystproject-africa/common.values.yaml b/config/clusters/catalystproject-africa/common.values.yaml
@@ -64,6 +64,7 @@ jupyterhub:
         slug: rocker
         kubespawner_override:
           image: rocker/binder:4.3
+          image_pull_policy: Always
           default_url: /rstudio
           working_dir: /home/rstudio # Ensures container working dir is homedir
           node_selector:

diff --git a/config/clusters/catalystproject-africa/enc-kush.secret.values.yaml b/config/clusters/catalystproject-africa/enc-kush.secret.values.yaml
@@ -0,0 +1,20 @@
+jupyterhub:
+    hub:
+        config:
+            GitHubOAuthenticator:
+                client_id: ENC[AES256_GCM,data:Gkmq+33RgGILWWMxNBBSanflwwE=,iv:hps2UpDP6V8lppuKb9RnIWLTJ0PvtpTZiRrlxpzBkJ4=,tag:aIgWTM58Co8jnS1XY+Prog==,type:str]
+                client_secret: ENC[AES256_GCM,data:qhC0EQqw/xMn6MoLX/Qg5490EKs1gAn2vMjbFbyjkz8MLkIyD7IPeg==,iv:qtcya1NLgQqrIVvpQjk7nD6pYopoihApH56nG+BwGds=,tag:SJXcutZaLIG0aJuTh2O9MA==,type:str]
+sops:
+    kms: []
+    gcp_kms:
+        - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
+          created_at: "2024-03-16T18:56:57Z"
+          enc: CiUA4OM7eC6pPiGwZPvMCnBtZyxMHkHbqj83JS4/nUqeByc90ku6EkkAXoW3JmO+LiuyXhEwZw2g6VZx+pclkjt791ly42bEOuJ54S21YpSROCZbn2UtwQ6X5K2BcPlUjiGs+/YmFcXQn0SkxtP5T1/Q
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2024-03-16T18:56:59Z"
+    mac: ENC[AES256_GCM,data:DvnKusaKQFCAWMPWEWPNA9EfBQQ1pBJ82hiNvGn/DIBwlHRf1E4QBV+ZiajPSdLGMSl+Fi1aPPsLYwmK7Kn/oH5zERWnzNFFMwbdobUetrz/AOExKHWztPKqj9Ckf/k5trN3Jc4B9bpvsQuj9jLP9kVVQX7L4Sv4x6OSH2U45BI=,iv:oY/fSrjgTgl7HkaoblGjfH64GYRh254oBzEoaf5o/jc=,tag:VPPCYnzbl4xa2TTTXkef6A==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1
diff --git a/config/clusters/catalystproject-africa/enc-molerhealth.secret.values.yaml b/config/clusters/catalystproject-africa/enc-molerhealth.secret.values.yaml
@@ -0,0 +1,20 @@
+jupyterhub:
+    hub:
+        config:
+            GitHubOAuthenticator:
+                client_id: ENC[AES256_GCM,data:9LqPZVvDDjL9yTYm7vyPTowA+uM=,iv:7q7PhCj5WuS2/UEqjKmeqY+xliv865Q3OUO78DI0ETo=,tag:dIUB4Jo3LMjb6eEvKxii0A==,type:str]
+                client_secret: ENC[AES256_GCM,data:y/fXvq5IlCVsP8KY4ix1/KXoaH9eJw9k3fwGbczcheHzANC1IlT6kw==,iv:CDokEvuSGOKKM7f9lUyu3kqPw3FFtkR7TGbG4QH0RIM=,tag:JXfQLCDBZ3L9h74Ld5qYtw==,type:str]
+sops:
+    kms: []
+    gcp_kms:
+        - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
+          created_at: "2024-03-16T19:10:31Z"
+          enc: CiUA4OM7eH/kl/O91dxTRQFjbMaOGogUIJKSl5pn8Y1u9ffhNVOzEkkAXoW3JlzJ8d8nmYdsLHn5MrYSm8ikApQ415l4Zvchcom2dCGTgT3U92U/4Jk+qu8DUO1BNEH5ZyZxvAmOSWwJRvAB11c4XcJH
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2024-03-16T19:10:32Z"
+    mac: ENC[AES256_GCM,data:CSjKR1oQP/Ua21HOEGGc6l1vFN41/hgTSOu7WrANAy88PzffHW+Q2M5+AASHE0udrO4E4+TKKQ7R2h1xFyGil/b3U0545CRT1imtgX7Ixin/vqLjFT/f6hGfvyQ9UM7FfDsTWbaeZylGPekuTenmsI4gz1Uwrxz1pCjSP0wJo5k=,iv:JDBCbX6740RJsvo4A06/hEhXNg+QOupkRRihsaOjfpg=,tag:XmoSINsm1cxJKP3ipySD5A==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1
diff --git a/config/clusters/catalystproject-africa/enc-wits.secret.values.yaml b/config/clusters/catalystproject-africa/enc-wits.secret.values.yaml
@@ -0,0 +1,20 @@
+jupyterhub:
+    hub:
+        config:
+            GitHubOAuthenticator:
+                client_id: ENC[AES256_GCM,data:pJQFrWrenwY7jHiFBGTVCMZLu5w=,iv:MLrLiqdz5iHDsKwjsw77zU9kULxdmIOmOQgjh++Cook=,tag:64gcyzERRwSKbJkplC9ukw==,type:str]
+                client_secret: ENC[AES256_GCM,data:Bl/t9kN0Pynlg6rTzR2PZ8OawzxYCpmYb1qXvz4M4lbQjPQht8xyuA==,iv:dwot4RZoaMRKNdF/BHytae7Vj6FVleifQcpa+XFiHaU=,tag:vQVA1olAuQ8Dk7uoGVE1Bg==,type:str]
+sops:
+    kms: []
+    gcp_kms:
+        - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
+          created_at: "2024-03-16T18:43:27Z"
+          enc: CiUA4OM7eEOOAxlm3aaJ0/2+Bli6lMIms5g1F1McTvczHLD5E2JXEkkAXoW3JjnvcvLqZazPKNcY4tnlJ0iQEDal1Ij1TrN/eoLguy7dvBhuBctyeYbgaHBjOfQMIOq2T+UAaEF3Kqs7gM542nJjC66Q
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2024-03-16T18:43:28Z"
+    mac: ENC[AES256_GCM,data:VDU1vuVnL8SJXHdnlYGW4RWGZHfA/VKI3UpdH8v8sMynHTJsNa/4jsuWMapx9/3mEwJJ4gxsZFTkQ4I2U8SH4O3oIM1SZTIyAjn8ZfKk4UQrUXYiqGR/lwJVP7XBNpIj4XFDkjMCt7K/3YwgmHiorX8mLopCjsHhNO6WAUqGCDw=,iv:Go+Y30GoGswvkFNVb3rizc/DXB8iikSs8lYBqMCm8zY=,tag:83a8GVibHY+y4Pp5OqfnOg==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1
diff --git a/config/clusters/catalystproject-africa/kush.values.yaml b/config/clusters/catalystproject-africa/kush.values.yaml
@@ -0,0 +1,31 @@
+jupyterhub:
+  ingress:
+    hosts: [kush.af.catalystproject.2i2c.cloud]
+    tls:
+      - hosts: [kush.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 - KUSH
+          url: https://catalystproject.cloud/
+          logo_url: https://catalystproject.cloud/_images/catalyst-icon-dark.png
+  hub:
+    config:
+      JupyterHub:
+        authenticator_class: github
+      GitHubOAuthenticator:
+        oauth_callback_url: https://kush.af.catalystproject.2i2c.cloud/hub/oauth_callback
+        allowed_organizations:
+          - CatalystProject-Hubs:kush
+        scope:
+          - read:org
+      Authenticator:
+        admin_users:
+          - Fadlelmola
diff --git a/config/clusters/catalystproject-africa/molerhealth.values.yaml b/config/clusters/catalystproject-africa/molerhealth.values.yaml
@@ -0,0 +1,31 @@
+jupyterhub:
+  ingress:
+    hosts: [molerhealth.af.catalystproject.2i2c.cloud]
+    tls:
+      - hosts: [molerhealth.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 - MolerHealth
+          url: https://catalystproject.cloud/
+          logo_url: https://catalystproject.cloud/_images/catalyst-icon-dark.png
+  hub:
+    config:
+      JupyterHub:
+        authenticator_class: github
+      GitHubOAuthenticator:
+        oauth_callback_url: https://molerhealth.af.catalystproject.2i2c.cloud/hub/oauth_callback
+        allowed_organizations:
+          - CatalystProject-Hubs:molerhealth
+        scope:
+          - read:org
+      Authenticator:
+        admin_users:
+          - Monsurat-Onabajo
diff --git a/config/clusters/catalystproject-africa/wits.values.yaml b/config/clusters/catalystproject-africa/wits.values.yaml
@@ -0,0 +1,31 @@
+jupyterhub:
+  ingress:
+    hosts: [wits.af.catalystproject.2i2c.cloud]
+    tls:
+      - hosts: [wits.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 - WITS
+          url: https://catalystproject.cloud/
+          logo_url: https://catalystproject.cloud/_images/catalyst-icon-dark.png
+  hub:
+    config:
+      JupyterHub:
+        authenticator_class: github
+      GitHubOAuthenticator:
+        oauth_callback_url: https://wits.af.catalystproject.2i2c.cloud/hub/oauth_callback
+        allowed_organizations:
+          - CatalystProject-Hubs:wits
+        scope:
+          - read:org
+      Authenticator:
+        admin_users:
+          - gentlelab2016
diff --git a/config/clusters/catalystproject-latam/common.values.yaml b/config/clusters/catalystproject-latam/common.values.yaml
@@ -50,6 +50,7 @@ jupyterhub:
         slug: rocker
         kubespawner_override:
           image: rocker/binder:4.3
+          image_pull_policy: Always
           default_url: /rstudio
           working_dir: /home/rstudio # Ensures container working dir is homedir
         profile_options: *profile_options

diff --git a/config/clusters/cloudbank/sbcc-dev.values.yaml b/config/clusters/cloudbank/sbcc-dev.values.yaml
@@ -30,10 +30,6 @@ jupyterhub:
       CILogonOAuthenticator:
         oauth_callback_url: "https://sbcc-dev.cloudbank.2i2c.cloud/hub/oauth_callback"
         allowed_idps:
-          https://idp.sbcc.edu/idp/shibboleth:
-            default: true
-            username_derivation:
-              username_claim: "email"
           http://google.com/accounts/o8/id:
             username_derivation:
               username_claim: "email"

diff --git a/config/clusters/cloudbank/sbcc.values.yaml b/config/clusters/cloudbank/sbcc.values.yaml
@@ -30,10 +30,6 @@ jupyterhub:
       CILogonOAuthenticator:
         oauth_callback_url: "https://sbcc.cloudbank.2i2c.cloud/hub/oauth_callback"
         allowed_idps:
-          https://idp.sbcc.edu/idp/shibboleth:
-            default: true
-            username_derivation:
-              username_claim: "email"
           http://google.com/accounts/o8/id:
             username_derivation:
               username_claim: "email"

diff --git a/config/clusters/cloudbank/srjc.values.yaml b/config/clusters/cloudbank/srjc.values.yaml
@@ -36,6 +36,11 @@ jupyterhub:
       CILogonOAuthenticator:
         oauth_callback_url: https://srjc.cloudbank.2i2c.cloud/hub/oauth_callback
         allowed_idps:
+          http://login.microsoftonline.com/common/oauth2/v2.0/authorize:
+            username_derivation:
+              username_claim: "email"
+            allowed_domains:
+              - "santarosa.edu"
           http://google.com/accounts/o8/id:
             default: true
             username_derivation:
@@ -47,4 +52,6 @@ jupyterhub:
           - [email protected]
           - [email protected]
           - [email protected]
-          - [email protected]
+          - [email protected]
+          - [email protected]
+          - [email protected]
diff --git a/config/clusters/earthscope/common.values.yaml b/config/clusters/earthscope/common.values.yaml
@@ -174,12 +174,14 @@ basehub:
                   display_name: Jupyter
                   slug: jupyter-scipy
                   kubespawner_override:
+                    # FIXME: use quay.io/ for tags after 2023-10-20
                     image: jupyter/scipy-notebook:2023-06-27
                 rocker-geospatial:
                   display_name: RStudio
                   slug: rocker-geospatial
                   kubespawner_override:
                     image: rocker/binder:4.3
+                    image_pull_policy: Always
                     # Launch into RStudio after the user logs in
                     default_url: /rstudio
                     # Ensures container working dir is homedir

diff --git a/config/clusters/hhmi/common.values.yaml b/config/clusters/hhmi/common.values.yaml
@@ -165,6 +165,7 @@ basehub:
                   slug: rocker
                   kubespawner_override:
                     image: rocker/binder:4.3
+                    image_pull_policy: Always
                     # Launch RStudio after the user logs in
                     default_url: /rstudio
                     # Ensures container working dir is homedir

diff --git a/config/clusters/jupyter-meets-the-earth/common.values.yaml b/config/clusters/jupyter-meets-the-earth/common.values.yaml
@@ -128,6 +128,7 @@ basehub:
                   display_name: Jupyter DockerStacks Julia Notebook
                   slug: "julia"
                   kubespawner_override:
+                    # FIXME: use quay.io/ for tags after 2023-10-20
                     image: "jupyter/julia-notebook:2023-07-05"
         - display_name: "4th of Medium: 1-4 CPU, 4-16 GB"
           description: "A shared machine."

diff --git a/config/clusters/nasa-ghg/common.values.yaml b/config/clusters/nasa-ghg/common.values.yaml
@@ -140,6 +140,7 @@ basehub:
           description: R environment with many geospatial libraries pre-installed
           kubespawner_override:
             image: rocker/binder:4.3
+            image_pull_policy: Always
             # Launch RStudio after the user logs in
             default_url: /rstudio
             # Ensures container working dir is homedir

diff --git a/config/clusters/nasa-veda/common.values.yaml b/config/clusters/nasa-veda/common.values.yaml
@@ -48,7 +48,6 @@ basehub:
             - CYGNSS-VEDA:cygnss-iwg
             - veda-analytics-access:maap-biomass-team
             - Earth-Information-System:eis-fire
-            - nasa-veda-workshops:ieee-grss-webinar-mar-2024
           scope:
             - read:org
         Authenticator:
@@ -178,6 +177,7 @@ basehub:
           description: R environment with many geospatial libraries pre-installed
           kubespawner_override:
             image: rocker/binder:4.3
+            image_pull_policy: Always
             # Launch RStudio after the user logs in
             default_url: /rstudio
             # Ensures container working dir is homedir

diff --git a/config/clusters/opensci/sciencecore.values.yaml b/config/clusters/opensci/sciencecore.values.yaml
@@ -56,6 +56,7 @@ jupyterhub:
                 slug: geospatial
                 kubespawner_override:
                   image: rocker/binder:4.3
+                  image_pull_policy: Always
                   # Launch into RStudio after the user logs in
                   default_url: /rstudio
                   # Ensures container working dir is homedir
@@ -65,6 +66,7 @@ jupyterhub:
                 display_name: Jupyter SciPy Notebook
                 slug: scipy
                 kubespawner_override:
+                  # FIXME: use quay.io/ for tags after 2023-10-20
                   image: jupyter/scipy-notebook:2023-06-26
           resources:
             display_name: Resource Allocation

diff --git a/config/clusters/opensci/staging.values.yaml b/config/clusters/opensci/staging.values.yaml
@@ -56,6 +56,7 @@ jupyterhub:
                 slug: geospatial
                 kubespawner_override:
                   image: rocker/binder:4.3
+                  image_pull_policy: Always
                   # Launch into RStudio after the user logs in
                   default_url: /rstudio
                   # Ensures container working dir is homedir
@@ -65,6 +66,7 @@ jupyterhub:
                 display_name: Jupyter SciPy Notebook
                 slug: scipy
                 kubespawner_override:
+                  # FIXME: use quay.io/ for tags after 2023-10-20
                   image: jupyter/scipy-notebook:2023-06-26
           resources:
             display_name: Resource Allocation