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

Merge #2856, #2857, #2858, #2862, #2863 to prod

.github/ISSUE_TEMPLATE/teamreport.md

@@ -7,6 +7,8 @@ assignees:
 - balajialg
 - felder
 - yuvipanda
+- ericvd-ucb
+- ryanlovett 
 ---
 
 _Copy and paste the template below, and answer questions as you wish!_

deployments/biology/image/Dockerfile

@@ -37,6 +37,11 @@ RUN apt-get update -qq --yes && \
     apt-get install --yes --no-install-recommends -qq \
         libgsl-dev >/dev/null
 
+## library required for running ccb293 package qiime
+RUN apt-get update -qq --yes > /dev/null && \
+    apt-get install --yes -qq \
+    tzdata > /dev/null
+
 # Install these without 'recommended' packages to keep image smaller.
 # Useful utils that folks sort of take for granted
 RUN apt-get update -qq --yes && \

hub/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: '1.0'
 description: Deployment Chart for JupyterHub
 name: hub
-version: 0.0.1-n4387.h949fc1b6
+version: 0.0.1-n4584.h0d3ac306

hub/values.yaml

@@ -128,7 +128,9 @@ jupyterhub:
         max_per_page: 30000
       JupyterHub:
         authenticator_class: canvasauthenticator.CanvasOAuthenticator
-
+        # Return 424, not 503, when requests go to a stopped server
+        # Keeps our 503 error graphs clearer
+        use_legacy_stopped_server_status_code: false
       CanvasOAuthenticator:
         canvas_url: https://bcourses.berkeley.edu/
         strip_email_domain: berkeley.edu
@@ -141,7 +143,7 @@ jupyterhub:
     # Generated by chartpress
     image:
       name: gcr.io/ucb-datahub-2018/jupyterhub-hub
-      tag: '0.0.1-n4557.he3eb9e03'
+      tag: '0.0.1-n4584.h0d3ac306'
     networkPolicy:
       enabled: true
       ingress:

images/hub/Dockerfile

@@ -9,7 +9,7 @@ RUN apt update > /dev/null  && apt install --yes npm > /dev/null
 
 # Brings in https://github.com/jupyterhub/jupyterhub/pull/3579
 # and https://github.com/jupyterhub/jupyterhub/pull/3639
-RUN python3 -m pip install -U git+https://github.com/jupyterhub/jupyterhub.git@69a1e97fbee1711e3fdb5fd795e349a4eb395060
+RUN python3 -m pip install --no-cache --force-reinstall --upgrade git+https://github.com/jupyterhub/jupyterhub.git@69a1e97fbee1711e3fdb5fd795e349a4eb395060
 
 COPY canvasauthenticator /srv/canvasauthenticator
 RUN python3 -m pip install --no-cache /srv/canvasauthenticator

images/node-placeholder-scaler/scaler/scaler.py

@@ -60,6 +60,9 @@ def get_replica_counts(events):
             except:
                 logging.error(f'Error in parsing description of {_event_repr(ev)}')
                 pass
+            if pools_replica_config is None:
+                logging.error(f'No description in event {_event_repr(ev)}')
+                continue
             for pool_name, count in pools_replica_config.items():
                 if not isinstance(count, int):
                     continue

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-n4463.h24c87372
+version: 0.0.1-n4575.h93291415
 
 # 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

node-placeholder/values.yaml

@@ -4,7 +4,7 @@ image:
   repository: gcr.io/ucb-datahub-2018/node-placeholder-scaler
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "0.0.1-n4463.h24c87372"
+  tag: "0.0.1-n4575.h93291415"
 
 imagePullSecrets: []
 nameOverride: ""