diff --git a/changelogs/fragments/remove_KubernetesAnsibleModule.yml b/changelogs/fragments/remove_KubernetesAnsibleModule.yml new file mode 100644 index 00000000..139aee3c --- /dev/null +++ b/changelogs/fragments/remove_KubernetesAnsibleModule.yml @@ -0,0 +1,2 @@ +minor_changes: +- common - removed ``KubernetesAnsibleModule``, use ``K8sAnsibleMixin`` instead (https://github.com/ansible-collections/kubernetes.core/pull/70). diff --git a/plugins/module_utils/common.py b/plugins/module_utils/common.py index b872fb33..7e7d96cc 100644 --- a/plugins/module_utils/common.py +++ b/plugins/module_utils/common.py @@ -29,7 +29,7 @@ from distutils.version import LooseVersion from ansible_collections.kubernetes.core.plugins.module_utils.args_common import (AUTH_ARG_MAP, AUTH_ARG_SPEC) from ansible_collections.kubernetes.core.plugins.module_utils.hashes import generate_hash -from ansible.module_utils.basic import AnsibleModule, missing_required_lib +from ansible.module_utils.basic import missing_required_lib from ansible.module_utils.six import iteritems, string_types from ansible.module_utils._text import to_native, to_bytes, to_text from ansible.module_utils.common.dict_transformations import dict_merge @@ -786,20 +786,6 @@ class K8sAnsibleMixin(object): return result -class KubernetesAnsibleModule(AnsibleModule, K8sAnsibleMixin): - # NOTE: This class KubernetesAnsibleModule is deprecated in favor of - # class K8sAnsibleMixin and will be removed 2.0.0 release. - # Please use K8sAnsibleMixin instead. - - def __init__(self, *args, **kwargs): - kwargs['argument_spec'] = self.argspec - AnsibleModule.__init__(self, *args, **kwargs) - K8sAnsibleMixin.__init__(self, *args, **kwargs) - - self.warn("class KubernetesAnsibleModule is deprecated" - " and will be removed in 2.0.0. Please use K8sAnsibleMixin instead.") - - def _encode_stringdata(definition): if definition['kind'] == 'Secret' and 'stringData' in definition: for k, v in definition['stringData'].items():