change limits to requests

SwissDataScienceCenter · Oct 17, 2018 · b0c93bb · b0c93bb
1 parent ba8db87
commit b0c93bb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/helm-chart/renku-notebooks/values.yaml b/helm-chart/renku-notebooks/values.yaml
@@ -83,12 +83,12 @@ affinity: {}
 
 serverOptions:
   resources:
-    cpu_limit:
+    cpu_request:
       displayName: Number of CPUs
       type: integer
       default: 1
       range: [1, 8]
-    mem_limit:
+    mem_request:
       displayName: Memory
       type: enum
       default: 2G

diff --git a/jupyterhub/spawners.py b/jupyterhub/spawners.py
@@ -348,15 +348,11 @@ def get_pod_manifest(self):
             server_options = options.get('server_options', {})
             self.log.debug('server_options: {}'.format(server_options))
             self.default_url = server_options.get('default_url')
-            self.cpu_limit = float(
-                server_options['resources'].get('cpu_limit', 1.0)
-            )
             self.cpu_guarantee = float(
-                server_options['resources'].get('cpu_guarantee', 0.1)
+                server_options['resources'].get('cpu_request', 0.1)
             )
-            self.mem_limit = server_options['resources'].get('mem_limit')
             self.mem_guarantee = server_options['resources'].get(
-                'mem_guarantee', '500M'
+                'mem_request', '500M'
             )
 
             gpu = server_options['resources'].get('gpu', {})