Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename researchdelight hub to showcase #3311

Merged
merged 5 commits into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions config/clusters/2i2c-aws-us/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ hubs:
- daskhub-common.values.yaml
- dask-staging.values.yaml
- enc-dask-staging.secret.values.yaml
- name: researchdelight
display_name: "2i2c Research Delight"
domain: researchdelight.2i2c.cloud
- name: showcase
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change means that a new hub and helm namespace will be deployed. Hence the need to delete the old researchdelight namespace documented in the top comment.

display_name: "2i2c Showcase"
domain: showcase.2i2c.cloud
helm_chart: daskhub
helm_chart_values_files:
- daskhub-common.values.yaml
- researchdelight.values.yaml
- enc-researchdelight.secret.values.yaml
- showcase.values.yaml
- enc-showcase.secret.values.yaml
- name: ncar-cisl
display_name: "NCAR-CISL for UCAR"
domain: ncar-cisl.2i2c.cloud
Expand Down
24 changes: 0 additions & 24 deletions config/clusters/2i2c-aws-us/enc-researchdelight.secret.values.yaml

This file was deleted.

21 changes: 21 additions & 0 deletions config/clusters/2i2c-aws-us/enc-showcase.secret.values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
basehub:
jupyterhub:
hub:
config:
GitHubOAuthenticator:
client_id: ENC[AES256_GCM,data:RDesaa0Wr6pnfklWU0BtoHaWw9g=,iv:C4bBjlkhdM7Xz87/QrEss6QP5ZRb+wPFArDLJCAZ+Ns=,tag:ivt931zOLG1xTsZ694WzKg==,type:str]
client_secret: ENC[AES256_GCM,data:1IGyE4+VKCF6IiHHlCv4hhJLQphz2ax5oEUF4QXjSEQtZGzsU0s10Q==,iv://RLs5scN6NOL/XDmQAPkO+cTcDe2FLkWFS+Uj/+TJs=,tag:d0KTBJOdfdAcR+NFxjVUEA==,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-24T10:37:44Z"
enc: CiUA4OM7eCQWEyht09mKKgbUxNyGoo+QsRZBAI6cVr2XWCEo/dCZEkkAq2nhVakyUtf6neyKXwWWxWPtq6iSLvuhHoswkNlxnuBBVxN1RSFeBEPy8b85Hj0FnSMBy0/tgqEwAbkp7wUz1MYTIbhdzqIo
azure_kv: []
hc_vault: []
age: []
lastmodified: "2023-10-24T10:37:44Z"
mac: ENC[AES256_GCM,data:g0NOs7Qli/aUO3ZFwCQcFWr+i9tfDnkiyzU8LIDAoaM4BGAzJcRwnjzUO3MfnRjOk4tOS16V1m2eiH8FIWy6sa8kJxJYEO0cU/kKZk+ojCf0txyYE0ZV+gN7w4mb8ZYGP6f4LPwhjy330dkq7uExFaqqLNzDcduWSMAJeBKy2XI=,iv:cZigjUvK0LCwZIBDL+CzOLObBZaiZqJmH+iRoZxPWlk=,tag:Cu3Qgpb2pJD4C4gsUSTNdg==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.7.3
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
basehub:
userServiceAccount:
annotations:
# When we renamed this hub, we did so at a DNS level and not an infrastructure
# level. No terraform config was touched. Hence the kubernetes annotations retain
# the original hub name.
eks.amazonaws.com/role-arn: arn:aws:iam::790657130469:role/2i2c-aws-us-researchdelight
jupyterhub:
ingress:
hosts: [researchdelight.2i2c.cloud]
hosts: [showcase.2i2c.cloud]
tls:
- hosts: [researchdelight.2i2c.cloud]
- hosts: [showcase.2i2c.cloud]
secretName: https-auto-tls
custom:
2i2c:
Expand All @@ -15,7 +18,7 @@ basehub:
homepage:
templateVars:
org:
name: 2i2c Research Delight
name: 2i2c Showcase
url: https://2i2c.org
logo_url: https://2i2c.org/media/logo.png
designed_by:
Expand All @@ -32,6 +35,7 @@ basehub:
JupyterHub:
authenticator_class: github
GitHubOAuthenticator:
oauth_callback_url: "https://showcase.2i2c.cloud/hub/oauth_callback"
populate_teams_in_auth_state: true
allowed_organizations:
- 2i2c-org:research-delight-team
Expand Down
5 changes: 5 additions & 0 deletions config/clusters/2i2c-aws-us/support.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,8 @@ cluster-autoscaler:
autoDiscovery:
clusterName: 2i2c-aws-us
awsRegion: us-west-2

redirects:
rules:
- from: researchdelight.2i2c.cloud
to: showcase.2i2c.cloud