zuul/nodepool
Code Issues Proposed changes

Bump openshift dep

Browse Source 
The openshift library has been completely redesigned with recent
releases so bump the dep and adapt to the new api. The update is
necessary in order to fix a urllib3 version conflict [1].

[1] Trace:
ERROR: nodepool 3.14.1.dev3 has requirement urllib3<1.26,>=1.25.4, but you'll have urllib3 1.24 which is incompatible.
ERROR: kubernetes 8.0.2 has requirement urllib3>=1.24.2, but you'll have urllib3 1.24 which is incompatible.
ERROR: botocore 1.19.30 has requirement urllib3<1.27,>=1.25.4; python_version != "3.4", but you'll have urllib3 1.24 which is incompatible.

Change-Id: Ia4d09fd0a4a49d644bb575b74184de930c62ce89
Co-Authored-By: Tobias Henkel <tobias.henkel@bmw.de>
Story: 2008427
Task: 41373
This commit is contained in:
Clark Boylan
2020-12-07 12:46:20 -08:00
committed by Tobias Henkel
parent d1a123111b
commit e7f831c34e
8 changed files with 118 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nodepool/driver/openshiftpods/__init__.py
View File

@@ -14,10 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from kubernetes import config as k8s_config
from nodepool.driver import Driver
from nodepool.driver.openshiftpods.config import OpenshiftPodsProviderConfig
from nodepool.driver.openshiftpods.provider import OpenshiftPodsProvider
from openshift import config
class OpenshiftPodsDriver(Driver):
@@ -26,7 +26,12 @@ class OpenshiftPodsDriver(Driver):
def reset(self):
try:
config.load_kube_config(persist_config=True)
k8s_config.load_kube_config(persist_config=True)
except k8s_config.config_exception.ConfigException as e:
if 'Invalid kube-config file. No configuration found.' in str(e):
pass
else:
raise
except FileNotFoundError:
pass