Skip to content

Commit

Permalink
Merge pull request #2858 from 2i2c-org/revert-1802-rm-coessing
Browse files Browse the repository at this point in the history
  • Loading branch information
sgibson91 authored Jul 25, 2023
2 parents 8bb9ba7 + cd09d7e commit 3de2cbb
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 0 deletions.
8 changes: 8 additions & 0 deletions config/clusters/pangeo-hubs/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,11 @@ hubs:
- common.values.yaml
- prod.values.yaml
- enc-prod.secret.values.yaml
- name: coessing
display_name: "COESSING"
domain: coessing.2i2c.cloud
helm_chart: daskhub
helm_chart_values_files:
- common.values.yaml
- coessing.values.yaml
- enc-coessing.secret.values.yaml
55 changes: 55 additions & 0 deletions config/clusters/pangeo-hubs/coessing.values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
basehub:
userServiceAccount:
annotations:
iam.gke.io/gcp-service-account: pangeo-hubs-coessing@pangeo-integration-te-3eea.iam.gserviceaccount.com
jupyterhub:
custom:
cloudResources:
scratchBucket:
enabled: false
2i2c:
add_staff_user_ids_to_admin_users: true
add_staff_user_ids_of_type: "google"
homepage:
templateVars:
org:
name: COESSING
url: https://coessing.org/
logo_url: "https://coessing.files.wordpress.com/2016/08/ghana-logo-21.png?w=262&h=376&zoom=2"
ingress:
hosts: [coessing.2i2c.cloud]
tls:
- hosts: [coessing.2i2c.cloud]
secretName: https-auto-tls
singleuser:
extraEnv:
SCRATCH_BUCKET: gcs://pangeo-hubs-coessing-scratch/$(JUPYTERHUB_USER)
PANGEO_SCRATCH: gcs://pangeo-hubs-coessing-scratch/$(JUPYTERHUB_USER)
# No profiles
profileList: null
memory:
limit: 7G
guarantee: 4.5G
nodeSelector:
node.kubernetes.io/instance-type: n1-standard-2
hub:
config:
Authenticator:
admin_users: &admin_users
- [email protected]
allowed_users: *admin_users
# Delete any prior existing users in the db that don't pass username_pattern
delete_invalid_users: true
JupyterHub:
authenticator_class: cilogon
CILogonOAuthenticator:
oauth_callback_url: "https://coessing.2i2c.cloud/hub/oauth_callback"
# Only show the option to login with Google
shown_idps:
- https://accounts.google.com/o/oauth2/auth
allowed_idps:
# CILogon still uses the old google oidc enpoint instead of the new one listed in `shown_idps`.
# Ref https://github.com/ncsa/OA4MP/issues/45
http://google.com/accounts/o8/id:
username_derivation:
username_claim: "email"
21 changes: 21 additions & 0 deletions config/clusters/pangeo-hubs/enc-coessing.secret.values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
basehub:
jupyterhub:
hub:
config:
CILogonOAuthenticator:
client_id: ENC[AES256_GCM,data:xWr14DxXaC6TS/XpinNtQ9d20IhHzHx9zwwxy/qW0Cu5gE2oq+OSrIjfx1ny2ERQtEb7,iv:TfBuHFVyQyCyXSqZ995m02jQJLVYYVSmyOB/FJA4oDI=,tag:nkbf2A5qnqH1cvuCCxX4pA==,type:str]
client_secret: ENC[AES256_GCM,data:bRbwQhUuGoGKxqAYcyUDKsy6eeuJ9bhWHK4yKl8R2Mbn9UvyeEYRWzwk4A3e1EWVQAC0rGXvbEK9AjGmGBeuGYxjtTg6+Dcjz9v25y0fqe034cttOBs=,iv:7Ef9Z3MaivnqoH8lyNPsQQ7Po4fJfqg/WBR1HFlZ56E=,tag:pKReSf/yeVralbxEG5Ut9g==,type:str]
sops:
kms: []
gcp_kms:
- resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
created_at: "2023-07-24T14:50:46Z"
enc: CiUA4OM7eGHpXkSlhxYskzt/fj6kS9055CrxVtHWRlRNNnLUnFwnEkkAyiwFHD6ptsIuEbkIVsI+JP6Fs/CHYvRbIrBd9TUZ90Hcsdl546WSzb2wOVLTzKSdkbkjGgSh66qWKU9J63Nq9waDB4qryTiB
azure_kv: []
hc_vault: []
age: []
lastmodified: "2023-07-24T14:50:46Z"
mac: ENC[AES256_GCM,data:3kDn39wyJEsUzYCneATG/TxIT47pblXwk4kGFOW/sluDAURwu4MxDCgoObZKC4jNQH8O7JVd4KNpG5M1heSLj4LG7bGzAYjxczT8MHe1mmN0DFISf4KGcWmSjQv+kFOizWO33oiuI+C+PPvpEcsjqh9Bss9t/eTIwDIowhMHD5Q=,iv:QqPxlZTMEc4y8VR/7p4nAa+6Fi0rzyyTUoEeRlTykoc=,tag:NET2gzxphtEBj4n3TVUQsQ==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.7.3

0 comments on commit 3de2cbb

Please sign in to comment.