berkeley-dsep-infra · shaneknapp · Dec 19, 2023 · Dec 14, 2023 · Dec 18, 2023 · Dec 18, 2023
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -57,7 +57,7 @@ orbs:
               - run:
                   name: Install google cloud sdk
                   command: |
-                    export GCLOUD_URL=https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-363.0.0-linux-x86_64.tar.gz
+                    export GCLOUD_URL=https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-457.0.0-linux-x86_64.tar.gz
                     curl -sSL $GCLOUD_URL | tar -xzf - -C ${HOME}
                     # Be careful with quote ordering here. ${PATH} must not be expanded
                     # Don't use ~ here - bash can interpret PATHs containing ~, but most other things can't.
@@ -66,6 +66,11 @@ orbs:
                     # Try to tell cloud sdk to use python3
                     echo 'export CLOUDSDK_PYTHON=python3' >> ${BASH_ENV}
 
+              - run:
+                  name: Install gcloud auth plugin
+                  command: |
+                    gcloud components install gke-gcloud-auth-plugin
+
               - run:
                   name: Configure credential helper for Google Artifact Registry
                   command: |
@@ -117,9 +122,9 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-            - v3.9-dependencies-gcloud-363-{{ checksum "requirements.txt" }}
+            - v3.9-dependencies-gcloud-457-{{ checksum "requirements.txt" }}
             # fallback to using the latest cache if no exact match is found
-            - v3.9-dependencies-gcloud-363-
+            - v3.9-dependencies-gcloud-457-
 
       - run:
           name: install dependencies
@@ -131,7 +136,7 @@ jobs:
             # Can be removed once https://github.com/docker/docker-py/issues/2225 is merged and released
             pip install --upgrade git+https://github.com/docker/docker-py.git@b6f6e7270ef1acfe7398b99b575d22d0d37ae8bf
 
-            export GCLOUD_URL=https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-363.0.0-linux-x86_64.tar.gz
+            export GCLOUD_URL=https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-457.0.0-linux-x86_64.tar.gz
             curl -sSL $GCLOUD_URL | tar -xzf - -C ${HOME}
             # Be careful with quote ordering here. ${PATH} must not be expanded
             # Don't use ~ here - bash can interpret PATHs containing ~, but most other things can't.
@@ -144,7 +149,7 @@ jobs:
       - save_cache:
           paths:
             - ./venv
-          key: v3.9-dependencies-gcloud-363-{{ checksum "requirements.txt" }}
+          key: v3.9-dependencies-gcloud-457-{{ checksum "requirements.txt" }}
 
       - run:
           name: Authenticating with google service account for kms/sops
@@ -155,7 +160,7 @@ jobs:
       - run:
           name: Install helm3
           command: |
-            curl -L https://get.helm.sh/helm-v3.6.3-linux-amd64.tar.gz | \
+            curl -L https://get.helm.sh/helm-v3.13.3-linux-amd64.tar.gz | \
               tar -xzf -
             mv linux-amd64/helm /usr/local/bin
             helm repo add jupyterhub https://jupyterhub.github.io/helm-chart/
@@ -168,10 +173,16 @@ jobs:
             export PULL_REQUEST_ID=$(git log -1 --pretty=%B | head -n1 | sed 's/^.*#\([0-9]*\).*/\1/')
             export AUTHOR_NAME="$(git log  -1 --pretty=%aN)"
             export PULL_REQUEST_TITLE="$(git log --pretty=%B -1 | tail -n+3)"
-            python3 scripts/post-grafana-annotation.py  \
-              --grafana-url http://grafana.datahub.berkeley.edu\
-              --tag deployment-start \
-              "$(echo -en ${PULL_REQUEST_TITLE}\\n\\n${AUTHOR_NAME}: https://github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/pull/${PULL_REQUEST_ID})"
+
+            # added by sknapp 2023-12-19 to unblock builds
+            # python3 scripts/post-grafana-annotation.py  \
+            #   --grafana-url http://grafana.datahub.berkeley.edu\
+            #   --tag deployment-start \
+            #  "$(echo -en ${PULL_REQUEST_TITLE}\\n\\n${AUTHOR_NAME}: https://github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/pull/${PULL_REQUEST_ID})"
+      - run:
+          name: Install gcloud auth plugin
+          command: |
+            gcloud components install gke-gcloud-auth-plugin
 
       - run:
           name: Deploy a11y
@@ -328,7 +339,7 @@ jobs:
       - run:
           name: install google-cloud-sdk
           command: |
-            export GCLOUD_URL=https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-363.0.0-linux-x86_64.tar.gz
+            export GCLOUD_URL=https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-457.0.0-linux-x86_64.tar.gz
             curl -sSL $GCLOUD_URL | tar -xzf - -C ${HOME}
             # Be careful with quote ordering here. ${PATH} must not be expanded
             # Don't use ~ here - bash can interpret PATHs containing ~, but most other things can't.
@@ -338,7 +349,7 @@ jobs:
       - run:
           name: Setup helm3
           command: |
-            curl -L https://get.helm.sh/helm-v3.5.4-linux-amd64.tar.gz | \
+            curl -L https://get.helm.sh/helm-v3.13.3-linux-amd64.tar.gz | \
               tar -xzf -
             mv linux-amd64/helm /usr/local/bin
             helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
@@ -356,6 +367,7 @@ jobs:
       - run:
           name: Activate credentials for datahub cluster (fall-2019)
           command: |
+            gcloud components install gke-gcloud-auth-plugin
             sops -d -i deployments/datahub/secrets/gke-key.json
             gcloud auth \
               activate-service-account \
@@ -372,7 +384,7 @@ jobs:
             helm upgrade \
               --install --wait \
               --namespace=node-placeholder node-placeholder node-placeholder \
-              -f node-placeholder/secrets.yaml
+              -f node-placeholder/secrets.yaml --debug
 
   deploy-support:
     docker:
@@ -384,7 +396,7 @@ jobs:
       - run:
           name: install google-cloud-sdk
           command: |
-            export GCLOUD_URL=https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-363.0.0-linux-x86_64.tar.gz
+            export GCLOUD_URL=https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-457.0.0-linux-x86_64.tar.gz
             curl -sSL $GCLOUD_URL | tar -xzf - -C ${HOME}
             # Be careful with quote ordering here. ${PATH} must not be expanded
             # Don't use ~ here - bash can interpret PATHs containing ~, but most other things can't.
@@ -404,14 +416,15 @@ jobs:
       - run:
           name: Setup helm3
           command: |
-            curl -L https://get.helm.sh/helm-v3.6.3-linux-amd64.tar.gz | \
+            curl -L https://get.helm.sh/helm-v3.13.3-linux-amd64.tar.gz | \
               tar -xzf -
             mv linux-amd64/helm /usr/local/bin
             helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
 
       - run:
           name: Activate credentials for datahub cluster (fall-2019)
           command: |
+            gcloud components install gke-gcloud-auth-plugin
             sops -d -i deployments/datahub/secrets/gke-key.json
             gcloud auth \
               activate-service-account \
@@ -430,7 +443,8 @@ jobs:
               --install --wait \
               --namespace=support \
               support support/ \
-              -f support/secrets.yaml
+              -f support/secrets.yaml \
+              --set installCRDs=true --debug
 
 workflows:
   version: 2

diff --git a/deployments/data100/config/common.yaml b/deployments/data100/config/common.yaml
@@ -81,9 +81,6 @@ jupyterhub:
       # https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607
       course::1524699::group::all-admins:
         admin: true
-      course::1527426::group::Content:
-        mem_limit: 4G
-        mem_guarantee: 4G
     admin:
       mem_limit: 4G
       mem_guarantee: 2G

diff --git a/deployments/data101/config/common.yaml b/deployments/data101/config/common.yaml
@@ -209,12 +209,6 @@ jupyterhub:
 
   custom:
     group_profiles:
-      course::1528038::enrollment_type::teacher:
-        mem_limit: 4096M
-        mem_guarantee: 2048M
-      course::1528038::enrollment_type::ta:
-        mem_limit: 4096M
-        mem_guarantee: 2048M    
   # DataHub Infrastructure staff
       # https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607
       course::1524699::group::all-admins:

diff --git a/deployments/datahub/config/common.yaml b/deployments/datahub/config/common.yaml
@@ -173,19 +173,3 @@ jupyterhub:
             mountPath: /home/jovyan/ugba-88
             subPath: _shared/course/ugba-88
             readOnly: true
-      course::1527534: # CE 103N, Fall 2023, issue #4999
-        mem_limit: 4096M
-        mem_guarantee: 4096M
-      course::1528163: # Demog 180, Fall 2023, issue #5004
-        mem_limit: 4096M
-        mem_guarantee: 4096M
-      course::1524680: # UGBA88, Fall 2023, issue #5071
-        mem_limit: 3072M
-        mem_guarantee: 3072M
-      course::1527878: # Music 30, Fall 2023, issue #5153
-        mem_limit: 2048M
-        mem_guarantee: 2048M
-      # Econ 144, Fall 2023, issue #5161
-      course::1530164::enrollment_type::teacher:
-        mem_limit: 2048M
-        mem_guarantee: 2048M
diff --git a/deployments/edx/image/environment.yml b/deployments/edx/image/environment.yml
@@ -46,5 +46,5 @@ dependencies:
   - gh-scoped-creds==4.1
   - git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
   - otter-grader==4.4.1
-  - otter-submit==0.1.1
+  - otter-submit==0.1.2
   - sympy==1.12
diff --git a/deployments/eecs/config/common.yaml b/deployments/eecs/config/common.yaml
@@ -84,10 +84,3 @@ jupyterhub:
       guarantee: 0.1
     image: {}
 
-  # read by z2jh.get_config() in hub/values.yaml
-  # formerly jupyterhub.hub.extraConfigMap
-  custom:
-    group_profiles:
-      course::1527328: # EE 120, Fall 2023, issue #4868
-        mem_limit: 4096M
-        mem_guarantee: 4096M
diff --git a/deployments/r/config/common.yaml b/deployments/r/config/common.yaml
@@ -78,8 +78,3 @@ jupyterhub:
       limit: 1G
     image: {}
 
-  custom:
-    group_profiles:
-      course::1527100: # ESPM 157, Fall 2023, issue #4822
-        mem_limit: 4096M
-        mem_guarantee: 4096M
diff --git a/hub/Chart.yaml b/hub/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: '1.0'
 description: Deployment Chart for JupyterHub
 name: hub
-version: 0.0.1-0.dev.git.7076.heb3ce9bd
+version: 0.0.1-0.dev.git.7126.h64800628
diff --git a/hub/requirements.yaml b/hub/requirements.yaml
@@ -4,5 +4,5 @@ dependencies:
    # get the helm chart version from here:  https://github.com/jupyterhub/helm-chart
    # correlate the helm chart version w/jupyterhub here:
    # https://hub.jupyter.org/helm-chart/#development-releases-jupyterhub
-   version: 3.0.2
+   version: 3.2.1
    repository: https://jupyterhub.github.io/helm-chart/
diff --git a/hub/values.yaml b/hub/values.yaml
@@ -219,7 +219,7 @@ jupyterhub:
     # Generated by chartpress
     image:
       name: gcr.io/ucb-datahub-2018/jupyterhub-hub
-      tag: '0.0.1-0.dev.git.7076.heb3ce9bd'
+      tag: '0.0.1-0.dev.git.7126.h64800628'
     networkPolicy:
       enabled: true
       ingress:

diff --git a/images/hub/Dockerfile b/images/hub/Dockerfile
@@ -1,12 +1,12 @@
 # Should match the hub image used by version of chart in hub/requirements.yaml
 # If that changes, this should be changed too!
-FROM jupyterhub/k8s-hub:3.0.2
+FROM jupyterhub/k8s-hub:3.2.1
 
 USER root
 
 RUN python3 -m pip install --no-cache git+https://github.com/berkeley-dsep-infra/canvasoauthenticator@09e7ed8
 RUN python3 -m pip install --no-cache jupyterhub-ltiauthenticator==1.5.1
-RUN python3 -m pip install --no-cache git+https://github.com/jupyterhub/[email protected]
+#RUN python3 -m pip install --no-cache git+https://github.com/jupyterhub/[email protected]
 RUN python3 -m pip install --no-cache jupyterhub-announcement
 COPY logos /srv/logos
 

diff --git a/node-placeholder/Chart.yaml b/node-placeholder/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.1-0.dev.git.6958.h1afe4805
+version: 0.0.1-0.dev.git.7077.h95e09b06
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/support/requirements.yaml b/support/requirements.yaml
@@ -1,15 +1,15 @@
 dependencies:
  - name: prometheus-statsd-exporter
-   version: 0.5.0
+   version: 0.11.0
    repository: https://prometheus-community.github.io/helm-charts
  - name: prometheus
-   version: 15.12.0
+   version: 25.8.2
    repository: https://prometheus-community.github.io/helm-charts
  - name: grafana
    version: 6.57.4
    repository: https://grafana.github.io/helm-charts
  - name: cert-manager
-   version: v1.9.1
+   version: v1.13.3
    repository: https://charts.jetstack.io
  - name: ingress-nginx
    version: 4.8.3

diff --git a/support/values.yaml b/support/values.yaml
@@ -1,7 +1,7 @@
 cert-manager:
   nodeSelector:
     hub.jupyter.org/pool-name: support-pool
-  installCRDs: true
+      #  installCRDs: true
   cainjector:
     nodeSelector:
       hub.jupyter.org/pool-name: support-pool