diff --git a/armada/handlers/k8s.py b/armada/handlers/k8s.py index ed745961..d7b9423c 100644 --- a/armada/handlers/k8s.py +++ b/armada/handlers/k8s.py @@ -17,9 +17,7 @@ import re from kubernetes import client from kubernetes import config from kubernetes import watch -from kubernetes.client import api_client from kubernetes.client.rest import ApiException -from unittest.mock import Mock from oslo_config import cfg from oslo_log import log as logging @@ -29,12 +27,6 @@ from armada.exceptions import k8s_exceptions as exceptions CONF = cfg.CONF LOG = logging.getLogger(__name__) -# TODO: Remove after this bug is fixed and we have uplifted to a fixed version: -# https://github.com/kubernetes-client/python/issues/411 -# Avoid creating thread pools in kubernetes api_client. -_dummy_pool = Mock() -api_client.ThreadPool = lambda *args, **kwargs: _dummy_pool - class K8s(object): ''' diff --git a/requirements.txt b/requirements.txt index 7e8be5b1..9697878c 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>=6.0.0 +kubernetes>=9.0.0 Paste>=2.0.3 PasteDeploy>=1.5.2 protobuf>=3.4.0