zuul/nodepool
Code Issues Proposed changes

Merge "openshiftpods: fix delete_namespaced_pod arguments"

Browse Source
This commit is contained in:
Zuul 2021-09-26 10:10:45 +00:00 committed by Gerrit Code Review
commit 96932c25f9
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nodepool/driver/openshiftpods/provider.py
View File

@ -96,14 +96,8 @@ class OpenshiftPodsProvider(OpenshiftProvider):
self.log.exception("%s: unknown pool" % server_id) self.log.exception("%s: unknown pool" % server_id)
return return
self.log.debug("%s: removing pod" % pod_name) self.log.debug("%s: removing pod" % pod_name)
delete_body = {
"apiVersion": "v1",
"kind": "DeleteOptions",
"propagationPolicy": "Background"
}
try: try:
self.k8s_client.delete_namespaced_pod( self.k8s_client.delete_namespaced_pod(pod_name, project_name)
pod_name, project_name, delete_body)
self.log.info("%s: pod removed" % server_id) self.log.info("%s: pod removed" % server_id)
except Exception: except Exception:
# TODO: implement better exception handling # TODO: implement better exception handling

2
nodepool/tests/unit/test_driver_openshiftpods.py
View File

@ -56,7 +56,7 @@ class FakeCoreClient(object):
phase = "Running" phase = "Running"
return FakePod return FakePod
def delete_namespaced_pod(self, name, project, delete_body): def delete_namespaced_pod(self, name, project):
to_delete = None to_delete = None
for pod in self.pods: for pod in self.pods:
if pod.metadata.name == name: if pod.metadata.name == name: