From 00cb40094ae81220d2d0849653a2f8a3f2dc637a Mon Sep 17 00:00:00 2001
From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 11:56:29 +0000
Subject: [PATCH] Defer removal of k8s inventory plugin to version 5.0. (#723)
 (#724)

[PR #723/cbadbe32 backport][stable-3] Defer removal of k8s inventory plugin to version 5.0.

This is a backport of PR #723 as merged into main (cbadbe3).
SUMMARY

Defer removal of k8s inventory plugin to version 5.0.

ISSUE TYPE


Bugfix Pull Request
Docs Pull Request
Feature Pull Request
New Module Pull Request

COMPONENT NAME

inventory/k8s.py
ADDITIONAL INFORMATION

Reviewed-by: Alina Buzachis
---
 changelogs/fragments/inventory-update_removal_date.yml | 2 ++
 meta/runtime.yml                                       | 4 ++--
 plugins/inventory/k8s.py                               | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 changelogs/fragments/inventory-update_removal_date.yml

diff --git a/changelogs/fragments/inventory-update_removal_date.yml b/changelogs/fragments/inventory-update_removal_date.yml
new file mode 100644
index 00000000..3ef687d5
--- /dev/null
+++ b/changelogs/fragments/inventory-update_removal_date.yml
@@ -0,0 +1,2 @@
+minor_changes:
+  - inventory/k8s.py - Defer removal of k8s inventory plugin to version 5.0 (https://github.com/ansible-collections/kubernetes.core/pull/723).
diff --git a/meta/runtime.yml b/meta/runtime.yml
index 99134a2c..76295c32 100644
--- a/meta/runtime.yml
+++ b/meta/runtime.yml
@@ -22,10 +22,10 @@ plugin_routing:
       redirect: community.okd.openshift
     k8s:
       deprecation:
-        removal_version: 4.0.0
+        removal_version: 5.0.0
         warning_text: >-
           The k8s inventory plugin has been deprecated and
-          will be removed in release 4.0.0.
+          will be removed in release 5.0.0.
   modules:
     k8s_auth:
       redirect: community.okd.k8s_auth
diff --git a/plugins/inventory/k8s.py b/plugins/inventory/k8s.py
index 1a6c5bfc..a5146eb9 100644
--- a/plugins/inventory/k8s.py
+++ b/plugins/inventory/k8s.py
@@ -20,10 +20,10 @@ DOCUMENTATION = """
       - Uses k8s.(yml|yaml) YAML configuration file to set parameter values.
 
     deprecated:
-      removed_in: 4.0.0
+      removed_in: 5.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 4.0.0.
+        remove the k8s inventory plugin in release 5.0.0.
       alternative: "Use M(kubernetes.core.k8s_info) and M(ansible.builtin.add_host) instead."
 
     options:
@@ -164,8 +164,8 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
         super(InventoryModule, self).parse(inventory, loader, path)
 
         self.display.deprecated(
-            "The 'k8s' inventory plugin has been deprecated and will be removed in release 4.0.0",
-            version="4.0.0",
+            "The 'k8s' inventory plugin has been deprecated and will be removed in release 5.0.0",
+            version="5.0.0",
             collection_name="kubernetes.core",
         )
         cache_key = self._get_cache_prefix(path)