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

Merge #1792, #1793 to prod
berkeley-dsep-infra · Sep 4, 2020 · 4d6f4fe · 4d6f4fe
2 parents d454434 + 1e6e8d9
commit 4d6f4fe
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
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-n3215.h92597b4
+version: 0.0.1-n3228.h725583e
diff --git a/hub/requirements.yaml b/hub/requirements.yaml
@@ -1,5 +1,5 @@
 dependencies:
  - name: jupyterhub
    # REMEMBER TO CHANGE BASE IMAGE OF images/hub/ WHEN CHANGING THIS
-   version: 0.9.0-n116.h1c766a1
+   version: 0.9.0-n212.hdd4fd8bd
    repository: https://jupyterhub.github.io/helm-chart/
diff --git a/hub/values.yaml b/hub/values.yaml
@@ -96,7 +96,7 @@ jupyterhub:
     # Generated by chartpress
     image:
       name: gcr.io/ucb-datahub-2018/jupyterhub-hub
-      tag: '0.0.1-n3215.h92597b4'
+      tag: '0.0.1-n3228.h725583e'
     networkPolicy:
       enabled: true
       ingress:

diff --git a/images/hub/Dockerfile b/images/hub/Dockerfile
@@ -1,6 +1,6 @@
 # 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:0.9.0-n033.h8211ad2
+FROM jupyterhub/k8s-hub:0.9.0-n196.h6c08d8ca
 
 USER root
 

diff --git a/support/values.yaml b/support/values.yaml
@@ -16,6 +16,10 @@ prometheus:
   rbac:
     create: true
   server:
+    resources:
+      requests:
+        cpu: 1
+        memory: 8Gi
     labels:
       # For HTTP access to the hub, to scrape metrics
       hub.jupyter.org/network-access-hub: 'true'