From 028a26319e9cbc5b89427035a3553169a5290805 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Tue, 15 Jun 2021 16:41:34 +0000 Subject: [PATCH] openshiftpods: fix delete_namespaced_pod arguments This change prevents a TypeError when deleting pods: TypeError: delete_namespaced_pod() takes 3 positional arguments but 4 were given Change-Id: I6d31af352e3151eb1bdef52472a4b0b5fa00ecd8 --- nodepool/driver/openshiftpods/provider.py | 8 +------- nodepool/tests/unit/test_driver_openshiftpods.py | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/nodepool/driver/openshiftpods/provider.py b/nodepool/driver/openshiftpods/provider.py index d1e05f6f8..11f2e691e 100644 --- a/nodepool/driver/openshiftpods/provider.py +++ b/nodepool/driver/openshiftpods/provider.py @@ -119,14 +119,8 @@ class OpenshiftPodsProvider(OpenshiftProvider): self.log.exception("%s: unknown pool" % server_id) return self.log.debug("%s: removing pod" % pod_name) - delete_body = { - "apiVersion": "v1", - "kind": "DeleteOptions", - "propagationPolicy": "Background" - } try: - self.k8s_client.delete_namespaced_pod( - pod_name, project_name, delete_body) + self.k8s_client.delete_namespaced_pod(pod_name, project_name) self.log.info("%s: pod removed" % server_id) except Exception: # TODO: implement better exception handling diff --git a/nodepool/tests/unit/test_driver_openshiftpods.py b/nodepool/tests/unit/test_driver_openshiftpods.py index b4c92002c..ccaeb712d 100644 --- a/nodepool/tests/unit/test_driver_openshiftpods.py +++ b/nodepool/tests/unit/test_driver_openshiftpods.py @@ -57,7 +57,7 @@ class FakeCoreClient(object): phase = "Running" return FakePod - def delete_namespaced_pod(self, name, project, delete_body): + def delete_namespaced_pod(self, name, project): to_delete = None for pod in self.pods: if pod.metadata.name == name: