From 268d7a39580407911a0a39e34eebcc4540c1deaa Mon Sep 17 00:00:00 2001 From: Sean Eagan Date: Fri, 20 Mar 2020 08:49:45 -0500 Subject: [PATCH] Move kubernetes client to >=11.0.0 This version had a breaking api change [0], which this aligns with. This version also adds support for kubernetes 1.14 and 1.15 apis. [0]: https://github.com/kubernetes-client/python/blob/master/CHANGELOG.md#v1100 Change-Id: I01866bd5739e4eebb3166cb583d07efb046360aa --- armada/handlers/k8s.py | 4 ++-- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/armada/handlers/k8s.py b/armada/handlers/k8s.py index f65a6316..727ecb98 100644 --- a/armada/handlers/k8s.py +++ b/armada/handlers/k8s.py @@ -370,7 +370,7 @@ class K8s(object): group, version, namespace, plural, body) def delete_custom_resource( - self, group, version, namespace, plural, name, body): + self, group, version, namespace, plural, name, body={}): """Deletes a custom resource :param group: the custom resource's group @@ -384,7 +384,7 @@ class K8s(object): :rtype: object """ return self.custom_objects.delete_namespaced_custom_object( - group, version, namespace, plural, name, body) + group, version, namespace, plural, name, body=body) def read_custom_resource(self, group, version, namespace, plural, name): """Gets information on a specified custom resource diff --git a/requirements.txt b/requirements.txt index 0e8051a8..f1416ea2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ grpcio==1.16.0 jsonschema>=2.6.0 keystoneauth1==2.21.0 keystonemiddleware==4.9.1 -kubernetes>=9.0.0 +kubernetes>=11.0.0 Paste>=2.0.3 PasteDeploy>=1.5.2 protobuf>=3.4.0