From 3faf8bd906ad5a915748b22a91b0f5f4dd359c16 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Mon, 16 Oct 2023 13:41:36 +0100 Subject: [PATCH 1/2] Add NM-AIST hub values files --- .../enc-nm-aist.secret.values.yaml | 20 ++++++++++ .../nm-aist.values.yaml | 40 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 config/clusters/catalystproject-africa/enc-nm-aist.secret.values.yaml create mode 100644 config/clusters/catalystproject-africa/nm-aist.values.yaml diff --git a/config/clusters/catalystproject-africa/enc-nm-aist.secret.values.yaml b/config/clusters/catalystproject-africa/enc-nm-aist.secret.values.yaml new file mode 100644 index 0000000000..95eff19456 --- /dev/null +++ b/config/clusters/catalystproject-africa/enc-nm-aist.secret.values.yaml @@ -0,0 +1,20 @@ +jupyterhub: + hub: + config: + CILogonOAuthenticator: + client_id: ENC[AES256_GCM,data:CF64J0Sv0ScCZZFMmJBrFcYFh6HxvTLPlZRiF3zAUJmEYcYNsK6fp0U2E+02FfsCFyF8,iv:RbTYszndZq4LmjOUflp7sx77k3a4wONbZsab/g+R/+M=,tag:VL8Uozmm/oHnYUt8mvXgHg==,type:str] + client_secret: ENC[AES256_GCM,data:kvgKMZ4THqZBZTEtm4OVEnabFrtFPmQGlq4Xy02/fFfmS6AygdY5SEAP0Blcrh1wsdOiXUSyYlWEDu2KPOjoi20FygxKOGJAg0deryOfUb5hONhw9D0=,iv:RhBbuagExa2NFBur/3D54tqKNJCFxCuW2k9z5SGF2/M=,tag:WRPcwOfDR3VsUjbbAc4ThA==,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-16T12:22:02Z" + enc: CiUA4OM7eJkpartzmHc3egRINHzuNJ5HoQC5npPwdHbco9oBYa9EEkkAq2nhVf97mFKb5TjlEzurcsdHdyvXqg4j0SioCU+IFKBrKL3zOuGy4aVFJll5DeRtC9vP5HPeN8fdaS4pPsLA3J5MQHdxKzQN + azure_kv: [] + hc_vault: [] + age: [] + lastmodified: "2023-10-16T12:22:02Z" + mac: ENC[AES256_GCM,data:/VrfzTI10JjRaAbgc3rcUi5807KltwiKuXx+U6teAoQcDbsKnSZ7VE/gZEFErhlnINzlhjO5p/MkpBoVBjZP/U1MefbYy8tkjiWqv8Qbm2zI4YcDm4kTpTKgeCuwrn7bE15hoQvFLNTeNzhoHPgsuRiRcmhIBy6AUn+ZkNWIqrM=,iv:iQ+sSNoULEhDt24uLwyN5Nk0KQFyxRla7eyhSHqo1h4=,tag:P2mx99Sz0UD/4DdpHMtRLw==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.7.3 diff --git a/config/clusters/catalystproject-africa/nm-aist.values.yaml b/config/clusters/catalystproject-africa/nm-aist.values.yaml new file mode 100644 index 0000000000..40e013fc10 --- /dev/null +++ b/config/clusters/catalystproject-africa/nm-aist.values.yaml @@ -0,0 +1,40 @@ +jupyterhub: + ingress: + hosts: [nm-aist.af.catalystproject.2i2c.cloud] + tls: + - hosts: [nm-aist.af.catalystproject.2i2c.cloud] + secretName: https-auto-tls + custom: + 2i2c: + add_staff_user_ids_to_admin_users: true + add_staff_user_ids_of_type: "google" + homepage: + templateVars: + org: + name: "NM-AIST" + url: https://nm-aist.ac.tz/ + logo_url: https://nm-aist.ac.tz/images/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: cilogon + CILogonOAuthenticator: + oauth_callback_url: https://nm-aist.af.catalystproject.2i2c.cloud/hub/oauth_callback + allowed_idps: + http://google.com/accounts/o8/id: + username_derivation: + username_claim: email + allowed_domains: + - nm-aist.ac.tz + Authenticator: + admin_users: + - "beatus.lyimo@nm-aist.ac.tz" From af26a0528a2fccf99621d08798fdf2224d695b0c Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Mon, 16 Oct 2023 13:42:04 +0100 Subject: [PATCH 2/2] Define NM-AIST hub in catalyst-africa cluster --- config/clusters/catalystproject-africa/cluster.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/clusters/catalystproject-africa/cluster.yaml b/config/clusters/catalystproject-africa/cluster.yaml index 1a17fa5322..845dfb5809 100644 --- a/config/clusters/catalystproject-africa/cluster.yaml +++ b/config/clusters/catalystproject-africa/cluster.yaml @@ -18,3 +18,11 @@ hubs: - common.values.yaml - staging.values.yaml - enc-staging.secret.values.yaml + - name: nm-aist + display_name: "NM-AIST" + domain: nm-aist.af.catalystproject.2i2c.cloud + helm_chart: basehub + helm_chart_values_files: + - common.values.yaml + - nm-aist.values.yaml + - enc-nm-aist.secret.values.yaml