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.

Sign up for GitHub

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

deployer: don't generate config in deployer anymore #2349

Merged
merged 17 commits into from
Mar 24, 2023
Merged

deployer: don't generate config in deployer anymore #2349

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2ab567b
Move the config generation out of the deployer and pilot it on staging
GeorgianaElena Mar 14, 2023
ec2950d
Put templates containers in the basehub chart
GeorgianaElena Mar 23, 2023
2ce49bf
Let hubs config be explicit about the template branch used
GeorgianaElena Mar 23, 2023
7c4a83c
Rm non existing staging template branch and exemplify with ohw
GeorgianaElena Mar 23, 2023
71d59ab
Update key nesting and key quoting
GeorgianaElena Mar 24, 2023
a534c4e
Add hubTemplateRepoDetails to the chart schema
GeorgianaElena Mar 24, 2023
b76cfe1
Correctly place the config in the right place
GeorgianaElena Mar 24, 2023
b722d9f
Add config for hubs with custom homepages
GeorgianaElena Mar 24, 2023
73abc0e
Add proxy and ingress config from basehub into hub specific config
GeorgianaElena Mar 24, 2023
aa84fd7
One more renaming of the template repo vars
GeorgianaElena Mar 24, 2023
c20a621
Place proxy config in the right place
GeorgianaElena Mar 24, 2023
3416cac
Rm debugging info
GeorgianaElena Mar 24, 2023
3f5a15e
Update schema
GeorgianaElena Mar 24, 2023
81080cd
Fix indentation
GeorgianaElena Mar 24, 2023
89f445e
Ensure empty fields are not allowed for proxy and ingress hosts
GeorgianaElena Mar 24, 2023
ba3e3dd
Add missing proxy config to utoronto default hubs
GeorgianaElena Mar 24, 2023
b5dd107
More renaming
GeorgianaElena Mar 24, 2023
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
8 changes: 8 additions & 0 deletions config/clusters/2i2c-aws-us/dask-staging.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ basehub:
serverIP: fs-0b70db2b65209a77d.efs.us-west-2.amazonaws.com
baseShareName: /
jupyterhub:
ingress:
hosts: [dask-staging.aws.2i2c.cloud]
tls:
- hosts: [dask-staging.aws.2i2c.cloud]
secretName: https-auto-tls
proxy:
https:
hosts: [dask-staging.aws.2i2c.cloud]
custom:
2i2c:
add_staff_user_ids_to_admin_users: true
Expand Down
8 changes: 8 additions & 0 deletions config/clusters/2i2c-aws-us/researchdelight.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ basehub:
serverIP: fs-0b70db2b65209a77d.efs.us-west-2.amazonaws.com
baseShareName: /
jupyterhub:
ingress:
hosts: [researchdelight.2i2c.cloud]
tls:
- hosts: [researchdelight.2i2c.cloud]
secretName: https-auto-tls
proxy:
https:
hosts: [researchdelight.2i2c.cloud]
GeorgianaElena marked this conversation as resolved.
Show resolved Hide resolved
custom:
2i2c:
add_staff_user_ids_to_admin_users: true
Expand Down
8 changes: 8 additions & 0 deletions config/clusters/2i2c-aws-us/staging.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ nfs:
serverIP: fs-0b70db2b65209a77d.efs.us-west-2.amazonaws.com
baseShareName: /
jupyterhub:
ingress:
hosts: [staging.aws.2i2c.cloud]
tls:
- hosts: [staging.aws.2i2c.cloud]
secretName: https-auto-tls
proxy:
https:
hosts: [staging.aws.2i2c.cloud]
custom:
2i2c:
add_staff_user_ids_to_admin_users: true
Expand Down
8 changes: 8 additions & 0 deletions config/clusters/2i2c-uk/lis.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ nfs:
# Name of Google Filestore share
baseShareName: /homes/
jupyterhub:
ingress:
hosts: [ds.lis.2i2c.cloud]
tls:
- hosts: [ds.lis.2i2c.cloud]
secretName: https-auto-tls
proxy:
https:
hosts: [ds.lis.2i2c.cloud]
custom:
2i2c:
add_staff_user_ids_to_admin_users: true
Expand Down
8 changes: 8 additions & 0 deletions config/clusters/2i2c-uk/staging.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ nfs:
# Name of Google Filestore share
baseShareName: /homes/
jupyterhub:
ingress:
hosts: [staging.uk.2i2c.cloud]
tls:
- hosts: [staging.uk.2i2c.cloud]
secretName: https-auto-tls
proxy:
https:
hosts: [staging.uk.2i2c.cloud]
custom:
2i2c:
add_staff_user_ids_to_admin_users: true
Expand Down
11 changes: 11 additions & 0 deletions config/clusters/2i2c/aup.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
jupyterhub:
proxy:
https:
hosts:
- aup.pilot.2i2c.cloud
ingress:
hosts:
- aup.pilot.2i2c.cloud
tls:
- secretName: https-auto-tls
hosts:
- aup.pilot.2i2c.cloud
custom:
2i2c:
add_staff_user_ids_to_admin_users: true
Expand Down
11 changes: 11 additions & 0 deletions config/clusters/2i2c/catalyst-cooperative.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ basehub:
iam.gke.io/gcp-service-account: [email protected]

jupyterhub:
proxy:
https:
hosts:
- catalyst-cooperative.pilot.2i2c.cloud
ingress:
hosts:
- catalyst-cooperative.pilot.2i2c.cloud
tls:
- secretName: https-auto-tls
hosts:
- catalyst-cooperative.pilot.2i2c.cloud
singleuser:
image:
name: catalystcoop/pudl-jupyter
Expand Down
11 changes: 11 additions & 0 deletions config/clusters/2i2c/dask-staging.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@ basehub:
annotations:
iam.gke.io/gcp-service-account: [email protected]
jupyterhub:
proxy:
https:
hosts:
- dask-staging.2i2c.cloud
ingress:
hosts:
- dask-staging.2i2c.cloud
tls:
- secretName: https-auto-tls
hosts:
- dask-staging.2i2c.cloud
custom:
cloudResources:
provider: gcp
Expand Down
11 changes: 11 additions & 0 deletions config/clusters/2i2c/demo.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
jupyterhub:
proxy:
https:
hosts:
- demo.2i2c.cloud
ingress:
hosts:
- demo.2i2c.cloud
tls:
- secretName: https-auto-tls
hosts:
- demo.2i2c.cloud
custom:
2i2c:
add_staff_user_ids_to_admin_users: true
Expand Down
11 changes: 11 additions & 0 deletions config/clusters/2i2c/earthlab.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
jupyterhub:
proxy:
https:
hosts:
- earthlab.pilot.2i2c.cloud
ingress:
hosts:
- earthlab.pilot.2i2c.cloud
tls:
- secretName: https-auto-tls
hosts:
- earthlab.pilot.2i2c.cloud
custom:
2i2c:
add_staff_user_ids_to_admin_users: true
Expand Down
12 changes: 12 additions & 0 deletions config/clusters/2i2c/ohw.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,17 @@ basehub:
annotations:
iam.gke.io/gcp-service-account: [email protected]
jupyterhub:
proxy:
https:
hosts:
- oceanhackweek.2i2c.cloud
ingress:
hosts:
- oceanhackweek.2i2c.cloud
tls:
- secretName: https-auto-tls
hosts:
- oceanhackweek.2i2c.cloud
prePuller:
continuous:
# Todo: turn this off after the event
Expand Down Expand Up @@ -74,6 +85,7 @@ basehub:
add_staff_user_ids_to_admin_users: true
add_staff_user_ids_of_type: "github"
homepage:
gitRepoBranch: "2i2c-ohw"
templateVars:
org:
name: OceanHackWeek
Expand Down
11 changes: 11 additions & 0 deletions config/clusters/2i2c/paleohack2021.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
jupyterhub:
proxy:
https:
hosts:
- paleohack2021.hackathon.2i2c.cloud
ingress:
hosts:
- paleohack2021.hackathon.2i2c.cloud
tls:
- secretName: https-auto-tls
hosts:
- paleohack2021.hackathon.2i2c.cloud
scheduling:
userScheduler:
enabled: true
Expand Down
11 changes: 11 additions & 0 deletions config/clusters/2i2c/peddie.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
jupyterhub:
proxy:
https:
hosts:
- peddie.pilot.2i2c.cloud
ingress:
hosts:
- peddie.pilot.2i2c.cloud
tls:
- secretName: https-auto-tls
hosts:
- peddie.pilot.2i2c.cloud
custom:
2i2c:
add_staff_user_ids_to_admin_users: true
Expand Down
11 changes: 11 additions & 0 deletions config/clusters/2i2c/pfw.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
jupyterhub:
proxy:
https:
hosts:
- pfw.pilot.2i2c.cloud
ingress:
hosts:
- pfw.pilot.2i2c.cloud
tls:
- secretName: https-auto-tls
hosts:
- pfw.pilot.2i2c.cloud
custom:
2i2c:
add_staff_user_ids_to_admin_users: true
Expand Down
11 changes: 11 additions & 0 deletions config/clusters/2i2c/staging.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,17 @@ staticWebsite:
enabled: false

jupyterhub:
proxy:
https:
hosts:
- staging.2i2c.cloud
ingress:
hosts:
- staging.2i2c.cloud
tls:
- secretName: https-auto-tls
consideRatio marked this conversation as resolved.
Show resolved Hide resolved
hosts:
- staging.2i2c.cloud
custom:
2i2c:
add_staff_user_ids_to_admin_users: true
Expand Down
11 changes: 11 additions & 0 deletions config/clusters/2i2c/temple.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
jupyterhub:
proxy:
https:
hosts:
- temple.2i2c.cloud
ingress:
hosts:
- temple.2i2c.cloud
tls:
- secretName: https-auto-tls
hosts:
- temple.2i2c.cloud
custom:
2i2c:
add_staff_user_ids_to_admin_users: true
Expand Down
11 changes: 11 additions & 0 deletions config/clusters/2i2c/ucmerced.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
jupyterhub:
proxy:
https:
hosts:
- ucmerced.2i2c.cloud
ingress:
hosts:
- ucmerced.2i2c.cloud
tls:
- secretName: https-auto-tls
hosts:
- ucmerced.2i2c.cloud
custom:
2i2c:
add_staff_user_ids_to_admin_users: true
Expand Down
8 changes: 8 additions & 0 deletions config/clusters/awi-ciroh/prod.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@ basehub:
annotations:
iam.gke.io/gcp-service-account: [email protected]
jupyterhub:
ingress:
hosts: [ciroh.awi.2i2c.cloud]
tls:
- hosts: [ciroh.awi.2i2c.cloud]
secretName: https-auto-tls
proxy:
https:
hosts: [ciroh.awi.2i2c.cloud]
singleuser:
extraEnv:
SCRATCH_BUCKET: gs://awi-ciroh-scratch/$(JUPYTERHUB_USER)
Expand Down
8 changes: 8 additions & 0 deletions config/clusters/awi-ciroh/staging.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@ basehub:
annotations:
iam.gke.io/gcp-service-account: [email protected]
jupyterhub:
ingress:
hosts: [staging.ciroh.awi.2i2c.cloud]
tls:
- hosts: [staging.ciroh.awi.2i2c.cloud]
secretName: https-auto-tls
proxy:
https:
hosts: [staging.ciroh.awi.2i2c.cloud]
singleuser:
extraEnv:
SCRATCH_BUCKET: gs://awi-ciroh-scratch-staging/$(JUPYTERHUB_USER)
Expand Down
11 changes: 11 additions & 0 deletions config/clusters/callysto/prod.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
jupyterhub:
ingress:
hosts: [2i2c.callysto.ca]
tls:
- hosts: [2i2c.callysto.ca]
secretName: https-auto-tls
proxy:
https:
hosts: [2i2c.callysto.ca]
hub:
config:
CILogonOAuthenticator:
oauth_callback_url: https://2i2c.callysto.ca/hub/oauth_callback
custom:
homepage:
gitRepoBranch: "callysto-prod"
11 changes: 11 additions & 0 deletions config/clusters/callysto/staging.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
jupyterhub:
ingress:
hosts: [staging.callysto.2i2c.cloud]
tls:
- hosts: [staging.callysto.2i2c.cloud]
secretName: https-auto-tls
proxy:
https:
hosts: [staging.callysto.2i2c.cloud]
hub:
config:
CILogonOAuthenticator:
oauth_callback_url: https://staging.callysto.2i2c.cloud/hub/oauth_callback
custom:
homepage:
gitRepoBranch: "callysto-staging"
8 changes: 8 additions & 0 deletions config/clusters/carbonplan/prod.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
basehub:
jupyterhub:
ingress:
hosts: [carbonplan.2i2c.cloud]
tls:
- hosts: [carbonplan.2i2c.cloud]
secretName: https-auto-tls
proxy:
https:
hosts: [carbonplan.2i2c.cloud]
hub:
config:
JupyterHub:
Expand Down
8 changes: 8 additions & 0 deletions config/clusters/carbonplan/staging.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
basehub:
jupyterhub:
ingress:
hosts: [staging.carbonplan.2i2c.cloud]
tls:
- hosts: [staging.carbonplan.2i2c.cloud]
secretName: https-auto-tls
proxy:
https:
hosts: [staging.carbonplan.2i2c.cloud]
hub:
config:
JupyterHub:
Expand Down
8 changes: 8 additions & 0 deletions config/clusters/cloudbank/avc.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
jupyterhub:
ingress:
hosts: [avc.cloudbank.2i2c.cloud]
tls:
- hosts: [avc.cloudbank.2i2c.cloud]
secretName: https-auto-tls
proxy:
https:
hosts: [avc.cloudbank.2i2c.cloud]
custom:
2i2c:
add_staff_user_ids_to_admin_users: true
Expand Down
Loading