internet/kubernetes.core
3
0
Fork 0
mirror of https://github.com/ansible-collections/kubernetes.core.git synced 2026-05-07 13:32:37 +00:00
Code Issues Projects Releases Wiki Activity

Replicate apply method in the DynamicClient (#45)

Browse Source 
* * Replicate apply method in the DynamicClient

Signed-off-by: Alina Buzachis <abuzachis@redhat.com>

* * Add changelog fragment

Signed-off-by: Alina Buzachis <abuzachis@redhat.com>
This commit is contained in:
Alina Buzachis
2021-04-22 20:58:53 +02:00
committed by GitHub
parent 9384742bdc
commit 48c5170018
11 changed files with 803 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
plugins/module_utils/common.py
View File

@@ -43,10 +43,10 @@ K8S_IMP_ERR = None
try:
import kubernetes
import openshift
from openshift.dynamic import DynamicClient
from openshift.dynamic.exceptions import (
ResourceNotFoundError, ResourceNotUniqueError, NotFoundError, DynamicApiError,
ConflictError, ForbiddenError, MethodNotAllowedError)
from kubernetes.dynamic.exceptions import (
NotFoundError, ResourceNotFoundError, ResourceNotUniqueError, DynamicApiError,
ConflictError, ForbiddenError, MethodNotAllowedError, BadRequestError
)
HAS_K8S_MODULE_HELPER = True
k8s_import_exception = None
except ImportError as e:
@@ -54,6 +54,15 @@ except ImportError as e:
k8s_import_exception = e
K8S_IMP_ERR = traceback.format_exc()
IMP_K8S_CLIENT = None
try:
from ansible_collections.kubernetes.core.plugins.module_utils.k8sdynamicclient import K8SDynamicClient
IMP_K8S_CLIENT = True
except ImportError as e:
IMP_K8S_CLIENT = False
k8s_client_import_exception = e
IMP_K8S_CLIENT_ERR = traceback.format_exc()
YAML_IMP_ERR = None
try:
import yaml
@@ -64,7 +73,7 @@ except ImportError:
K8S_CONFIG_HASH_IMP_ERR = None
try:
from openshift.dynamic.exceptions import KubernetesValidateMissing
from kubernetes.dynamic.exceptions import KubernetesValidateMissing
HAS_K8S_CONFIG_HASH = True
except ImportError:
K8S_CONFIG_HASH_IMP_ERR = traceback.format_exc()
@@ -72,7 +81,7 @@ except ImportError:
HAS_K8S_APPLY = None
try:
from openshift.dynamic.apply import apply_object
from ansible_collections.kubernetes.core.plugins.module_utils.apply import apply_object
HAS_K8S_APPLY = True
except ImportError:
HAS_K8S_APPLY = False
@@ -84,17 +93,12 @@ except ImportError:
pass
try:
from openshift.dynamic.apply import recursive_diff
from ansible_collections.kubernetes.core.plugins.module_utils.apply import recursive_diff
except ImportError:
from ansible.module_utils.common.dict_transformations import recursive_diff
try:
try:
# >=0.10
from openshift.dynamic.resource import ResourceInstance
except ImportError:
# <0.10
from openshift.dynamic.client import ResourceInstance
from kubernetes.dynamic.resource import ResourceInstance
HAS_K8S_INSTANCE_HELPER = True
k8s_import_exception = None
except ImportError as e:
@@ -194,7 +198,7 @@ def get_api_client(module=None, **kwargs):
cache_file = generate_cache_file(kubeclient)
try:
client = DynamicClient(kubeclient, cache_file)
client = K8SDynamicClient(kubeclient, cache_file)
except Exception as err:
_raise_or_fail(err, 'Failed to get client due to %s')
@@ -245,9 +249,9 @@ class K8sAnsibleMixin(object):
result = resource.get(name=name, namespace=namespace,
label_selector=','.join(label_selectors),
field_selector=','.join(field_selectors))
except openshift.dynamic.exceptions.BadRequestError:
except BadRequestError:
return dict(resources=[], api_found=True)
except openshift.dynamic.exceptions.NotFoundError:
except NotFoundError:
if not wait or name is None:
return dict(resources=[], api_found=True)