Skip to content

Commit bb85eb6

Browse files
author
Alan Christie
committed
fix: Extra create() debug
Also includes new default CPU and Memory requests
1 parent 1e7b533 commit bb85eb6

File tree

1 file changed

+17
-4
lines changed

1 file changed

+17
-4
lines changed

operator/handlers.py

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
default_image = 'jupyter/minimal-notebook:notebook-6.3.0'
1111
default_sa = 'default'
1212
default_cpu_limit = '1'
13+
default_cpu_request = '10m'
1314
default_mem_limit = '1Gi'
15+
default_mem_request = '256Mi'
1416
default_user_id = 1000
1517
default_group_id = 100
1618
default_ingress_proxy_body_size = '500m'
@@ -91,9 +93,14 @@ def create(name, uid, namespace, spec, logger, **_):
9193
characters = string.ascii_letters + string.digits
9294
token = "".join(random.sample(characters, 16))
9395

96+
logging.info('Starting create (name=%s namespace=%s)...', name, namespace)
97+
logging.info('spec=%s (name=%s)', spec, name)
98+
9499
# ConfigMaps
95100
# ----------
96101

102+
logging.info('Creating ConfigMaps %s...', name)
103+
97104
bp_cm_body = {
98105
"apiVersion": "v1",
99106
"kind": "ConfigMap",
@@ -151,6 +158,8 @@ def create(name, uid, namespace, spec, logger, **_):
151158
# Deployment
152159
# ----------
153160

161+
logging.info('Creating Deployment %s...', name)
162+
154163
# All Data-Manager provided material
155164
# will be namespaced under the 'imDataManager' property
156165
material: Dict[str, any] = spec.get('imDataManager', {})
@@ -162,9 +171,9 @@ def create(name, uid, namespace, spec, logger, **_):
162171

163172
resources = material.get("resources", {})
164173
cpu_limit = resources.get("limits", {}).get("cpu", default_cpu_limit)
165-
cpu_request = resources.get("requests", {}).get("cpu", cpu_limit)
174+
cpu_request = resources.get("requests", {}).get("cpu", default_cpu_request)
166175
memory_limit = resources.get("limits", {}).get("memory", default_mem_limit)
167-
memory_request = resources.get("requests", {}).get("memory", memory_limit)
176+
memory_request = resources.get("requests", {}).get("memory", default_mem_request)
168177

169178
task_id: str = material.get('taskId')
170179

@@ -225,8 +234,8 @@ def create(name, uid, namespace, spec, logger, **_):
225234
"imagePullPolicy": "IfNotPresent",
226235
"resources": {
227236
"requests": {
228-
"memory": "256Mi",
229-
"cpu": "10m"
237+
"memory": memory_request,
238+
"cpu": cpu_request
230239
},
231240
"limits": {
232241
"memory": memory_limit,
@@ -327,6 +336,8 @@ def create(name, uid, namespace, spec, logger, **_):
327336
# Service
328337
# -------
329338

339+
logger.debug("Creating Service %s...", name)
340+
330341
service_body = {
331342
"apiVersion": "v1",
332343
"kind": "Service",
@@ -360,6 +371,8 @@ def create(name, uid, namespace, spec, logger, **_):
360371
# Ingress
361372
# -------
362373

374+
logger.debug("Creating Ingress %s...", name)
375+
363376
ingress_proxy_body_size = material.get("ingressProxyBodySize", default_ingress_proxy_body_size)
364377

365378
ingress_path = f"/{name}"

0 commit comments

Comments
 (0)