Merge pull request #4025 from AIDEA775/catalyst-hubs-3

catalyst-latam: add iner, uccl, unam and uprrp hubs
2i2c-org · May 6, 2024 · a247e33 · a247e33
2 parents 3128ea5 + 73b8b0a
commit a247e33
Show file tree

Hide file tree

Showing 14 changed files with 229 additions and 39 deletions.
diff --git a/config/clusters/catalystproject-latam/cicada.values.yaml b/config/clusters/catalystproject-latam/cicada.values.yaml
@@ -5,21 +5,12 @@ jupyterhub:
       - hosts: [cicada.latam.catalystproject.2i2c.cloud]
         secretName: https-auto-tls
   custom:
-    2i2c:
-      add_staff_user_ids_to_admin_users: true
-      add_staff_user_ids_of_type: "github"
     homepage:
       templateVars:
         org:
           name: Catalyst Project, LatAm - CICADA
           url: "https://cicada.uy/"
           logo_url: https://cicada.uy/wp-content/uploads/2021/07/Logo-Cicada-e1625771419399.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/"

diff --git a/config/clusters/catalystproject-latam/cluster.yaml b/config/clusters/catalystproject-latam/cluster.yaml
@@ -49,3 +49,35 @@ hubs:
       - common.values.yaml
       - gita.values.yaml
       - enc-gita.secret.values.yaml
+  - name: iner
+    display_name: "Catalyst Project, LatAm - INER"
+    domain: iner.latam.catalystproject.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - iner.values.yaml
+      - enc-iner.secret.values.yaml
+  - name: plnc
+    display_name: "Catalyst Project, LatAm - PLNC"
+    domain: plnc.latam.catalystproject.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - plnc.values.yaml
+      - enc-plnc.secret.values.yaml
+  - name: unam
+    display_name: "Catalyst Project, LatAm - UNAM"
+    domain: unam.latam.catalystproject.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - unam.values.yaml
+      - enc-unam.secret.values.yaml
+  - name: uprrp
+    display_name: "Catalyst Project, LatAm - UPRRP"
+    domain: uprrp.latam.catalystproject.2i2c.cloud
+    helm_chart: basehub
+    helm_chart_values_files:
+      - common.values.yaml
+      - uprrp.values.yaml
+      - enc-uprrp.secret.values.yaml
diff --git a/config/clusters/catalystproject-latam/common.values.yaml b/config/clusters/catalystproject-latam/common.values.yaml
@@ -10,6 +10,24 @@ nfs:
     # Name of Google Filestore share
     baseShareName: /homes/
 jupyterhub:
+  custom:
+    2i2c:
+      add_staff_user_ids_to_admin_users: true
+      add_staff_user_ids_of_type: "github"
+    homepage:
+      templateVars:
+        designed_by:
+          name: "2i2c"
+          url: https://2i2c.org
+        operated_by:
+          name: "2i2c"
+          url: https://2i2c.org
+        funded_by:
+          name: Catalyst Project
+          url: https://catalystproject.cloud
+        org:
+          url: https://catalystproject.cloud
+          logo_url: https://catalystproject.cloud/_static/catalyst-logo-dark-bg-white.png
   hub:
     allowNamedServers: true
   singleuser:

diff --git a/config/clusters/catalystproject-latam/enc-iner.secret.values.yaml b/config/clusters/catalystproject-latam/enc-iner.secret.values.yaml
@@ -0,0 +1,20 @@
+jupyterhub:
+    hub:
+        config:
+            GitHubOAuthenticator:
+                client_id: ENC[AES256_GCM,data:rHf8VPz2bKGl3UMUeSzwPXa8nBA=,iv:JJFcwUunDfMoNUABiXRfV9C5BuaGLQYCvGDFyBWCxgU=,tag:q4u8wS1BtTEDRjiTVVFXOg==,type:str]
+                client_secret: ENC[AES256_GCM,data:c4AKrOOkxFBkzghTOL5+36WjBVnV19E305ER66Rs136Ot4rVPjv9CQ==,iv:ET6a4aoWAnkNa3DbVKP8Ot1t0wZyIAZGIeo0yh2h4p4=,tag:aSyKtnupIET6udr6V7WSDw==,type:str]
+sops:
+    kms: []
+    gcp_kms:
+        - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
+          created_at: "2024-05-02T15:00:10Z"
+          enc: CiUA4OM7eK4gZY/ziup1ECZNetmXDilkTlejSe/paVHp4oQNcGKyEkkAXoW3Jn3Yvn4zrnsGQWy+wmqCuqH+k82OaT9c+HE4f9aaIaNuPBLfCyTW2bJ0uzMwEpMNQCX8vBG2trOguQqJBYrDKTpB5WWV
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2024-05-02T15:00:12Z"
+    mac: ENC[AES256_GCM,data:y+NQnEtqwBOWUWTUa/JF6o63bU8igfPm9IA1yPo8sTXuVdv3FEFFDidvPWOGfZK99d92s3WgSk+y/iw1blZ0foqCB/N2F7F+hUsUp2ZUFWHUGtNRu7XBQkEZZoVOy0qqMacaVT6WFeWbkVac8B/TzwWqSrZfROeum3Krcm1s6B4=,iv:sMCdkuduxQFda1yabzAX6s3u9I1F3KYNgv5Wp7Wftzk=,tag:dsmxLLAhSirKrGnFy1QnWg==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1
diff --git a/config/clusters/catalystproject-latam/enc-plnc.secret.values.yaml b/config/clusters/catalystproject-latam/enc-plnc.secret.values.yaml
@@ -0,0 +1,20 @@
+jupyterhub:
+    hub:
+        config:
+            GitHubOAuthenticator:
+                client_id: ENC[AES256_GCM,data:36zk6wa+cFMd5NUiXZ97laUKozI=,iv:0L2EL82eOQ4IhZObaS1h71FJr2mlmPJEs4ELvsWzCso=,tag:+AQCIISgMS7U887yOpHU2Q==,type:str]
+                client_secret: ENC[AES256_GCM,data:QF3UzuABO4qEWEVhuyTL/d8gTM14s0AG0jZxoNw2JxPBPuwcXp9/RA==,iv:E/kT+TQdLnrhF8iTGndLFSfqml6Jhw6asWlUMFtgFbg=,tag:m3v977vNLx9QDxm3DgAVBQ==,type:str]
+sops:
+    kms: []
+    gcp_kms:
+        - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
+          created_at: "2024-05-03T14:33:50Z"
+          enc: CiUA4OM7eBk8ecY80TDlUc2B5eRpSi6fOX+bim/yZTDJpWPofJCdEkkAXoW3JmG8+Q7Vwvb88N/o1VCeNpsybIUgqyWng4mU0J4GmjGNdKqTcZ6nLrzwWbkvyhXztrDaJrV4gWyOccbpTXksZLw+KwAI
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2024-05-03T14:33:51Z"
+    mac: ENC[AES256_GCM,data:egXR6eqQHdW/2/5yenOWCoBug6/W7ltfkRYypys15eWDmEpf+hwffob0bnCpwEX1EWTjQZba2qiOHnJ6fFHNOFdMHDC0o3Yp9JWL39gSjlWz08Rdsyayvorr62E1ea3TzKfVw1U+xI31waM4JsziGPrEBWDN1dJQkkxLEsao6e8=,iv:/nHQWBNaJWKXwpx4FIP2TU9xek1kxtaBKVhA5A++cs8=,tag:zarnzXSC67d/5i/QBi+xfw==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1
diff --git a/config/clusters/catalystproject-latam/enc-unam.secret.values.yaml b/config/clusters/catalystproject-latam/enc-unam.secret.values.yaml
@@ -0,0 +1,20 @@
+jupyterhub:
+    hub:
+        config:
+            GitHubOAuthenticator:
+                client_id: ENC[AES256_GCM,data:IdyxYRUzBsYzkduGgtR9SVXDxOQ=,iv:3mSRTVOXfiXI4o30rUIunBMhZjOJW9J7eZSF/YsIk+k=,tag:QuLYZGm4AKHk6mPbmgIR1g==,type:str]
+                client_secret: ENC[AES256_GCM,data:7WKtRkN5njRN7II3eOyeMLiJ9sE13zZBYJfvayL6Jwjl1MzkgzRPHg==,iv:bRF1RiclgggouVmce0QNZlDz01FnDG6pgkRAMgBlVR0=,tag:61BugpFc3GgceOVgVho22g==,type:str]
+sops:
+    kms: []
+    gcp_kms:
+        - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
+          created_at: "2024-05-02T15:00:33Z"
+          enc: CiUA4OM7eOsvfDrm9q05SYcJvbI4JEz767+anOFPRUhec4ieV1TKEkkAXoW3JgvtZORNEdt35Kwfgf/v1Ruv7YEbJDSnAskuZbqcvOViq07AIHZJ5JlzhFmqnW4FRrFKMpXKuvlEzxfvVK97OXNsvn1X
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2024-05-02T15:00:34Z"
+    mac: ENC[AES256_GCM,data:wLy1RdAUVRBxykgORNSzi1yIfP4iSVtX6A3ARXLrix7iPx6UkgGNgr7uTInOafMbP3Qk7LN4vQqbVgKPIi+tzpT2Nqa07GF0ptc9WJ0Q6iJGhcrtsJdo/GSrBhI7TUWUyb1hxpjd9vUElRzA0XTNjAzgNmj5RIQZsKrpLktSkl4=,iv:HdqF+NaSmJGM8YLsu4UsB2+N+59s41WrN+ULs0xo4xE=,tag:NCJ5wpCcbiRyO7vh2Tx1nA==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1
diff --git a/config/clusters/catalystproject-latam/enc-uprrp.secret.values.yaml b/config/clusters/catalystproject-latam/enc-uprrp.secret.values.yaml
@@ -0,0 +1,20 @@
+jupyterhub:
+    hub:
+        config:
+            GitHubOAuthenticator:
+                client_id: ENC[AES256_GCM,data:dh6vO+PMk4S88fcc891xtnYYMe8=,iv:UE0MjgHDmDAd8PC/WQhg//Wb5O5wyPTApyWbfoDKlYw=,tag:z8oSZOWvk111TNkzlEeW4Q==,type:str]
+                client_secret: ENC[AES256_GCM,data:UON9plGMkcWvmLt+8rmU+QVFvcx7O/F8kMpG7UfB0dS8AUlG1jxFSA==,iv:hXp0fgkv35Gydd3JK7Vx50FvgbCZc7B0lXFs4R9FyO8=,tag:ZiBX1ulRH0VLm7ailPJkog==,type:str]
+sops:
+    kms: []
+    gcp_kms:
+        - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
+          created_at: "2024-05-02T15:00:40Z"
+          enc: CiUA4OM7eCkTCcNeF/cwRQ63rUTrxVnTHo6NYFkY3DQRXsKOPZ1UEkkAXoW3JhQ0vMEIdli2NULWMnaBy4WwxhUQVz+OdaW1GRztmu53Cb7Obu0ro1DA6grkSnf8aIms7LazXj10SX7BVGgHKPOG460D
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2024-05-02T15:00:42Z"
+    mac: ENC[AES256_GCM,data:TEWurfqem/9PO/NLD8va6Zj+KLZfff4eIAI3QuPp6l7ePUGryy36yNWAZFspk0EfeICMgHDCJBM0onxP8lOFyvZzVXVZNATzxq7U7V/lPQeloK1uP/aAWRAnUA5byx3ALtXvXTcm27GVaPtE77ahaGHrTZabjj9wPg07j7/IPyg=,iv:1HoUvFIrXFnGtVSpzhR/HFtJqlSjqYBGVjIFK+tTFqo=,tag:ntOF6aLv6ojyq/rMBggSVg==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1
diff --git a/config/clusters/catalystproject-latam/gita.values.yaml b/config/clusters/catalystproject-latam/gita.values.yaml
@@ -5,21 +5,12 @@ jupyterhub:
       - hosts: [gita.latam.catalystproject.2i2c.cloud]
         secretName: https-auto-tls
   custom:
-    2i2c:
-      add_staff_user_ids_to_admin_users: true
-      add_staff_user_ids_of_type: "github"
     homepage:
       templateVars:
         org:
           name: Catalyst Project, LatAm - GITA
           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/"

diff --git a/config/clusters/catalystproject-latam/iner.values.yaml b/config/clusters/catalystproject-latam/iner.values.yaml
@@ -0,0 +1,25 @@
+jupyterhub:
+  ingress:
+    hosts: [iner.latam.catalystproject.2i2c.cloud]
+    tls:
+      - hosts: [iner.latam.catalystproject.2i2c.cloud]
+        secretName: https-auto-tls
+  custom:
+    homepage:
+      templateVars:
+        org:
+          name: Catalyst Project, LatAm - INER
+  hub:
+    config:
+      JupyterHub:
+        authenticator_class: github
+      GitHubOAuthenticator:
+        oauth_callback_url: https://iner.latam.catalystproject.2i2c.cloud/hub/oauth_callback
+        allowed_organizations:
+          - CatalystProject-Hubs:iner
+        scope:
+          - read:org
+      Authenticator:
+        admin_users:
+          - Gabo8611
+          - Yalbibalderas
diff --git a/config/clusters/catalystproject-latam/plnc.values.yaml b/config/clusters/catalystproject-latam/plnc.values.yaml
@@ -0,0 +1,24 @@
+jupyterhub:
+  ingress:
+    hosts: [plnc.latam.catalystproject.2i2c.cloud]
+    tls:
+      - hosts: [plnc.latam.catalystproject.2i2c.cloud]
+        secretName: https-auto-tls
+  custom:
+    homepage:
+      templateVars:
+        org:
+          name: Catalyst Project, LatAm - PLNC
+  hub:
+    config:
+      JupyterHub:
+        authenticator_class: github
+      GitHubOAuthenticator:
+        oauth_callback_url: https://plnc.latam.catalystproject.2i2c.cloud/hub/oauth_callback
+        allowed_organizations:
+          - CatalystProject-Hubs:plnc
+        scope:
+          - read:org
+      Authenticator:
+        admin_users:
+          - fvillena
diff --git a/config/clusters/catalystproject-latam/staging.values.yaml b/config/clusters/catalystproject-latam/staging.values.yaml
@@ -5,24 +5,10 @@ jupyterhub:
       - hosts: [staging.latam.catalystproject.2i2c.cloud]
         secretName: https-auto-tls
   custom:
-    2i2c:
-      add_staff_user_ids_to_admin_users: true
-      add_staff_user_ids_of_type: "github"
     homepage:
       templateVars:
         org:
-          name: Catalyst Project
-          url: "https://chanzuckerberg.com/science/programs-resources/open-science/educationcapacitybuilding/international-interactive-computing-collaboration-2i2c/"
-          logo_url: https://github.com/2i2c-org/infrastructure/assets/6181563/0667c576-7dce-4443-afd2-922288530814
-        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/"
+          name: Catalyst Project, LatAm - Staging
   hub:
     config:
       JupyterHub:

diff --git a/config/clusters/catalystproject-latam/unam.values.yaml b/config/clusters/catalystproject-latam/unam.values.yaml
@@ -0,0 +1,25 @@
+jupyterhub:
+  ingress:
+    hosts: [unam.latam.catalystproject.2i2c.cloud]
+    tls:
+      - hosts: [unam.latam.catalystproject.2i2c.cloud]
+        secretName: https-auto-tls
+  custom:
+    homepage:
+      templateVars:
+        org:
+          name: Catalyst Project, LatAm - UNAM
+  hub:
+    config:
+      JupyterHub:
+        authenticator_class: github
+      GitHubOAuthenticator:
+        oauth_callback_url: https://unam.latam.catalystproject.2i2c.cloud/hub/oauth_callback
+        allowed_organizations:
+          - CatalystProject-Hubs:unam
+        scope:
+          - read:org
+      Authenticator:
+        admin_users:
+          - nselem
+          - miguel-mx
diff --git a/config/clusters/catalystproject-latam/unitefa-conicet.values.yaml b/config/clusters/catalystproject-latam/unitefa-conicet.values.yaml
@@ -14,12 +14,6 @@ jupyterhub:
           name: Catalyst Project, LatAm - UNITEFA-CONICET
           url: "https://unitefa.conicet.unc.edu.ar/"
           logo_url: https://unitefa.conicet.unc.edu.ar/wp-content/blogs.dir/50/files/sites/50/2019/12/cropped-Captura-de-pantalla-de-2019-12-17-10-29-47.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/"

diff --git a/config/clusters/catalystproject-latam/uprrp.values.yaml b/config/clusters/catalystproject-latam/uprrp.values.yaml
@@ -0,0 +1,24 @@
+jupyterhub:
+  ingress:
+    hosts: [uprrp.latam.catalystproject.2i2c.cloud]
+    tls:
+      - hosts: [uprrp.latam.catalystproject.2i2c.cloud]
+        secretName: https-auto-tls
+  custom:
+    homepage:
+      templateVars:
+        org:
+          name: Catalyst Project, LatAm - UPRRP
+  hub:
+    config:
+      JupyterHub:
+        authenticator_class: github
+      GitHubOAuthenticator:
+        oauth_callback_url: https://uprrp.latam.catalystproject.2i2c.cloud/hub/oauth_callback
+        allowed_organizations:
+          - CatalystProject-Hubs:uprrp
+        scope:
+          - read:org
+      Authenticator:
+        admin_users:
+          - pattiordonez