10
10
default_image = 'jupyter/minimal-notebook:notebook-6.3.0'
11
11
default_sa = 'default'
12
12
default_cpu_limit = '1'
13
+ default_cpu_request = '10m'
13
14
default_mem_limit = '1Gi'
15
+ default_mem_request = '256Mi'
14
16
default_user_id = 1000
15
17
default_group_id = 100
16
18
default_ingress_proxy_body_size = '500m'
@@ -91,9 +93,14 @@ def create(name, uid, namespace, spec, logger, **_):
91
93
characters = string .ascii_letters + string .digits
92
94
token = "" .join (random .sample (characters , 16 ))
93
95
96
+ logging .info ('Starting create (name=%s namespace=%s)...' , name , namespace )
97
+ logging .info ('spec=%s (name=%s)' , spec , name )
98
+
94
99
# ConfigMaps
95
100
# ----------
96
101
102
+ logging .info ('Creating ConfigMaps %s...' , name )
103
+
97
104
bp_cm_body = {
98
105
"apiVersion" : "v1" ,
99
106
"kind" : "ConfigMap" ,
@@ -151,6 +158,8 @@ def create(name, uid, namespace, spec, logger, **_):
151
158
# Deployment
152
159
# ----------
153
160
161
+ logging .info ('Creating Deployment %s...' , name )
162
+
154
163
# All Data-Manager provided material
155
164
# will be namespaced under the 'imDataManager' property
156
165
material : Dict [str , any ] = spec .get ('imDataManager' , {})
@@ -162,9 +171,9 @@ def create(name, uid, namespace, spec, logger, **_):
162
171
163
172
resources = material .get ("resources" , {})
164
173
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 )
166
175
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 )
168
177
169
178
task_id : str = material .get ('taskId' )
170
179
@@ -225,8 +234,8 @@ def create(name, uid, namespace, spec, logger, **_):
225
234
"imagePullPolicy" : "IfNotPresent" ,
226
235
"resources" : {
227
236
"requests" : {
228
- "memory" : "256Mi" ,
229
- "cpu" : "10m"
237
+ "memory" : memory_request ,
238
+ "cpu" : cpu_request
230
239
},
231
240
"limits" : {
232
241
"memory" : memory_limit ,
@@ -327,6 +336,8 @@ def create(name, uid, namespace, spec, logger, **_):
327
336
# Service
328
337
# -------
329
338
339
+ logger .debug ("Creating Service %s..." , name )
340
+
330
341
service_body = {
331
342
"apiVersion" : "v1" ,
332
343
"kind" : "Service" ,
@@ -360,6 +371,8 @@ def create(name, uid, namespace, spec, logger, **_):
360
371
# Ingress
361
372
# -------
362
373
374
+ logger .debug ("Creating Ingress %s..." , name )
375
+
363
376
ingress_proxy_body_size = material .get ("ingressProxyBodySize" , default_ingress_proxy_body_size )
364
377
365
378
ingress_path = f"/{ name } "
0 commit comments