diff --git a/changelogs/fragments/20240530-ansible-core-support-update.yaml b/changelogs/fragments/20240530-ansible-core-support-update.yaml new file mode 100644 index 0000000000..2efafc0421 --- /dev/null +++ b/changelogs/fragments/20240530-ansible-core-support-update.yaml @@ -0,0 +1,3 @@ +--- +minor_changes: + - inventory/k8s.py - Defer removal of k8s inventory plugin to version 6.0.0 (https://github.com/ansible-collections/kubernetes.core/pull/734). diff --git a/meta/runtime.yml b/meta/runtime.yml index 76295c321d..d9cb099846 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -22,10 +22,10 @@ plugin_routing: redirect: community.okd.openshift k8s: deprecation: - removal_version: 5.0.0 + removal_version: 6.0.0 warning_text: >- The k8s inventory plugin has been deprecated and - will be removed in release 5.0.0. + will be removed in release 6.0.0. modules: k8s_auth: redirect: community.okd.k8s_auth diff --git a/plugins/inventory/k8s.py b/plugins/inventory/k8s.py index a5146eb9cb..37ef90a15f 100644 --- a/plugins/inventory/k8s.py +++ b/plugins/inventory/k8s.py @@ -20,10 +20,10 @@ - Uses k8s.(yml|yaml) YAML configuration file to set parameter values. deprecated: - removed_in: 5.0.0 + removed_in: 6.0.0 why: | As discussed in U(https://github.com/ansible-collections/kubernetes.core/issues/31), we decided to - remove the k8s inventory plugin in release 5.0.0. + remove the k8s inventory plugin in release 6.0.0. alternative: "Use M(kubernetes.core.k8s_info) and M(ansible.builtin.add_host) instead." options: @@ -164,8 +164,8 @@ def parse(self, inventory, loader, path, cache=True): super(InventoryModule, self).parse(inventory, loader, path) self.display.deprecated( - "The 'k8s' inventory plugin has been deprecated and will be removed in release 5.0.0", - version="5.0.0", + "The 'k8s' inventory plugin has been deprecated and will be removed in release 6.0.0", + version="6.0.0", collection_name="kubernetes.core", ) cache_key = self._get_cache_prefix(path)