Merge pull request #2349 from GeorgianaElena/no-config-gen-in-deployer

deployer: don't generate config in deployer anymore
2i2c-org · Mar 24, 2023 · 1b282ad · 1b282ad
2 parents 0911509 + b5dd107
commit 1b282ad
Show file tree

Hide file tree

Showing 77 changed files with 775 additions and 141 deletions.
diff --git a/config/clusters/2i2c-aws-us/dask-staging.values.yaml b/config/clusters/2i2c-aws-us/dask-staging.values.yaml
@@ -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

diff --git a/config/clusters/2i2c-aws-us/researchdelight.values.yaml b/config/clusters/2i2c-aws-us/researchdelight.values.yaml
@@ -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]
     custom:
       2i2c:
         add_staff_user_ids_to_admin_users: true

diff --git a/config/clusters/2i2c-aws-us/staging.values.yaml b/config/clusters/2i2c-aws-us/staging.values.yaml
@@ -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

diff --git a/config/clusters/2i2c-uk/lis.values.yaml b/config/clusters/2i2c-uk/lis.values.yaml
@@ -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

diff --git a/config/clusters/2i2c-uk/staging.values.yaml b/config/clusters/2i2c-uk/staging.values.yaml
@@ -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

diff --git a/config/clusters/2i2c/aup.values.yaml b/config/clusters/2i2c/aup.values.yaml
@@ -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

diff --git a/config/clusters/2i2c/catalyst-cooperative.values.yaml b/config/clusters/2i2c/catalyst-cooperative.values.yaml
@@ -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

diff --git a/config/clusters/2i2c/dask-staging.values.yaml b/config/clusters/2i2c/dask-staging.values.yaml
@@ -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

diff --git a/config/clusters/2i2c/demo.values.yaml b/config/clusters/2i2c/demo.values.yaml
@@ -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

diff --git a/config/clusters/2i2c/earthlab.values.yaml b/config/clusters/2i2c/earthlab.values.yaml
@@ -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

diff --git a/config/clusters/2i2c/ohw.values.yaml b/config/clusters/2i2c/ohw.values.yaml
@@ -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
@@ -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

diff --git a/config/clusters/2i2c/paleohack2021.values.yaml b/config/clusters/2i2c/paleohack2021.values.yaml
@@ -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

diff --git a/config/clusters/2i2c/peddie.values.yaml b/config/clusters/2i2c/peddie.values.yaml
@@ -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

diff --git a/config/clusters/2i2c/pfw.values.yaml b/config/clusters/2i2c/pfw.values.yaml
@@ -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

diff --git a/config/clusters/2i2c/staging.values.yaml b/config/clusters/2i2c/staging.values.yaml
@@ -15,6 +15,17 @@ staticWebsite:
     enabled: false
 
 jupyterhub:
+  proxy:
+    https:
+      hosts:
+        - staging.2i2c.cloud
+  ingress:
+    hosts:
+      - staging.2i2c.cloud
+    tls:
+      - secretName: https-auto-tls
+        hosts:
+          - staging.2i2c.cloud
   custom:
     2i2c:
       add_staff_user_ids_to_admin_users: true

diff --git a/config/clusters/2i2c/temple.values.yaml b/config/clusters/2i2c/temple.values.yaml
@@ -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

diff --git a/config/clusters/2i2c/ucmerced.values.yaml b/config/clusters/2i2c/ucmerced.values.yaml
@@ -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

diff --git a/config/clusters/awi-ciroh/prod.values.yaml b/config/clusters/awi-ciroh/prod.values.yaml
@@ -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)

diff --git a/config/clusters/awi-ciroh/staging.values.yaml b/config/clusters/awi-ciroh/staging.values.yaml
@@ -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)

diff --git a/config/clusters/callysto/prod.values.yaml b/config/clusters/callysto/prod.values.yaml
@@ -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"
diff --git a/config/clusters/callysto/staging.values.yaml b/config/clusters/callysto/staging.values.yaml
@@ -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"
diff --git a/config/clusters/carbonplan/prod.values.yaml b/config/clusters/carbonplan/prod.values.yaml
@@ -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:

diff --git a/config/clusters/carbonplan/staging.values.yaml b/config/clusters/carbonplan/staging.values.yaml
@@ -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:

diff --git a/config/clusters/cloudbank/avc.values.yaml b/config/clusters/cloudbank/avc.values.yaml
@@ -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