Merge pull request #1909 from consideRatio/pr/fix-typo

Fix outdated configuration reference (nginx -> traefik -> not relevant and removed)
jupyterhub · May 19, 2021 · 780ea85 · 780ea85
2 parents 99aae98 + afee564
commit 780ea85
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ __pycache__
 config/common/datacenter-*.yaml
 mybinder/charts
 mybinder/requirements.lock
+mybinder/Chart.lock
 
 .ipynb_checkpoints
 

diff --git a/mybinder/values.yaml b/mybinder/values.yaml
@@ -254,6 +254,9 @@ binderhub:
       chp:
         # FIXME: remove when hub chart dependency is bumped
         # to include https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/2081
+        #
+        # This is when we update to a binderhub that reference z2jh 1.0.0 instead of z2jh 0.11.1.
+        #
         image:
           tag: 4.3.1
         networkPolicy:
@@ -274,14 +277,6 @@ binderhub:
           # - --default-target=http://$(PROXY_PATCHES_SERVICE_HOST):$(PROXY_PATCHES_SERVICE_PORT)
           - --error-target=http://$(PROXY_PATCHES_SERVICE_HOST):$(PROXY_PATCHES_SERVICE_PORT)/hub/error
           - --log-level=error
-      nginx:
-        resources:
-          requests:
-            memory: 512Mi
-            cpu: "0.25"
-          limits:
-            memory: 512Mi
-            cpu: 1
     ingress:
       enabled: true
       annotations: