internet/kubevirt.core
3
0
Fork 0
mirror of https://github.com/kubevirt/kubevirt.core.git synced 2026-05-07 05:42:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Ensure compatibility with kubernetes.core >=3.10,<4.1.0

Browse Source 
Ensure compatibility with kubernetes.core >=3.10,<4.1.0 by replacing
deprecated imports of HAS_K8S_MODULE_HELPER and k8s_import_exception.

Signed-off-by: Felix Matouschek <fmatouschek@redhat.com>
This commit is contained in:
Felix Matouschek
2024-05-29 10:11:05 +02:00
parent 131aacec43
commit a9c6296794
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/inventory/kubevirt.py
View File

@@ -182,22 +182,23 @@ from typing import (
# Handle import errors of python kubernetes client.
# HAS_K8S_MODULE_HELPER imported below will print a warning to the user if the client is missing.
# Set HAS_K8S_MODULE_HELPER and k8s_import exception accordingly to
# potentially print a warning to the user if the client is missing.
try:
from kubernetes.dynamic.exceptions import DynamicApiError
except ImportError:
HAS_K8S_MODULE_HELPER = True
k8s_import_exception = None
except ImportError as e:
class DynamicApiError(Exception):
pass
HAS_K8S_MODULE_HELPER = False
k8s_import_exception = e
from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable
from ansible_collections.kubernetes.core.plugins.module_utils.common import (
HAS_K8S_MODULE_HELPER,
k8s_import_exception,
)
from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
get_api_client,