airship
/
armada
Code Issues Proposed changes

Merge "Move to kubernetes python client 9.0.0"

This commit is contained in:
Zuul 2019-04-23 14:01:26 +00:00 committed by Gerrit Code Review
parent 65e292b93e 0a87c5a16a
commit 573b3885e0
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
armada/handlers/k8s.py
View File

@ -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):
'''

2
requirements.txt
View File

@ -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