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

merging 6460/6463/6464/6465 to prod
berkeley-dsep-infra · Nov 8, 2024 · cdbf194 · cdbf194
2 parents 10abdb2 + 47fbf6b
commit cdbf194
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 14 deletions.
diff --git 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.

diff --git 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

diff --git 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:c8ba144738b5
 
 cluster:
   provider: gcloud

diff --git 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:c8ba144738b5
       path: ../datahub/images/default
 
 cluster:

diff --git 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:c8ba144738b5
       path: ../datahub/images/default
 
 cluster:

diff --git 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:c8ba144738b5
 
 cluster:
   provider: gcloud

diff --git 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:c8ba144738b5
 
 cluster:
   provider: gcloud

diff --git 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:c8ba144738b5
 
 cluster:
   provider: gcloud

diff --git 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:c8ba144738b5
 
 cluster:
   provider: gcloud

diff --git 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 \
      <cluster-name>
 ```
 
@@ -57,6 +58,7 @@ gcloud container node-pools create  \
     --no-enable-autoupgrade \
     --tags=hub-cluster \
     --cluster=<cluster-name> \
+    --no-enable-insecure-kubelet-readonly-port \
     user-<pool-name>-<yyyy>-<mm>-<dd>
 ```