External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 09:57:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3898 from ryanpetrello/k8s-messy-client

Browse Source 
attempt to clean up cacert trash the k8s python client leaves behind
This commit is contained in:
Ryan Petrello
2019-10-28 11:09:24 -04:00
committed by GitHub
parent 3cab73c574 b3af64d66f
commit b575fa4243
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/main/dispatch/worker/task.py
View File

@@ -4,6 +4,7 @@ import importlib
import sys import sys
import traceback import traceback
from kubernetes.config import kube_config
from awx.main.tasks import dispatch_startup, inform_cluster_of_shutdown from awx.main.tasks import dispatch_startup, inform_cluster_of_shutdown
@@ -107,6 +108,14 @@ class TaskWorker(BaseWorker):
for callback in body.get('errbacks', []) or []: for callback in body.get('errbacks', []) or []:
callback['uuid'] = body['uuid'] callback['uuid'] = body['uuid']
self.perform_work(callback) self.perform_work(callback)
finally:
# It's frustrating that we have to do this, but the python k8s
# client leaves behind cacert files in /tmp, so we must clean up
# the tmpdir per-dispatcher process every time a new task comes in
try:
kube_config._cleanup_temp_files()
except Exception:
logger.exception('failed to cleanup k8s client tmp files')
for callback in body.get('callbacks', []) or []: for callback in body.get('callbacks', []) or []:
callback['uuid'] = body['uuid'] callback['uuid'] = body['uuid']