Merge pull request #4576 from berkeley-dsep-infra/staging

Merge #4571, #4572, #4574.
berkeley-dsep-infra · May 16, 2023 · 862750d · 862750d
2 parents 27e04dc + 784c6ef
commit 862750d
Show file tree

Hide file tree

Showing 26 changed files with 210 additions and 409 deletions.
diff --git a/deployments/a11y/config/common.yaml b/deployments/a11y/config/common.yaml
@@ -20,11 +20,11 @@ jupyterhub:
       Authenticator:
         admin_users:
           # infrastructure
-          - sknapp
-          - rylo
-          - yuvipanda
-          - felder
           - balajialwar
+          - felder
+          - gmerritt
+          - rylo
+          - sknapp
           # List of other admin users
 
   singleuser:

diff --git a/deployments/astro/config/common.yaml b/deployments/astro/config/common.yaml
@@ -20,11 +20,11 @@ jupyterhub:
       Authenticator:
         admin_users:
           # infrastructure
-          - sknapp
-          - rylo
-          - yuvipanda
-          - felder
           - balajialwar
+          - felder
+          - gmerritt
+          - rylo
+          - sknapp
           # List of other admin users
           - nsabrams
           - joshbloom

diff --git a/deployments/biology/config/common.yaml b/deployments/biology/config/common.yaml
@@ -24,11 +24,12 @@ jupyterhub:
       Authenticator:
         admin_users:
           # infrastructure
-          - sknapp
-          - rylo
-          - yuvipanda
-          - felder
           - balajialwar
+          - felder
+          - gmerritt
+          - rylo
+          - sknapp
+
           # List of other admin users
           - psudmant
           - ingolia

diff --git a/deployments/cee/config/common.yaml b/deployments/cee/config/common.yaml
@@ -20,11 +20,12 @@ jupyterhub:
       Authenticator:
         admin_users:
           # infrastructure
-          - sknapp
-          - rylo
-          - yuvipanda
-          - felder
           - balajialwar
+          - felder
+          - gmerritt
+          - rylo
+          - sknapp
+
           # List of other admin users
 
   singleuser:

diff --git a/deployments/data100/config/common.yaml b/deployments/data100/config/common.yaml
@@ -9,30 +9,12 @@ jupyterhub:
       Authenticator:
         admin_users:
           # infrastructure
-          - sknapp
+          - balajialwar
           - felder
+          - gmerritt
           - rylo
-          - yuvipanda
-          - cpyles
-          - balajialwar
-          # instructors & gsis as per request from Dominic Liu(Spring 2022)
-          - kagarwal2
-          - parthbaokar
-          - andrew.lenz
-          - abadrinath
-          - snhing
-          - grover.kanu
-          - fernando.perez
-          - fgeng
-          - hangxingliu
-          #https://github.com/berkeley-dsep-infra/datahub/issues/3198
-          - yanlisa
-          - hug
-          #https://github.com/berkeley-dsep-infra/datahub/issues/3714 (Fall 2022)
-          - rohan.jha
-          - shiangyi.andrea.lin
-          - ehao
-          - miroyan.mihran
+          - sknapp
+
 #  prePuller:
 #    extraImages:
 #      postgres:
@@ -70,7 +52,3 @@ jupyterhub:
         - name: home
           mountPath: /home/jovyan/shared-readwrite
           subPath: _shared
-    group_profiles:
-      1521765: # Data 200, Spring 2023, issue #4472
-        mem_limit: 8192M
-        mem_guarantee: 8192M
diff --git a/deployments/data100/secrets/prod.yaml b/deployments/data100/secrets/prod.yaml
@@ -5,11 +5,6 @@ jupyterhub:
                 client_id: ENC[AES256_GCM,data:OExpRDc6h8/EIR4vpxROuV8=,iv:wJJyTSXFjo9Un8cFEWQWGexMDgm05wvDHpBgC0dpbqE=,tag:J6c8qSM1V5fAPlsTIeL2zQ==,type:str]
                 client_secret: ENC[AES256_GCM,data:ZTrRBqxrGeslSOKbCPeRWy/j2svs7+FGm4iAkqp2xfbZ1WmQ5EB6TS+99PiHtBPvXqnzUmKjYV/aMmOYWyMxEQ==,iv:d7sOpXV0TkxSLUdggCMVV1xQlOIRUJzCS6rWFj/AOJc=,tag:k15+BDUaoUAD+f7QRaWXqg==,type:str]
                 oauth_callback_url: ENC[AES256_GCM,data:Dsgeb8qBJ7aPFm5iEOyM18ApFM6rUiPTh3t/H9RwpqeGZWS7WrfNmhQQ4wa8ZADGnz5jmay9Jg==,iv:PmJcgeHurLLHr9B06N2ax0n3cyiJz4Kefd0i/Vdc8FA=,tag:7XleNuHTQKb1zsGZqvAAvA==,type:str]
-    custom:
-        memory:
-            4096M:
-                - ENC[AES256_GCM,data:hRdkcyjE0cKyUPDj+fFRCnyinjcoRbGz,iv:qXyTPRkfu5p9ux00WDJbt4iNnX/dw+hoROvNJmu5w8k=,tag:DqId61dcgsk8wLpM6PbPUA==,type:comment]
-                - ENC[AES256_GCM,data:8RTLxp8=,iv:SUai9K4htoA2h9v1CNukDHgXNbspYZqHJsQ/jNh+FYE=,tag:vg1qOFNX204915GaIiOsRA==,type:str]
 sops:
     kms: []
     gcp_kms:
@@ -19,8 +14,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2023-04-13T19:47:15Z"
-    mac: ENC[AES256_GCM,data:vlxscvAUyR3IqYpxTiUnpy69Y6go4XncfP/zBoCVv12y9hzURuHgPlF9rAcXc80F9bZRVeC3fBCnUQ5ePfOGSWTiH2L8vPjb0pves6/5i80n+ckvCMtookiTVZ4f3TKO4Tnw1XAkT3ekfLcVeBVyK0jJfUh7MsxpIn+O0hFE7nA=,iv:jk7uGfcFeo7m/JFM7BdvU2A7vGqXj/KxgBuv5tcgXD0=,tag:79PWCJZ+k4GaS+BjwoH+1Q==,type:str]
+    lastmodified: "2023-05-15T17:25:52Z"
+    mac: ENC[AES256_GCM,data:jIGcF8ruScCXa+y1B/q9kugW3e6iW8DLiOMLFQIL3mrZo+9UHWeCCuL6qOJlXM3GaqS3FaPQk6MZt9xQs1VkmJQWwHhlfnhpNzO6bqw/ajlRQklKQ0AxAjHuYZbg3NoPsZ9X2E5Gw5RhsIblBhGi9Z7kTSkPXT9IPXVA5JZqYx0=,iv:ISOdXf0u9LSmBzszCEilLUSqCRQ0pMEfNRMfqiJiXWw=,tag:q1HMgb9HakII7xeXDYKklw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3
diff --git a/deployments/data101/config/common.yaml b/deployments/data101/config/common.yaml
@@ -67,13 +67,11 @@ jupyterhub:
       Authenticator:
         admin_users:
           # infrastructure
-          - sknapp
-          - rylo
-          - yuvipanda
-          - felder
           - balajialwar
-          # List of other admin users
-          - lukeliu
+          - felder
+          - gmerritt
+          - rylo
+          - sknapp
 
   singleuser:
 ##    extraContainers:

diff --git a/deployments/data102/config/common.yaml b/deployments/data102/config/common.yaml
@@ -22,18 +22,11 @@ jupyterhub:
       Authenticator:
         admin_users:
           # infrastructure
-          - sknapp
+          - balajialwar
           - felder
+          - gmerritt
           - rylo
-          - balajialwar
-          # instructors
-          - ramesh_s
-          - jsteinhardt
-          # gsis
-          # data102 Spring 2023 as requested by Ramesh Sridharan
-          - hangxingliu
-          - alanjian131
-
+          - sknapp
 
   singleuser:
     nodeSelector:

diff --git a/deployments/data8/config/common.yaml b/deployments/data8/config/common.yaml
@@ -29,60 +29,11 @@ jupyterhub:
       Authenticator:
         admin_users:
           # infrastructure
-          - sknapp
-          - rylo
-          - yuvipanda
-          - felder
           - balajialwar
-          # Summer 2022 Admins, from Data 8 Instructors Kevin Miao and Ellen Persson
-          - daw
-          - nellepersson
-          - kevinmiao
-          - lingjunguo
-          - cayanan.joshua
-          - oscarb
-          - vpadma
-          - gprasann
-          - guanangela
-          - atticus.ginsborg
-          - xjeffreychen12
-          - katherine0806
-          - kelseyley
-          - kinsey.long
-          - noah.s.tran
-          - paul.loisel
-          - yifengwang
-          - samihasingh
-          - sarafang
-          - yiyan.hao
-          - ekchien04
-          - jonathanferrari
-          - karen.li
-          - lisaycliu
-          - nataliechan
-          - nikil
-          - ralui
-          - rhu01
-          - zayankhanmd
-          - andreawang
-          - ahlin
-          - aarushiwalia
-          - carrie.hu
-          - ekandell
-          - jacobaldrich11
-          - juliannalee
-          - kevintnguyen
-          - kvitolo
-          - lucytran
-          - mangai
-          - mingshamo
-          - richardsoong
-          - liuwenjin021011
-          - stephen.liu
-          - vaidehi-b
-          - zachmackin
-
-          # List of other admin users
+          - felder
+          - gmerritt
+          - rylo
+          - sknapp
 
   singleuser:
     nodeSelector:

diff --git a/deployments/datahub/config/common.yaml b/deployments/datahub/config/common.yaml
@@ -21,11 +21,12 @@ jupyterhub:
         auto_login_oauth2_authorize: True
         admin_users:
           # infrastructure
-          - sknapp
+          - balajialwar
           - felder
+          - gmerritt
           - rylo
-          - yuvipanda
-          - balajialwar
+          - sknapp
+
           # regular instructors
           - adhikari
           - culler
@@ -42,8 +43,6 @@ jupyterhub:
           #As per the request from David Broockman (Political Science Instructor)
           - broockman
           - castro.ian
-          #As per the request from Leila Njee Bugha (GSI for ENVECON 118 - Sp 22)
-          - le.njeeb
           #As per the request from James Sears (Environmental Econ GSI) - https://github.com/berkeley-dsep-infra/datahub/issues/3229
           - lenjb
     nodeSelector:
@@ -124,25 +123,8 @@ jupyterhub:
     image: {}
 
   # read by z2jh.get_config() in hub/values.yaml
-  # formerly jupyterhub.hub.extraConfigMap
-  custom:
-    group_profiles:
-      1519998: # Legal Studies 123, Spring 2023, issue #3718
-        mem_limit: 3072M
-        mem_guarantee: 3072M
-
-      1522696: # ENVECON 153, Spring 2023, issue #3982
-        mem_limit: 3072M
-        mem_guarantee: 3072M
-
-      1521412: # ARE 21, Spring 2023, issue #4057
-        mem_limit: 4096M
-        mem_guarantee: 4096M
-
-      1522114: # ECON 148, Spring 2023, issue #4261
-        mem_limit: 2048M
-        mem_guarantee: 2048M
-
-      1523121: # DEMOG 175, Spring 2023, issue #4513
-        mem_limit: 8192M
-        mem_guarantee: 8192M
+  #custom:
+  #  group_profiles:
+  #    canvas::1519998: # Legal Studies 123, Spring 2023, issue #3718
+  #      mem_limit: 3072M
+  #      mem_guarantee: 3072M