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

merging 6017/6024/6025 to prod
berkeley-dsep-infra · Aug 27, 2024 · c62fc2c · c62fc2c
2 parents 5fda6b3 + 3bf0079
commit c62fc2c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 24 deletions.
diff --git a/.github/workflows/deploy-all-hubs.yaml b/.github/workflows/deploy-all-hubs.yaml
@@ -21,7 +21,7 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Pull out any hubs that need deploying from the labels on the merge commit to staging
+      - name: Check to see if the base jupyterhub image has changed, and deploy all hubs to prod if it has
         run: |
           echo "PR labels: ${{ steps.pr-labels.outputs.labels }}"
           for label in $(echo -e "${{ steps.pr-labels.outputs.labels }}"); do
@@ -110,7 +110,7 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Pull out any hubs that need deploying from the labels on the merge commit to prod
+      - name: Check to see if the base jupyterhub image has changed, and deploy all hubs to prod if it has
         run: |
           echo "PR labels: ${{ steps.pr-labels.outputs.labels }}"
           for label in $(echo -e "${{ steps.pr-labels.outputs.labels }}"); do

diff --git a/.github/workflows/deploy-hubs.yaml b/.github/workflows/deploy-hubs.yaml
@@ -31,7 +31,7 @@ jobs:
           # If the PR labels "hub-images" or "jupyterhub-deployment" are present, this
           # means the base hub image has changed, and all hubs (staging or prod) need to
           # be redeployed.  The rest of this job will not run in that case.
-          if [ -n $GITHUB_PR_LABEL_HUB_IMAGES ] || [ -n $GITHUB_PR_LABEL_JUPYTERHUB_DEPLOYMENT ]; then
+          if [ -c "${GITHUB_PR_LABEL_HUB_IMAGES}" ] || [ -c "${GITHUB_PR_LABEL_JUPYTERHUB_DEPLOYMENT}" ]; then
             echo "Base hub image has changed, not deploying individual hubs to staging"
           else
             # deploy any hubs that have been labeled for deployment
@@ -131,7 +131,7 @@ jobs:
           # If the PR labels "hub-images" or "jupyterhub-deployment" are present, this
           # means the base hub image has changed, and all hubs (staging or prod) need to
           # be redeployed.  The rest of this job will not run in that case.
-          if [ -n $GITHUB_PR_LABEL_HUB_IMAGES ] || [ -n $GITHUB_PR_LABEL_JUPYTERHUB_DEPLOYMENT ]; then
+          if [ -c "${GITHUB_PR_LABEL_HUB_IMAGES}" ] || [ -c "${GITHUB_PR_LABEL_JUPYTERHUB_DEPLOYMENT}" ]; then
             echo "Base hub image has changed, not deploying individual hubs to prod"
           else
             # deploy any hubs that have been labeled for deployment

diff --git a/deployments/data8/config/common.yaml b/deployments/data8/config/common.yaml
@@ -61,19 +61,19 @@ jupyterhub:
       #    - course::N::enrollment_type::teacher
       #    - course::N::enrollment_type::ta
 
-      # Data 8, Summer 2024, https://github.com/berkeley-dsep-infra/datahub/issues/5834
-      course-staff-1535365:
+      # Data 8, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6014
+      course-staff-1538208:
       #  description: Enable course staff to view and access servers.
       #  # this role provides permissions to...
         scopes:
           - admin-ui
-          - list:users!group=course::1535365
-          - admin:servers!group=course::1535365
-          - access:servers!group=course::1535365
+          - list:users!group=course::1538208
+          - admin:servers!group=course::1538208
+          - access:servers!group=course::1538208
       #  # this role will be assigned to...
         groups:
-          - course::1535365::enrollment_type::teacher
-          - course::1535365::enrollment_type::ta
+          - course::1538208::enrollment_type::teacher
+          - course::1538208::enrollment_type::ta
 
   singleuser:
     extraFiles:

diff --git a/deployments/prob140/config/common.yaml b/deployments/prob140/config/common.yaml
@@ -49,20 +49,19 @@ jupyterhub:
       #    - course::N::enrollment_type::teacher
       #    - course::N::enrollment_type::ta
 
-     ## Data C140, Spring 2024, #https://github.com/berkeley-dsep-infra/datahub/issues/5466
-     #course-staff-1533557:
+     # Data C140, Fall 2024, #https://github.com/berkeley-dsep-infra/datahub/issues/6011
+      course-staff-1537389:
       #  description: Enable course staff to view and access servers.
-        # this role provides permissions to...
-       # scopes:
-       #  - admin-ui
-       #  - list:users!group=course::1533557
-       #  - admin:servers!group=course::1533557
-       #  - access:servers!group=course::1533557
-        # this role will be assigned to...
-       # groups:
-        #  - course::1533557::enrollment_type::teacher
-        #  - course::1533557::enrollment_type::ta
-
+      #  # this role provides permissions to...
+        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
     nodeSelector:
       hub.jupyter.org/pool-name: core-pool-2024-05-08