Merge pull request #1190 from minrk/pin-k8s

pin kubernetes, jupyterhub in requirements.in
jupyterhub · Nov 2, 2020 · 3d82293 · 3d82293
2 parents 7e04ad4 + 9e6d009
commit 3d82293
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/helm-chart/images/binderhub/requirements.in b/helm-chart/images/binderhub/requirements.in
@@ -4,3 +4,10 @@
 #    ./dependencies freeze --upgrade
 #
 google-cloud-logging
+
+# pins for our image
+# kubernetes is pinned to 9 because we have observed a performance issue in 12
+# where listing pods took ~6s instead of ~1s
+kubernetes==9.*
+# jupyterhub is pinned to match the JupyterHub Helm chart's version of jupyterhub
+jupyterhub==1.1.*
diff --git a/helm-chart/images/binderhub/requirements.txt b/helm-chart/images/binderhub/requirements.txt
@@ -27,8 +27,8 @@ ipython-genutils==0.2.0   # via traitlets
 jinja2==2.11.2            # via -r binderhub.in, jupyterhub
 jsonschema==3.2.0         # via -r binderhub.in, jupyter-telemetry
 jupyter-telemetry==0.1.0  # via jupyterhub
-jupyterhub==1.2.0         # via -r binderhub.in
-kubernetes==12.0.0        # via -r binderhub.in
+jupyterhub==1.1.0         # via -r binderhub.in, -r requirements.in
+kubernetes==9.0.1         # via -r binderhub.in, -r requirements.in
 mako==1.1.3               # via alembic
 markupsafe==1.1.1         # via jinja2, mako
 oauthlib==3.1.0           # via jupyterhub, requests-oauthlib