Skip to content

Commit 9661656

Browse files
author
Alan Christie
committed
Fix logging
Aligns logging with job operator
1 parent 48ae7d9 commit 9661656

File tree

1 file changed

+22
-7
lines changed

1 file changed

+22
-7
lines changed

operator/handlers.py

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import string
44
from typing import Dict
55

6+
import logging
67
import kopf
78
import kubernetes
89

@@ -87,8 +88,18 @@
8788
"""
8889

8990

91+
@kopf.on.startup()
92+
def configure(settings: kopf.OperatorSettings, **_):
93+
"""The operator startup handler.
94+
"""
95+
# Here we adjust the logging level
96+
settings.posting.level = logging.INFO
97+
98+
logging.info('Startup _POD_PRE_DELETE_DELAY_S=%s', _POD_PRE_DELETE_DELAY_S)
99+
100+
90101
@kopf.on.create("squonk.it", "v1alpha3", "jupyternotebooks", id="jupyter")
91-
def create(name, uid, namespace, spec, logger, **_):
102+
def create(name, uid, namespace, spec, **_):
92103

93104
characters = string.ascii_letters + string.digits
94105
token = "".join(random.sample(characters, 16))
@@ -153,7 +164,7 @@ def create(name, uid, namespace, spec, logger, **_):
153164
core_api.create_namespaced_config_map(namespace, startup_cm_body)
154165
core_api.create_namespaced_config_map(namespace, config_cm_body)
155166

156-
logger.debug("Created ConfigMaps")
167+
logging.info("Created ConfigMaps")
157168

158169
# Deployment
159170
# ----------
@@ -331,12 +342,12 @@ def create(name, uid, namespace, spec, logger, **_):
331342
apps_api = kubernetes.client.AppsV1Api()
332343
apps_api.create_namespaced_deployment(namespace, deployment_body)
333344

334-
logger.debug("Created deployment")
345+
logging.info("Created deployment")
335346

336347
# Service
337348
# -------
338349

339-
logger.debug("Creating Service %s...", name)
350+
logging.info("Creating Service %s...", name)
340351

341352
service_body = {
342353
"apiVersion": "v1",
@@ -366,12 +377,12 @@ def create(name, uid, namespace, spec, logger, **_):
366377
kopf.adopt(service_body)
367378
core_api.create_namespaced_service(namespace, service_body)
368379

369-
logger.debug("Created service")
380+
logging.info("Created service")
370381

371382
# Ingress
372383
# -------
373384

374-
logger.debug("Creating Ingress %s...", name)
385+
logging.info("Creating Ingress %s...", name)
375386

376387
ingress_proxy_body_size = material.get("ingressProxyBodySize", default_ingress_proxy_body_size)
377388

@@ -429,7 +440,7 @@ def create(name, uid, namespace, spec, logger, **_):
429440
ext_api = kubernetes.client.ExtensionsV1beta1Api()
430441
ext_api.create_namespaced_ingress(namespace, ingress_body)
431442

432-
logger.debug("Created ingress")
443+
logging.info("Created ingress")
433444

434445
# Done
435446
# ----
@@ -459,5 +470,9 @@ def create(name, uid, namespace, spec, logger, **_):
459470

460471
@kopf.on.delete("squonk.it", "v1alpha3", "jupyternotebooks")
461472
def delete(body, **kwargs):
473+
474+
event_type: str = event['type']
475+
logging.info('Handling event_type=%s', event_type)
476+
462477
msg = f"Jupyter notebook {body['metadata']['name']} deleted"
463478
return {'message': msg}

0 commit comments

Comments
 (0)