outposts: call controller.down on outpost pre_delete

This commit is contained in:
Jens Langhammer
2020-10-16 22:26:47 +02:00
parent 5135d828b4
commit 971713d1aa
4 changed files with 67 additions and 1 deletions

View File

@ -6,7 +6,7 @@ from structlog import get_logger
from passbook.lib.utils.reflection import class_to_path
from passbook.outposts.models import Outpost
from passbook.outposts.tasks import outpost_post_save
from passbook.outposts.tasks import outpost_post_save, outpost_pre_delete
LOGGER = get_logger()
@ -30,3 +30,7 @@ def post_save_update(sender, instance: Model, **_):
def pre_delete_cleanup(sender, instance: Outpost, **_):
"""Ensure that Outpost's user is deleted (which will delete the token through cascade)"""
instance.user.delete()
# To ensure that deployment is cleaned up *consistently* we call the controller, and wait
# for it to finish. We don't want to call it in this thread, as we don't have the K8s
# credentials here
outpost_pre_delete.delay(instance.pk.hex).get()

View File

@ -56,6 +56,17 @@ def outpost_controller(self: MonitoredTask, outpost_pk: str):
)
@CELERY_APP.task()
def outpost_pre_delete(outpost_pk: str):
"""Delete outpost objects before deleting the DB Object"""
outpost = Outpost.objects.get(pk=outpost_pk)
if outpost.type == OutpostType.PROXY:
if outpost.deployment_type == OutpostDeploymentType.KUBERNETES:
ProxyKubernetesController(outpost).down()
if outpost.deployment_type == OutpostDeploymentType.DOCKER:
ProxyDockerController(outpost).down()
@CELERY_APP.task()
def outpost_post_save(model_class: str, model_pk: Any):
"""If an Outpost is saved, Ensure that token is created/updated