From 7103da38ffddf8b6c4fcaf4bcb0679862c397227 Mon Sep 17 00:00:00 2001
From: Bikouo Aubin <79859644+abikouo@users.noreply.github.com>
Date: Mon, 4 Mar 2024 11:02:22 +0100
Subject: [PATCH] Prepare release 2.4.2 (#691)

* Prepare Release 2.4.2

* Update CHANGELOG.rst

* Fixing integration tests
---
 CHANGELOG.rst                                       | 12 ++++++++++++
 changelogs/changelog.yaml                           | 13 ++++++++++++-
 ...very-fails-when-complex-subresources-present.yml |  3 ---
 .../targets/helm_kubeconfig/tasks/main.yml          |  8 +++++---
 4 files changed, 29 insertions(+), 7 deletions(-)
 delete mode 100644 changelogs/fragments/20240222-Collections-util-resource-discovery-fails-when-complex-subresources-present.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 829e0df122..1cad028146 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,18 @@ Kubernetes Collection Release Notes
 
 .. contents:: Topics
 
+v2.4.2
+======
+
+Release Summary
+---------------
+
+fix resource discovery when complex subresources present
+
+Bugfixes
+--------
+
+- Resolve Collections util resource discovery fails when complex subresources present (https://github.com/ansible-collections/kubernetes.core/pull/676).
 
 v2.4.1
 ======
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 4e9b30365e..13f2278750 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -764,7 +764,18 @@ releases:
     release_date: '2023-01-24'
   2.4.1:
     changes:
-      release_summary: The kubernetes.core 2.4.1 release includes several trivial bug fixes related to sanity.
+      release_summary: The kubernetes.core 2.4.1 release includes several trivial
+        bug fixes related to sanity.
     fragments:
     - fix_sanity_errors.yml
     release_date: '2024-02-06'
+  2.4.2:
+    changes:
+      bugfixes:
+      - Resolve Collections util resource discovery fails when complex subresources
+        present (https://github.com/ansible-collections/kubernetes.core/pull/676).
+      release_summary: fix resource discovery when complex subresources present
+    fragments:
+    - 2.4.2.yml
+    - 20240222-Collections-util-resource-discovery-fails-when-complex-subresources-present.yml
+    release_date: '2024-03-01'
diff --git a/changelogs/fragments/20240222-Collections-util-resource-discovery-fails-when-complex-subresources-present.yml b/changelogs/fragments/20240222-Collections-util-resource-discovery-fails-when-complex-subresources-present.yml
deleted file mode 100644
index d422127aa2..0000000000
--- a/changelogs/fragments/20240222-Collections-util-resource-discovery-fails-when-complex-subresources-present.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-bugfixes:
-  - Resolve Collections util resource discovery fails when complex subresources present (https://github.com/ansible-collections/kubernetes.core/pull/676).
diff --git a/tests/integration/targets/helm_kubeconfig/tasks/main.yml b/tests/integration/targets/helm_kubeconfig/tasks/main.yml
index 244f1bdfdb..dc64c1172d 100644
--- a/tests/integration/targets/helm_kubeconfig/tasks/main.yml
+++ b/tests/integration/targets/helm_kubeconfig/tasks/main.yml
@@ -1,6 +1,10 @@
 ---
 - name: Test helm with in-memory kubeconfig
   include_tasks: "from_in_memory_kubeconfig.yml"
+  loop_control:
+    loop_var: test_helm_version
+  with_items:
+    - "v3.10.3"
 
 - name: Test helm with custom kubeconfig and validate_certs=false
   include_tasks: "from_kubeconfig_with_validate_certs.yml"
@@ -8,12 +12,10 @@
     loop_var: test_helm_version
   with_items:
     - "v3.10.3"
-    - "v3.8.2"
 
 - name: Test helm with custom kubeconfig and ca_cert
   include_tasks: "from_kubeconfig_with_cacert.yml"
   loop_control:
     loop_var: test_helm_version
   with_items:
-    - "v3.5.1"
-    - "v3.4.2"
+    - "v3.10.3"