From 26138848c990496e640887abcda45b34caeb2725 Mon Sep 17 00:00:00 2001 From: Balaji Alwar Date: Wed, 18 Dec 2024 17:54:44 -0500 Subject: [PATCH 1/5] Remove bcourses based configs across hubs --- deployments/astro/config/common.yaml | 4 - deployments/biology/config/common.yaml | 58 -------- deployments/data100/config/common.yaml | 46 ++---- deployments/data101/config/common.yaml | 18 +-- deployments/data8/config/common.yaml | 18 +-- deployments/datahub/config/common.yaml | 147 +------------------- deployments/eecs/config/common.yaml | 4 - deployments/prob140/config/common.yaml | 18 +-- deployments/publichealth/config/common.yaml | 18 +-- deployments/r/config/common.yaml | 3 - 10 files changed, 46 insertions(+), 288 deletions(-) diff --git a/deployments/astro/config/common.yaml b/deployments/astro/config/common.yaml index c97af25a8..3d214e408 100644 --- a/deployments/astro/config/common.yaml +++ b/deployments/astro/config/common.yaml @@ -91,10 +91,6 @@ jupyterhub: # formerly jupyterhub.hub.extraConfigMap custom: group_profiles: - # Astro Lab 128, Spring 2024, https://github.com/berkeley-dsep-infra/datahub/issues/5596 - course::1537100: # Temporarily bump down to 4G RAM to all students - mem_limit: 4G - mem_guarantee: 4G admin: extraVolumeMounts: - name: home diff --git a/deployments/biology/config/common.yaml b/deployments/biology/config/common.yaml index eebb07a4d..69395834a 100644 --- a/deployments/biology/config/common.yaml +++ b/deployments/biology/config/common.yaml @@ -62,64 +62,6 @@ jupyterhub: mem_limit: 4096M mem_guarantee: 4096M - course::1536425: # IB 134L, https://github.com/berkeley-dsep-infra/datahub/issues/6481 - mem_limit: 8192M - mem_guarantee: 8192M - - # BioE C149, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6205 - course::1537116::enrollment_type::teacher: - extraVolumeMounts: - - name: home - mountPath: /home/jovyan/bioe-c149-readwrite - subPath: _shared/course/bioe-c149-shared - course::1537116::enrollment_type::ta: - extraVolumeMounts: - - name: home - mountPath: /home/jovyan/bioe-c149-readwrite - subPath: _shared/course/bioe-c149-shared - course::1537116::enrollment_type::student: - extraVolumeMounts: - - name: home - mountPath: /home/jovyan/bioe-c149-shared - subPath: _shared/course/bioe-c149-shared - readOnly: true - - # MCB 201B, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6255 - course::1537301::enrollment_type::teacher: - extraVolumeMounts: - - name: home - mountPath: /home/jovyan/mcb201b-shared-readwrite - subPath: _shared/course/mcb201b-shared - course::1537301::enrollment_type::ta: - extraVolumeMounts: - - name: home - mountPath: /home/jovyan/mcb201b-shared-readwrite - subPath: _shared/course/mcb201b-shared - course::1537301::enrollment_type::student: - extraVolumeMounts: - - name: home - mountPath: /home/jovyan/mcb201b-shared - subPath: _shared/course/mcb201b-shared - readOnly: true - - # IB 134L, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6453 - course::1536425::enrollment_type::teacher: - extraVolumeMounts: - - name: home - mountPath: /home/jovyan/IB134L-shared-readwrite - subPath: _shared/course/IB134L-shared - course::1536425::enrollment_type::ta: - extraVolumeMounts: - - name: home - mountPath: /home/jovyan/IB134L-shared-readwrite - subPath: _shared/course/IB134L-shared - course::1536425::enrollment_type::student: - extraVolumeMounts: - - name: home - mountPath: /home/jovyan/IB134L-shared - subPath: _shared/course/IB134L-shared - readOnly: true - singleuser: extraEnv: # Unset NotebookApp from hub/values. Necessary for recent lab versions. diff --git a/deployments/data100/config/common.yaml b/deployments/data100/config/common.yaml index eb8055438..18a99b0d5 100644 --- a/deployments/data100/config/common.yaml +++ b/deployments/data100/config/common.yaml @@ -41,30 +41,19 @@ jupyterhub: # this role will be assigned to... groups: - course::1524699::group::all-admins + #Data 100, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6458 - course-staff-1537664: - # description: Enable course staff to view and access servers. - # this role provides permissions to... - scopes: - - admin-ui - - list:users!group=course::1537664 - - admin:servers!group=course::1537664 - - access:servers!group=course::1537664 - # this role will be assigned to... - groups: - - course::1537664::group::Admins - # Econ 148, Spring 2024, DH-225 - #course-staff-1532866: + #course-staff-1537664: # description: Enable course staff to view and access servers. # this role provides permissions to... - # scopes: - # - admin-ui - # - list:users!group=course::1532866 - # - admin:servers!group=course::1532866 - # - access:servers!group=course::1532866 + # scopes: + # - admin-ui + # - list:users!group=course::1537664 + # - admin:servers!group=course::1537664 + # - access:servers!group=course::1537664 # this role will be assigned to... - # groups: - # - course::1532866::group::admin + #groups: + # - course::1537664::group::Admins # prePuller: # extraImages: @@ -112,23 +101,6 @@ jupyterhub: admin: true mem_limit: 4G - # Data C100, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6316 - course::1537664::enrollment_type::teacher: - extraVolumeMounts: - - name: home - mountPath: /home/jovyan/data100-shared-readwrite - subPath: _shared/course/data100-shared - course::1537664::enrollment_type::ta: - extraVolumeMounts: - - name: home - mountPath: /home/jovyan/data100-shared-readwrite - subPath: _shared/course/data100-shared - course::1537664::enrollment_type::student: - extraVolumeMounts: - - name: home - mountPath: /home/jovyan/data100-shared - subPath: _shared/course/data100-shared - readOnly: true admin: mem_guarantee: 2G extraVolumeMounts: diff --git a/deployments/data101/config/common.yaml b/deployments/data101/config/common.yaml index fb4b3ed58..a968b730a 100644 --- a/deployments/data101/config/common.yaml +++ b/deployments/data101/config/common.yaml @@ -57,18 +57,18 @@ jupyterhub: # - course::N::group::Admins # Data 101, Fall 2024, #https://jira-secure.berkeley.edu/browse/DH-364 - course-staff-1536858: + #course-staff-1536858: # description: Enable course staff to view and access servers. # this role provides permissions to... - scopes: - - admin-ui - - list:users!group=course::1536858 - - admin:servers!group=course::1536858 - - access:servers!group=course::1536858 + #scopes: + # - admin-ui + # - list:users!group=course::1536858 + # - admin:servers!group=course::1536858 + # - access:servers!group=course::1536858 # this role will be assigned to... - groups: - - course::1536858::enrollment_type::teacher - - course::1536858::enrollment_type::ta + #groups: + # - course::1536858::enrollment_type::teacher + #- course::1536858::enrollment_type::ta extraConfig: data101-new-db: | diff --git a/deployments/data8/config/common.yaml b/deployments/data8/config/common.yaml index f8f31528d..6b6bdca59 100644 --- a/deployments/data8/config/common.yaml +++ b/deployments/data8/config/common.yaml @@ -71,18 +71,18 @@ jupyterhub: # - course::N::enrollment_type::ta # Data 8, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6014 - course-staff-1538208: + #course-staff-1538208: # description: Enable course staff to view and access servers. # # this role provides permissions to... - scopes: - - admin-ui - - list:users!group=course::1538208 - - admin:servers!group=course::1538208 - - access:servers!group=course::1538208 + # scopes: + # - admin-ui + # - list:users!group=course::1538208 + # - admin:servers!group=course::1538208 + # - access:servers!group=course::1538208 # # this role will be assigned to... - groups: - - course::1538208::enrollment_type::teacher - - course::1538208::enrollment_type::ta + #groups: + # - course::1538208::enrollment_type::teacher + # - course::1538208::enrollment_type::ta singleuser: extraFiles: diff --git a/deployments/datahub/config/common.yaml b/deployments/datahub/config/common.yaml index 03adce17e..cf4471f02 100644 --- a/deployments/datahub/config/common.yaml +++ b/deployments/datahub/config/common.yaml @@ -36,100 +36,6 @@ jupyterhub: groups: - course::1524699::group::all-admins - # Data 6, Summer 2024, https://github.com/berkeley-dsep-infra/datahub/issues/5847 - course-staff-1535590: - # description: Enable course staff to view and access servers. - # # this role provides permissions to... - scopes: - - admin-ui - - list:users!group=course::1535590 - - admin:servers!group=course::1535590 - - access:servers!group=course::1535590 - # # this role will be assigned to... - groups: - - course::1535590::enrollment_type::teacher - - course::1535590::enrollment_type::ta - - # COMPSS 202, Summer 2024, https://github.com/berkeley-dsep-infra/datahub/issues/5861 - course-staff-1535811: - # description: Enable course staff to view and access servers. - # # this role provides permissions to... - scopes: - - admin-ui - - list:users!group=course::1535811 - - admin:servers!group=course::1535811 - - access:servers!group=course::1535811 - # # this role will be assigned to... - groups: - - course::1535811::enrollment_type::teacher - - course::1535811::enrollment_type::ta - - # MBA 247, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/5923 - course-staff-1536576: - # description: Enable course staff to view and access servers. - # # this role provides permissions to... - scopes: - - admin-ui - - list:users!group=course::1536576 - - admin:servers!group=course::1536576 - - access:servers!group=course::1536576 - # # this role will be assigned to... - groups: - - course::1536576::enrollment_type::teacher - - course::1536576::enrollment_type::ta - - # BIOE C131, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6139 - course-staff-1538361: - # description: Enable course staff to view and access servers. - # # this role provides permissions to... - scopes: - - list:users!group=course::1538361 - - admin:servers!group=course::1538361 - - access:servers!group=course::1538361 - # # this role will be assigned to... - groups: - - course::1538361::enrollment_type::teacher - - course::1538361::enrollment_type::ta - - # ER 131, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6137 - course-staff-1538017: - # description: Enable course staff to view and access servers. - # # this role provides permissions to... - scopes: - - list:users!group=course::1538017 - - admin:servers!group=course::1538017 - - access:servers!group=course::1538017 - # # this role will be assigned to... - groups: - - course::1538017::enrollment_type::teacher - - course::1538017::enrollment_type::ta - - # ECON 140, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6153 - course-staff-1538138: - # description: Enable course staff to view and access servers. - # # this role provides permissions to... - scopes: - - list:users!group=course::1538138 - - admin:servers!group=course::1538138 - - access:servers!group=course::1538138 - # # this role will be assigned to... - groups: - - course::1538138::enrollment_type::teacher - - course::1538138::enrollment_type::ta - - # Data 6, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6158 - course-staff-1538010: - # description: Enable course staff to view and access servers. - # # this role provides permissions to... - scopes: - - list:users!group=course::1538010 - - admin:servers!group=course::1538010 - - access:servers!group=course::1538010 - # # this role will be assigned to... - groups: - - course::1538010::enrollment_type::teacher - - course::1538010::enrollment_type::ta - nodeSelector: hub.jupyter.org/pool-name: core-pool-2024-05-08 initContainers: @@ -229,57 +135,6 @@ jupyterhub: # DataHub Infrastructure staff # https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607 course::1524699::group::all-admins: + admin: true mem_limit: 4096M mem_guarantee: 4096M - - # MBA 247, Fall 2024 - course::1536576::enrollment_type::teacher: - extraVolumeMounts: - - name: home - mountPath: /home/jovyan/mba-247-readwrite - subPath: _shared/course/mba-247 - course::1536576::enrollment_type::ta: - extraVolumeMounts: - - name: home - mountPath: /home/jovyan/mba-247-readwrite - subPath: _shared/course/mba-247 - course::1536576::enrollment_type::student: - extraVolumeMounts: - - name: home - mountPath: /home/jovyan/mba-247 - subPath: _shared/course/mba-247 - readOnly: true - - # COMPSS 214A, Fall 2024, https://jira-secure.berkeley.edu/browse/DH-311 - course::1538139::enrollment_type::teacher: - extraVolumeMounts: - - name: home - mountPath: /home/jovyan/compss-214a-readwrite - subPath: _shared/course/compss-214a - course::1538139::enrollment_type::ta: - extraVolumeMounts: - - name: home - mountPath: /home/jovyan/compss-214a-readwrite - subPath: _shared/course/compss-214a - course::1538139::enrollment_type::student: - extraVolumeMounts: - - name: home - mountPath: /home/jovyan/compss-214a - subPath: _shared/course/compss-214a - readOnly: true - - course::1535590: # Data 6, https://github.com/berkeley-dsep-infra/datahub/issues/5847 - mem_limit: 2048M - mem_guarantee: 2048M - - course::1537045: # ESPM 157, https://github.com/berkeley-dsep-infra/datahub/issues/5914 - mem_limit: 4096M - mem_guarantee: 4096M - - course::1539545: # Demog 213, https://github.com/berkeley-dsep-infra/datahub/issues/6094 - mem_limit: 4096M - mem_guarantee: 4096M - - course::1536576: # MBA 247, https://github.com/berkeley-dsep-infra/datahub/issues/6276 - mem_limit: 2048M - mem_guarantee: 2048M diff --git a/deployments/eecs/config/common.yaml b/deployments/eecs/config/common.yaml index cab1160d2..2eb397534 100644 --- a/deployments/eecs/config/common.yaml +++ b/deployments/eecs/config/common.yaml @@ -100,7 +100,3 @@ jupyterhub: # https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607 course::1524699::group::all-admins: admin: true - - course::1537177: # ELENG 120, https://github.com/berkeley-dsep-infra/datahub/issues/6015 - mem_limit: 4096M - mem_guarantee: 4096M diff --git a/deployments/prob140/config/common.yaml b/deployments/prob140/config/common.yaml index a1e9e8563..64617ed51 100644 --- a/deployments/prob140/config/common.yaml +++ b/deployments/prob140/config/common.yaml @@ -50,18 +50,18 @@ jupyterhub: # - course::N::enrollment_type::ta # Data C140, Fall 2024, #https://github.com/berkeley-dsep-infra/datahub/issues/6011 - course-staff-1537389: + #course-staff-1537389: # description: Enable course staff to view and access servers. # # this role provides permissions to... - scopes: - - admin-ui - - list:users!group=course::1537389 - - admin:servers!group=course::1537389 - - access:servers!group=course::1537389 + # scopes: + # - admin-ui + # - list:users!group=course::1537389 + # - admin:servers!group=course::1537389 + # - access:servers!group=course::1537389 # # this role will be assigned to... - groups: - - course::1537389::enrollment_type::teacher - - course::1537389::enrollment_type::ta + # groups: + # - course::1537389::enrollment_type::teacher + # - course::1537389::enrollment_type::ta nodeSelector: hub.jupyter.org/pool-name: core-pool-2024-05-08 diff --git a/deployments/publichealth/config/common.yaml b/deployments/publichealth/config/common.yaml index 23d429b03..a00a5b6c6 100644 --- a/deployments/publichealth/config/common.yaml +++ b/deployments/publichealth/config/common.yaml @@ -39,18 +39,18 @@ jupyterhub: - course::1524699::group::all-admins # PHW 142, Fall 2024, #https://github.com/berkeley-dsep-infra/datahub/issues/6026 - course-staff-1537782: + #course-staff-1537782: # description: Enable course staff to view and access servers. # this role provides permissions to... - scopes: - - admin-ui - - list:users!group=course::1537782 - - admin:servers!group=course::1537782 - - access:servers!group=course::1537782 + #scopes: + # - admin-ui + # - list:users!group=course::1537782 + # - admin:servers!group=course::1537782 + # - access:servers!group=course::1537782 # this role will be assigned to... - groups: - - course::1537782::enrollment_type::teacher - - course::1537782::enrollment_type::ta + #groups: + # - course::1537782::enrollment_type::teacher + # - course::1537782::enrollment_type::ta extraConfig: # Use 1x- in `common.yaml` extraConfig values. diff --git a/deployments/r/config/common.yaml b/deployments/r/config/common.yaml index cef31ce65..c5336b705 100644 --- a/deployments/r/config/common.yaml +++ b/deployments/r/config/common.yaml @@ -96,6 +96,3 @@ jupyterhub: course::1524699::group::all-admins: mem_limit: 2048M mem_guarantee: 2048M - course::1537932: # Data C131A, https://github.com/berkeley-dsep-infra/datahub/issues/6121 - mem_limit: 2048M - mem_guarantee: 2048M From 83ce0d66ffe0c7f876a133496b2d122bdc9be468 Mon Sep 17 00:00:00 2001 From: "Image Builder Bot[tm]" <github-action-bot@users.noreply.github.com> Date: Wed, 1 Jan 2025 08:55:32 +0000 Subject: [PATCH 2/5] update ischool image tag to 7f769a0f30ae --- deployments/ischool/hubploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/ischool/hubploy.yaml b/deployments/ischool/hubploy.yaml index ec63ec112..422361ae3 100644 --- a/deployments/ischool/hubploy.yaml +++ b/deployments/ischool/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/ischool-user-image:bf3004dcb234 + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/ischool-user-image:7f769a0f30ae cluster: provider: gcloud From e7ea159aca86a871cb6313d67409a1709932483d Mon Sep 17 00:00:00 2001 From: "Image Builder Bot[tm]" <github-action-bot@users.noreply.github.com> Date: Sat, 4 Jan 2025 07:29:39 +0000 Subject: [PATCH 3/5] update datahub image tag to 80bf33e5110e --- deployments/datahub/hubploy.yaml | 2 +- deployments/dlab/hubploy.yaml | 2 +- deployments/highschool/hubploy.yaml | 2 +- deployments/prob140/hubploy.yaml | 2 +- deployments/r/hubploy.yaml | 2 +- deployments/template/{{cookiecutter.hub_name}}/hubploy.yaml | 2 +- deployments/workshop/hubploy.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deployments/datahub/hubploy.yaml b/deployments/datahub/hubploy.yaml index 90694a709..35d0e5d9c 100644 --- a/deployments/datahub/hubploy.yaml +++ b/deployments/datahub/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5 + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:80bf33e5110e cluster: provider: gcloud diff --git a/deployments/dlab/hubploy.yaml b/deployments/dlab/hubploy.yaml index 36265bbbc..0341f408a 100644 --- a/deployments/dlab/hubploy.yaml +++ b/deployments/dlab/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5 + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:80bf33e5110e path: ../datahub/images/default cluster: diff --git a/deployments/highschool/hubploy.yaml b/deployments/highschool/hubploy.yaml index 36265bbbc..0341f408a 100644 --- a/deployments/highschool/hubploy.yaml +++ b/deployments/highschool/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5 + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:80bf33e5110e path: ../datahub/images/default cluster: diff --git a/deployments/prob140/hubploy.yaml b/deployments/prob140/hubploy.yaml index 90694a709..35d0e5d9c 100644 --- a/deployments/prob140/hubploy.yaml +++ b/deployments/prob140/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5 + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:80bf33e5110e cluster: provider: gcloud diff --git a/deployments/r/hubploy.yaml b/deployments/r/hubploy.yaml index 90694a709..35d0e5d9c 100644 --- a/deployments/r/hubploy.yaml +++ b/deployments/r/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5 + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:80bf33e5110e cluster: provider: gcloud diff --git a/deployments/template/{{cookiecutter.hub_name}}/hubploy.yaml b/deployments/template/{{cookiecutter.hub_name}}/hubploy.yaml index 6dd26d2f3..e14a971ec 100644 --- a/deployments/template/{{cookiecutter.hub_name}}/hubploy.yaml +++ b/deployments/template/{{cookiecutter.hub_name}}/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5 + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:80bf33e5110e cluster: provider: gcloud diff --git a/deployments/workshop/hubploy.yaml b/deployments/workshop/hubploy.yaml index 90694a709..35d0e5d9c 100644 --- a/deployments/workshop/hubploy.yaml +++ b/deployments/workshop/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5 + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:80bf33e5110e cluster: provider: gcloud From 5cad598da3f0338c228b32fd9c6c2c97b43d4d68 Mon Sep 17 00:00:00 2001 From: "Image Builder Bot[tm]" <github-action-bot@users.noreply.github.com> Date: Sat, 4 Jan 2025 10:24:06 +0000 Subject: [PATCH 4/5] update datahub image tag to 661364a51a63 --- deployments/datahub/hubploy.yaml | 2 +- deployments/dlab/hubploy.yaml | 2 +- deployments/highschool/hubploy.yaml | 2 +- deployments/prob140/hubploy.yaml | 2 +- deployments/r/hubploy.yaml | 2 +- deployments/template/{{cookiecutter.hub_name}}/hubploy.yaml | 2 +- deployments/workshop/hubploy.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deployments/datahub/hubploy.yaml b/deployments/datahub/hubploy.yaml index 35d0e5d9c..fba1451dd 100644 --- a/deployments/datahub/hubploy.yaml +++ b/deployments/datahub/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:80bf33e5110e + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:661364a51a63 cluster: provider: gcloud diff --git a/deployments/dlab/hubploy.yaml b/deployments/dlab/hubploy.yaml index 0341f408a..6c42b3238 100644 --- a/deployments/dlab/hubploy.yaml +++ b/deployments/dlab/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:80bf33e5110e + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:661364a51a63 path: ../datahub/images/default cluster: diff --git a/deployments/highschool/hubploy.yaml b/deployments/highschool/hubploy.yaml index 0341f408a..6c42b3238 100644 --- a/deployments/highschool/hubploy.yaml +++ b/deployments/highschool/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:80bf33e5110e + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:661364a51a63 path: ../datahub/images/default cluster: diff --git a/deployments/prob140/hubploy.yaml b/deployments/prob140/hubploy.yaml index 35d0e5d9c..fba1451dd 100644 --- a/deployments/prob140/hubploy.yaml +++ b/deployments/prob140/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:80bf33e5110e + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:661364a51a63 cluster: provider: gcloud diff --git a/deployments/r/hubploy.yaml b/deployments/r/hubploy.yaml index 35d0e5d9c..fba1451dd 100644 --- a/deployments/r/hubploy.yaml +++ b/deployments/r/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:80bf33e5110e + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:661364a51a63 cluster: provider: gcloud diff --git a/deployments/template/{{cookiecutter.hub_name}}/hubploy.yaml b/deployments/template/{{cookiecutter.hub_name}}/hubploy.yaml index e14a971ec..b1c82a940 100644 --- a/deployments/template/{{cookiecutter.hub_name}}/hubploy.yaml +++ b/deployments/template/{{cookiecutter.hub_name}}/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:80bf33e5110e + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:661364a51a63 cluster: provider: gcloud diff --git a/deployments/workshop/hubploy.yaml b/deployments/workshop/hubploy.yaml index 35d0e5d9c..fba1451dd 100644 --- a/deployments/workshop/hubploy.yaml +++ b/deployments/workshop/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:80bf33e5110e + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:661364a51a63 cluster: provider: gcloud From bc2f0ea0e97f17debe9e143b9326c57c15001a6f Mon Sep 17 00:00:00 2001 From: ryanlovett <rylo@berkeley.edu> Date: Sun, 5 Jan 2025 18:10:34 -0800 Subject: [PATCH 5/5] Remove admin flag again. Administrative roles should be granted in loadRoles. --- deployments/datahub/config/common.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/deployments/datahub/config/common.yaml b/deployments/datahub/config/common.yaml index cf4471f02..786248163 100644 --- a/deployments/datahub/config/common.yaml +++ b/deployments/datahub/config/common.yaml @@ -135,6 +135,5 @@ jupyterhub: # DataHub Infrastructure staff # https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607 course::1524699::group::all-admins: - admin: true mem_limit: 4096M mem_guarantee: 4096M