From 4d208e4dd9cfe03d88668290349b57597a71fdc4 Mon Sep 17 00:00:00 2001 From: Balaji Alwar Date: Tue, 5 Nov 2024 09:54:36 -0800 Subject: [PATCH 1/5] Enable elevated privileges for data100 course staff --- deployments/data100/config/common.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/deployments/data100/config/common.yaml b/deployments/data100/config/common.yaml index ef73a4f3f..a50d0c4c6 100644 --- a/deployments/data100/config/common.yaml +++ b/deployments/data100/config/common.yaml @@ -41,18 +41,18 @@ jupyterhub: # this role will be assigned to... groups: - course::1524699::group::all-admins - #Data 100, Summer 2024, https://github.com/berkeley-dsep-infra/datahub/issues/5802 - course-staff-1535115: + #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::1535115 - - admin:servers!group=course::1535115 - - access:servers!group=course::1535115 + - list:users!group=course::1537664 + - admin:servers!group=course::1537664 + - access:servers!group=course::1537664 # this role will be assigned to... groups: - - course::1535115::group::Admins + - course::1537664::group::Admins # Econ 148, Spring 2024, DH-225 #course-staff-1532866: # description: Enable course staff to view and access servers. From 9127b3429c117cb6a77bc4b3eacbe7360a7b4c13 Mon Sep 17 00:00:00 2001 From: "Image Builder Bot[tm]" Date: Tue, 5 Nov 2024 20:46:17 +0000 Subject: [PATCH 2/5] update data100 image tag to 9767c87d1084 --- deployments/data100/hubploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/data100/hubploy.yaml b/deployments/data100/hubploy.yaml index dd38c38e2..5a36ec251 100644 --- a/deployments/data100/hubploy.yaml +++ b/deployments/data100/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data100-user-image:511c4637d702 + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data100-user-image:9767c87d1084 cluster: provider: gcloud From c030aad34b64f730b864a569db100ac91f2cb14a Mon Sep 17 00:00:00 2001 From: "Image Builder Bot[tm]" Date: Tue, 5 Nov 2024 22:07:29 +0000 Subject: [PATCH 3/5] update datahub image tag to 32dc6f548a15 --- 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 4e740e459..2686c0b5e 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:34f4eb103e6a + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:32dc6f548a15 cluster: provider: gcloud diff --git a/deployments/dlab/hubploy.yaml b/deployments/dlab/hubploy.yaml index dd6b9e693..e5efa3be3 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:34f4eb103e6a + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:32dc6f548a15 path: ../datahub/images/default cluster: diff --git a/deployments/highschool/hubploy.yaml b/deployments/highschool/hubploy.yaml index dd6b9e693..e5efa3be3 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:34f4eb103e6a + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:32dc6f548a15 path: ../datahub/images/default cluster: diff --git a/deployments/prob140/hubploy.yaml b/deployments/prob140/hubploy.yaml index 4e740e459..2686c0b5e 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:34f4eb103e6a + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:32dc6f548a15 cluster: provider: gcloud diff --git a/deployments/r/hubploy.yaml b/deployments/r/hubploy.yaml index 4e740e459..2686c0b5e 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:34f4eb103e6a + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:32dc6f548a15 cluster: provider: gcloud diff --git a/deployments/template/{{cookiecutter.hub_name}}/hubploy.yaml b/deployments/template/{{cookiecutter.hub_name}}/hubploy.yaml index b7d37b9b7..e827611b0 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:34f4eb103e6a + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:32dc6f548a15 cluster: provider: gcloud diff --git a/deployments/workshop/hubploy.yaml b/deployments/workshop/hubploy.yaml index 4e740e459..2686c0b5e 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:34f4eb103e6a + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:32dc6f548a15 cluster: provider: gcloud From 12bc9413f804822985e5cabea22984560a119ac0 Mon Sep 17 00:00:00 2001 From: "Image Builder Bot[tm]" Date: Wed, 6 Nov 2024 21:49:33 +0000 Subject: [PATCH 4/5] update datahub image tag to c8ba144738b5 --- 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 2686c0b5e..90694a709 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:32dc6f548a15 + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5 cluster: provider: gcloud diff --git a/deployments/dlab/hubploy.yaml b/deployments/dlab/hubploy.yaml index e5efa3be3..36265bbbc 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:32dc6f548a15 + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5 path: ../datahub/images/default cluster: diff --git a/deployments/highschool/hubploy.yaml b/deployments/highschool/hubploy.yaml index e5efa3be3..36265bbbc 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:32dc6f548a15 + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5 path: ../datahub/images/default cluster: diff --git a/deployments/prob140/hubploy.yaml b/deployments/prob140/hubploy.yaml index 2686c0b5e..90694a709 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:32dc6f548a15 + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5 cluster: provider: gcloud diff --git a/deployments/r/hubploy.yaml b/deployments/r/hubploy.yaml index 2686c0b5e..90694a709 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:32dc6f548a15 + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5 cluster: provider: gcloud diff --git a/deployments/template/{{cookiecutter.hub_name}}/hubploy.yaml b/deployments/template/{{cookiecutter.hub_name}}/hubploy.yaml index e827611b0..6dd26d2f3 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:32dc6f548a15 + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5 cluster: provider: gcloud diff --git a/deployments/workshop/hubploy.yaml b/deployments/workshop/hubploy.yaml index 2686c0b5e..90694a709 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:32dc6f548a15 + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5 cluster: provider: gcloud From f725248388d5f599b22fe0840efed504502351b5 Mon Sep 17 00:00:00 2001 From: Jonathan Felder Date: Thu, 7 Nov 2024 14:41:27 -0800 Subject: [PATCH 5/5] [DH-379] updating docs to specify --no-enable-insecure-kubelet-readonly-port when creating clusters/nodepools --- docs/admins/cluster-config.qmd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/admins/cluster-config.qmd b/docs/admins/cluster-config.qmd index f042ee4ea..07b4c44c0 100644 --- a/docs/admins/cluster-config.qmd +++ b/docs/admins/cluster-config.qmd @@ -38,6 +38,7 @@ gcloud container clusters create \ --enable-network-policy \ --create-subnetwork="" \ --tags=hub-cluster \ + --no-enable-insecure-kubelet-readonly-port \ ``` @@ -57,6 +58,7 @@ gcloud container node-pools create \ --no-enable-autoupgrade \ --tags=hub-cluster \ --cluster= \ + --no-enable-insecure-kubelet-readonly-port \ user----
```