airship/armada
Code Issues Proposed changes

Move to kubernetes python client 9.0.0

Browse Source 
This version [0] makes the adal package optional [1], which also
removes its dependency on the cryptography package.

It also fixes a thread pool issue [2] allowing us to remove the
workaround we had in place.

[0]: https://github.com/kubernetes-client/python/blob/master/CHANGELOG.md#v900
[1]: https://github.com/kubernetes-client/python-base/pull/108
[2]: https://github.com/kubernetes-client/gen/pull/91

Change-Id: I55aa8b97483b118fbde7e11df817ad8330da9bf1
This commit is contained in:
Sean Eagan 2019-02-27 13:09:09 -06:00
parent c7d9e21b1e
commit 0a87c5a16a
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