docs: add until example to k8s_info (#885) (#1118)

I would liked to have an example like this when I was using the
documentation.

(cherry picked from commit 4d7dc2a7d1)

Co-authored-by: Birger Johan Nordølum <33870508+MindTooth@users.noreply.github.com>

.gitignore

@@ -17,7 +17,6 @@ tests/integration/cloud-config-*
 
 # Helm charts
 tests/integration/*-chart-*.tgz
-tests/integration/targets/*/*.tgz
 
 # ansible-test generated file
 tests/integration/inventory

CHANGELOG.rst

@@ -4,44 +4,17 @@ Kubernetes Collection Release Notes
 
 .. contents:: Topics
 
-v6.4.0
+v5.4.2
 ======
 
 Release Summary
 ---------------
 
-This release adds Helm v4 compatibility across the Helm modules and improves ``k8s_drain`` with check mode. When you explicitly allow evicting unmanaged pods, pods with local storage, or pods managed by a ``DaemonSet``, those cases are reported as informational output instead of module warnings.
+This release includes bugfixes such as replacing the passing of ``warnings`` to ``exit_json`` with ``AnsibleModule.warn`` as well as a security update for selectively redacting sensitive information from kubeconfig.
 
 Minor Changes
 -------------
 
-- helm_info - Ensure compatibility with Helm v4 (https://github.com/ansible-collections/kubernetes.core/issues/1038).
-- helm_plugin - Ensure compatibility with Helm v4 (https://github.com/ansible-collections/kubernetes.core/issues/1038).
-- helm_plugin_info - Ensure compatibility with Helm v4 (https://github.com/ansible-collections/kubernetes.core/issues/1038).
-- helm_pull - Ensure compatibility with Helm v4 (https://github.com/ansible-collections/kubernetes.core/issues/1038).
-- helm_registry_auth - Ensure compatibility with Helm v4 (https://github.com/ansible-collections/kubernetes.core/issues/1038).
-- helm_registry_auth - add new option plain_http to allow insecure http connection when running ``helm registry login`` (https://github.com/ansible-collections/kubernetes.core/pull/1090).
-- helm_repository - Ensure compatibility with Helm v4 (https://github.com/ansible-collections/kubernetes.core/issues/1038).
-- k8s_drain - Add support for ``check_mode`` (https://github.com/ansible-collections/kubernetes.core/pull/1086).
-- k8s_drain - Convert module warnings into informational displays when users explicitly request the deletion of unmanaged pods, pods with local storage, or those managed by a `DaemonSet` (https://github.com/ansible-collections/kubernetes.core/issues/1037).
-
-Bugfixes
---------
-
-- Helm - Allow taking ownership of existing Kubernetes resources on the first installation of a Helm release. Previously, the ``take_ownership`` parameter was always disabled during the initial install, preventing resource adoption (https://github.com/ansible-collections/kubernetes.core/pull/1034).
-
-v6.3.0
-======
-
-Release Summary
----------------
-
-This release includes bugfixes such as implementing idempotency for the ``helm_pull`` module as well as a security update for selectively redacting sensitive information from kubeconfig.
-
-Minor Changes
--------------
-
-- Remove deprecated import from ``ansible.module_utils._text`` (https://github.com/ansible-collections/kubernetes.core/pull/1053).
 - helm - add ``release_values`` key to ``status`` return value that can be accessed using Jinja2 dot notation (https://github.com/ansible-collections/kubernetes.core/pull/1056).
 - helm_info - add ``release_values`` key to ``status`` return value that can be accessed using Jinja2 dot notation (https://github.com/ansible-collections/kubernetes.core/pull/1056).
 
@@ -60,64 +33,12 @@ Bugfixes
 --------
 
 - Add idempotency for ``helm_pull`` module (https://github.com/ansible-collections/kubernetes.core/pull/1055).
-- Fixed a bug where setting ``K8S_AUTH_VERIFY_SSL=true`` (or any string value) caused the value to be treated as a separate ``kubectl`` command argument. (https://github.com/ansible-collections/kubernetes.core/pull/1049).
+- Fixed a bug where setting ``K8S_AUTH_VERIFY_SSL=true`` (or any string value) caused the value to be treated as a separate ``kubectl`` command argument (https://github.com/ansible-collections/kubernetes.core/pull/1049).
 - Limit supported versions of Helm to <4.0.0 (https://github.com/ansible-collections/kubernetes.core/pull/1039).
 - Replace passing ``warnings`` to ``exit_json`` with ``AnsibleModule.warn`` in the ``k8s_drain``, ``k8s_rollback.py`` and ``k8s_scale.py`` modules as it deprecated in ``ansible-core>=2.19.0`` and will be removed in ``ansible-core>=2.23.0`` (https://github.com/ansible-collections/kubernetes.core/pull/1033).
 - k8s - Fix return block from the module documentation (https://github.com/ansible-collections/kubernetes.core/pull/1056).
 - meta - Add ``k8s_cluster_info``, ``k8s_json_patch`` and ``k8s_rollback`` to k8s action group (https://github.com/ansible-collections/kubernetes.core/pull/992).
 
-v6.2.0
-======
-
-Release Summary
----------------
-
-This release adds minor changes and bugfixes, including support of skip-schema-validation in ``helm`` module and removing deprecated ``ansible.module_utils.six`` imports.
-
-Minor Changes
--------------
-
-- Add support of skip-schema-validation in ``helm`` module (https://github.com/ansible-collections/kubernetes.core/pull/995)
-- kustomize - Add support of local environ (https://github.com/ansible-collections/kubernetes.core/pull/786).
-
-Bugfixes
---------
-
-- Remove ``ansible.module_utils.six`` imports to avoid warnings (https://github.com/ansible-collections/kubernetes.core/pull/998).
-- Update the ``k8s_cp`` module to also work for init containers (https://github.com/ansible-collections/kubernetes.core/pull/971).
-
-v6.1.0
-======
-
-Release Summary
----------------
-
-This release adds ``plain_http`` and ``take_ownership`` parameters for helm modules, support for ``hidden_fields`` in ``k8s_json_patch``, documented lack of idempotency support in ``helm_registry_auth`` with ``helm ≥ 3.18.0``, and improved ``k8s_rollback`` test coverage.
-
-Minor Changes
--------------
-
-- Module helm_registry_auth do not support idempotency with `helm >= 3.18.0` (https://github.com/ansible-collections/kubernetes.core/pull/946)
-- Module k8s_json_patch - Add support for `hidden_fields` (https://github.com/ansible-collections/kubernetes.core/pull/964).
-- helm - Parameter plain_http added for working with insecure OCI registries (https://github.com/ansible-collections/kubernetes.core/pull/934).
-- helm - Parameter take_ownership added (https://github.com/ansible-collections/kubernetes.core/pull/957).
-- helm_pull - Parameter plain_http added for working with insecure OCI registries (https://github.com/ansible-collections/kubernetes.core/pull/934).
-- helm_template - Parameter plain_http added for working with insecure OCI registries (https://github.com/ansible-collections/kubernetes.core/pull/934).
-
-Bugfixes
---------
-
-- module_utils/k8s/service - hide fields first before creating diffs (https://github.com/ansible-collections/kubernetes.core/pull/915).
-
-v6.0.0
-======
-
-Breaking Changes / Porting Guide
---------------------------------
-
-- Remove deprecated ``k8s`` invetory plugin (https://github.com/ansible-collections/kubernetes.core/pull/867).
-- Remove support for ``ansible-core<2.16`` (https://github.com/ansible-collections/kubernetes.core/pull/867).
-
 v5.4.1
 ======
 
@@ -144,7 +65,7 @@ This release updates the ``helm_registry_auth`` module to match the behavior of
 Minor Changes
 -------------
 
-- Module ``helm_registry_auth`` does not support idempotency with ``helm >= 3.18.0`` (https://github.com/ansible-collections/kubernetes.core/pull/946).
+- Module ``helm_registry_auth`` does not support idempotency with ``helm >= 3.18.0`` (https://github.com/ansible-collections/kubernetes.core/pull/946)
 
 v5.3.0
 ======

Makefile

@@ -1,5 +1,5 @@
 # Also needs to be updated in galaxy.yml
-VERSION = 6.4.0
+VERSION = 5.4.2
 
 TEST_ARGS ?= ""
 PYTHON_VERSION ?= `python -c 'import platform; print(".".join(platform.python_version_tuple()[0:2]))'`

README.md

@@ -21,10 +21,12 @@ For more information about communication, see the [Ansible communication guide](
 ## Requirements
 
 <!--start requires_ansible-->
-## Ansible version compatibility
+## Ansible Version Compatibility
 
-This collection has been tested against the following Ansible versions: **>=2.16.0**.
+This collection has been tested against following Ansible versions: **>=2.15.0**.
 
+For collections that support Ansible 2.9, please ensure you update your `network_os` to use the
+fully qualified collection name (for example, `cisco.ios.ios`).
 Plugins and modules within a collection may be tested with only specific Ansible versions.
 A collection may contain metadata that identifies these versions.
 PEP440 is the schema used to describe the versions of Ansible.
@@ -32,7 +34,7 @@ PEP440 is the schema used to describe the versions of Ansible.
 
 ### Helm Version Compatibility
 
-This collection supports Helm v3.x and newer. Please note that specific modules or certain parameters may have additional version requirements.
+Helm modules in this collection are compatible with Helm v3.x and are not yet compatible with Helm v4. Individual modules and their parameters may support a more specific range of Helm versions.
 
 ### Python Support
 
@@ -49,17 +51,22 @@ This collection supports Kubernetes versions >= 1.24.
 Click on the name of a plugin or module to view that content's documentation:
 
 <!--start collection content-->
-### Connection plugins
+### Connection Plugins
 Name | Description
 --- | ---
 [kubernetes.core.kubectl](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.kubectl_connection.rst)|Execute tasks in pods running on Kubernetes.
 
-### K8s filter plugins
+### K8s filter Plugins
 Name | Description
 --- | ---
 kubernetes.core.k8s_config_resource_name|Generate resource name for the given resource of type ConfigMap, Secret
 
-### Lookup plugins
+### Inventory Plugins
+Name | Description
+--- | ---
+[kubernetes.core.k8s](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.k8s_inventory.rst)|Kubernetes (K8s) inventory source
+
+### Lookup Plugins
 Name | Description
 --- | ---
 [kubernetes.core.k8s](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.k8s_lookup.rst)|Query the K8s API
@@ -103,7 +110,7 @@ You can also include it in a `requirements.yml` file and install it via `ansible
 ---
 collections:
   - name: kubernetes.core
-    version: 6.4.0
+    version: 5.4.2
 ```
 
 ### Installing the Kubernetes Python Library

changelogs/changelog.yaml

@@ -1027,13 +1027,13 @@ releases:
     changes:
       bugfixes:
       - module_utils/k8s/service - fix issue when trying to delete resource using
-        ``delete_options`` and ``check_mode=true`` (https://github.com/ansible-collections/kubernetes.core/issues/892).
+        `delete_options` and `check_mode=true` (https://github.com/ansible-collections/kubernetes.core/issues/892).
       minor_changes:
-      - Bump version of ``ansible-lint`` to 25.1.2 (https://github.com/ansible-collections/kubernetes.core/pull/919).
+      - kubernetes.core - Bump version of ``ansible-lint`` to ``25.1.2`` (https://github.com/ansible-collections/kubernetes.core/pull/919).
       - action/k8s_info - update templating mechanism with changes from ``ansible-core
         2.19`` (https://github.com/ansible-collections/kubernetes.core/pull/888).
       - helm - add ``reset_then_reuse_values`` support to helm module (https://github.com/ansible-collections/kubernetes.core/issues/803).
-      - helm - add support for ``insecure_skip_tls_verify`` option to helm and helm_repository(https://github.com/ansible-collections/kubernetes.core/issues/694).
+      - helm - add support for ``insecure_skip_tls_verify`` option to helm and ``helm_repository`` (https://github.com/ansible-collections/kubernetes.core/issues/694).
       release_summary: This release includes minor changes, bug fixes and also bumps
         ``ansible-lint`` version to ``25.1.2``.
     fragments:
@@ -1062,7 +1062,7 @@ releases:
     changes:
       bugfixes:
       - Remove ``ansible.module_utils.six`` imports to avoid warnings (https://github.com/ansible-collections/kubernetes.core/pull/998).
-      - Update the ``k8s_cp`` module to also work for init containers (https://github.com/ansible-collections/kubernetes.core/pull/971).
+      - Update the `k8s_cp` module to also work for init containers (https://github.com/ansible-collections/kubernetes.core/pull/971).
       - module_utils/k8s/service - hide fields first before creating diffs (https://github.com/ansible-collections/kubernetes.core/pull/915).
       release_summary: This release includes bugfixes for k8s service field handling,
         k8s_cp init containers support, and removes deprecated ansible.module_utils.six
@@ -1073,67 +1073,12 @@ releases:
     - 20250922-remove-ansible-six-imports.yaml
     - 5.4.1.yml
     release_date: '2025-10-07'
-  6.0.0:
-    changes:
-      breaking_changes:
-      - Remove deprecated ``k8s`` invetory plugin (https://github.com/ansible-collections/kubernetes.core/pull/867).
-      - Remove support for ``ansible-core<2.16`` (https://github.com/ansible-collections/kubernetes.core/pull/867).
-    fragments:
-    - 20250121-breaking-changes-6.0.0.yml
-    release_date: '2025-05-19'
-  6.1.0:
-    changes:
-      bugfixes:
-      - module_utils/k8s/service - hide fields first before creating diffs (https://github.com/ansible-collections/kubernetes.core/pull/915).
-      minor_changes:
-      - Module ``helm_registry_auth`` does not support idempotency with `helm >= 3.18.0`
-        (https://github.com/ansible-collections/kubernetes.core/pull/946).
-      - Module k8s_json_patch - Add support for ``hidden_fields`` (https://github.com/ansible-collections/kubernetes.core/pull/964).
-      - helm - Parameter plain_http added for working with insecure OCI registries
-        (https://github.com/ansible-collections/kubernetes.core/pull/934).
-      - helm - Parameter take_ownership added (https://github.com/ansible-collections/kubernetes.core/pull/957).
-      - helm_pull - Parameter plain_http added for working with insecure OCI registries
-        (https://github.com/ansible-collections/kubernetes.core/pull/934).
-      - helm_template - Parameter plain_http added for working with insecure OCI registries
-        (https://github.com/ansible-collections/kubernetes.core/pull/934).
-      release_summary: "This release adds ``plain_http`` and ``take_ownership`` parameters
-        for helm modules, support for ``hidden_fields`` in ``k8s_json_patch``, documented
-        lack of idempotency support in ``helm_registry_auth`` with ``helm \u2265 3.18.0``,
-        and improved ``k8s_rollback`` test coverage."
-    fragments:
-    - 20250411-kubeconfig-no_log-revert.yaml
-    - 20250428-k8s-service-hide-fields-first.yaml
-    - 20250522-add-plain-http-for-oci-registries.yaml
-    - 20250605-fix-helm_registry_auth-integration_test.yaml
-    - 20250704-k8s-rollback-integration-test-coverage.yaml
-    - 20250720-k8s-patch-add-hidden-fields.yaml
-    - 20250911-add-support-helm-take-ownership.yaml
-    - release_summary.yml
-    release_date: '2025-08-12'
-  6.2.0:
-    changes:
-      bugfixes:
-      - Remove ``ansible.module_utils.six`` imports to avoid warnings (https://github.com/ansible-collections/kubernetes.core/pull/998).
-      - Update the `k8s_cp` module to also work for init containers (https://github.com/ansible-collections/kubernetes.core/pull/971).
-      minor_changes:
-      - Add support of skip-schema-validation in ``helm`` module (https://github.com/ansible-collections/kubernetes.core/pull/995)
-      - kustomize - Add support of local environ (https://github.com/ansible-collections/kubernetes.core/pull/786).
-      release_summary: This release adds minor changes and bugfixes, including support
-        of skip-schema-validation in ``helm`` module and removing deprecated ``ansible.module_utils.six``
-        imports.
-    fragments:
-    - 20241030-support-of-evrion-for-kustomize-lookup-plugin.yaml
-    - 20250731-fix-k8s_cp-initcontainers.yaml
-    - 20250916-skip-schema-validation.yaml
-    - 20250922-remove-ansible-six-imports.yaml
-    - 6_2_0.yml
-    release_date: '2025-10-07'
-  6.3.0:
+  5.4.2:
     changes:
       bugfixes:
       - Add idempotency for ``helm_pull`` module (https://github.com/ansible-collections/kubernetes.core/pull/1055).
       - Fixed a bug where setting ``K8S_AUTH_VERIFY_SSL=true`` (or any string value)
-        caused the value to be treated as a separate ``kubectl`` command argument.
+        caused the value to be treated as a separate ``kubectl`` command argument
         (https://github.com/ansible-collections/kubernetes.core/pull/1049).
       - Limit supported versions of Helm to <4.0.0 (https://github.com/ansible-collections/kubernetes.core/pull/1039).
       - Replace passing ``warnings`` to ``exit_json`` with ``AnsibleModule.warn``
@@ -1151,14 +1096,13 @@ releases:
         be removed in a release after 2027-01-08. Use ``status.release_values`` instead
         (https://github.com/ansible-collections/kubernetes.core/pull/1056).
       minor_changes:
-      - Remove deprecated import from ``ansible.module_utils._text`` (https://github.com/ansible-collections/kubernetes.core/pull/1053).
-      - helm - add ``release_values`` key to ``status`` return value that can be accessed
-        using Jinja2 dot notation (https://github.com/ansible-collections/kubernetes.core/pull/1056).
-      - helm_info - add ``release_values`` key to ``status`` return value that can
+      - helm - added ``release_values`` key to ``status`` return value that can be
+        accessed using Jinja2 dot notation (https://github.com/ansible-collections/kubernetes.core/pull/1056).
+      - helm_info - added ``release_values`` key to ``status`` return value that can
         be accessed using Jinja2 dot notation (https://github.com/ansible-collections/kubernetes.core/pull/1056).
-      release_summary: This release includes bugfixes such as implementing idempotency
-        for the ``helm_pull`` module as well as a security update for selectively
-        redacting sensitive information from kubeconfig.
+      release_summary: This release includes various bugfixes such as replacing the
+        passing of ``warnings`` to ``exit_json`` with ``AnsibleModule.warn`` as well
+        as security updates for selectively redacting sensitive information from kubeconfig.
       security_fixes:
       - Selectively redact sensitive info from kubeconfig instead of applying blanket
         ``no_log=True`` (https://github.com/ansible-collections/kubernetes.core/pull/1014).
@@ -1168,38 +1112,7 @@ releases:
     - 20251007-selective-kubeconfig-redaction.yaml
     - 20251115-limit-versions-of-helm.yaml
     - 20251220-fix-K8S_AUTH_VERIFY_SSL-in-kubectl-connecton-plugion.yaml
-    - 20251228-1053-remove-deprecated-import.yaml
     - 20260107-add-idempodency-for-helm-pull.yaml
     - 20260108-fix-sanity-failures.yml
-    - 6-3-0.yaml
+    - 5-4-2.yaml
     release_date: '2026-02-03'
-  6.4.0:
-    changes:
-      bugfixes:
-      - Helm - Allow taking ownership of existing Kubernetes resources on the first
-        installation of a Helm release. Previously, the ``take_ownership`` parameter
-        was always disabled during the initial install, preventing resource adoption
-        (https://github.com/ansible-collections/kubernetes.core/pull/1034).
-      minor_changes:
-      - helm_info - Ensure compatibility with Helm v4 (https://github.com/ansible-collections/kubernetes.core/issues/1038).
-      - helm_plugin - Ensure compatibility with Helm v4 (https://github.com/ansible-collections/kubernetes.core/issues/1038).
-      - helm_plugin_info - Ensure compatibility with Helm v4 (https://github.com/ansible-collections/kubernetes.core/issues/1038).
-      - helm_pull - Ensure compatibility with Helm v4 (https://github.com/ansible-collections/kubernetes.core/issues/1038).
-      - helm_registry_auth - Ensure compatibility with Helm v4 (https://github.com/ansible-collections/kubernetes.core/issues/1038).
-      - helm_registry_auth - add new option plain_http to allow insecure http connection
-        when running ``helm registry login`` (https://github.com/ansible-collections/kubernetes.core/pull/1090).
-      - helm_repository - Ensure compatibility with Helm v4 (https://github.com/ansible-collections/kubernetes.core/issues/1038).
-      - k8s_drain - Add support for ``check_mode`` (https://github.com/ansible-collections/kubernetes.core/pull/1086).
-      - k8s_drain - Convert module warnings into informational displays when users
-        explicitly request the deletion of unmanaged pods, pods with local storage,
-        or those managed by a ``DaemonSet`` (https://github.com/ansible-collections/kubernetes.core/issues/1037).
-      release_summary: This release adds Helm v4 compatibility across the Helm modules
-        and improves ``k8s_drain`` with check mode. When you explicitly allow evicting
-        unmanaged pods, pods with local storage, or pods managed by a ``DaemonSet``,
-        those cases are reported as informational output instead of module warnings.
-    fragments:
-    - 20251224-take-ownership-helm-initialization.yaml
-    - 20260203-k8s_drain-warning-fixes.yaml
-    - 20260213-support-helm-v4-for-helm-plugin-modules.yaml
-    - release-6-4-0.yml
-    release_date: '2026-04-22'

docs/ansible_turbo_mode.rst

@@ -0,0 +1,147 @@
+.. _ansible_turbo_mode:
+
+
+******************
+Ansible Turbo mode
+******************
+
+Following document provides overview of Ansible Turbo mode in ``kubernetes.core`` collection.
+
+.. contents::
+   :local:
+   :depth: 1
+
+
+Synopsis
+--------
+- A brief introduction about Ansible Turbo mode in ``kuberentes.core`` collection.
+- Ansible Turbo mode is an optional performance optimization. It can be enabled by installing the cloud.common collection and setting the ``ENABLE_TURBO_MODE`` environment variable.
+
+Requirements
+------------
+
+The following requirement is needed on the host that executes this module.
+
+- The ``cloud.common`` collection (https://github.com/ansible-collections/cloud.common)
+
+You will also need to set the environment variable ``ENABLE_TURBO_MODE=1`` on the managed host. This can be done in the same ways you would usually do so, for example::
+
+  ---
+  - hosts: remote
+    environment:
+      ENABLE_TURBO_MODE: 1
+    tasks:
+      ...
+
+
+Installation
+------------
+
+You can install ``cloud.common`` collection using following command::
+
+    # ansible-galaxy collection install cloud.common
+
+
+Current situation without Ansible Turbo mode
+============================================
+
+The traditional execution flow of an Ansible module includes the following steps:
+
+- Upload of a ZIP archive with the module and its dependencies
+- Execution of the module
+- Ansible collects the results once the script is finished
+
+These steps happen for each task of a playbook, and on every host.
+
+Most of the time, the execution of a module is fast enough for
+the user. However, sometime the module requires significant amount of time,
+just to initialize itself. This is a common situation with the API based modules.
+
+A classic initialization involves the following steps:
+
+- Load a Python library to access the remote resource (via SDK)
+- Open a client
+    - Load a bunch of Python modules.
+    - Request a new TCP connection.
+    - Create a session.
+    - Authenticate the client.
+
+All these steps are time consuming and the same operations will be running again and again.
+
+For instance, here:
+
+- ``import openstack``: takes 0.569s
+- ``client = openstack.connect()``: takes 0.065s
+- ``client.authorize()``: takes 1.360s,
+
+These numbers are from test running against VexxHost public cloud.
+
+In this case, it's a 2s-ish overhead per task. If the playbook
+comes with 10 tasks, the execution time cannot go below 20s.
+
+How Ansible Turbo Module improve the situation
+==============================================
+
+``AnsibleTurboModule`` is actually a class that inherites from
+the standard ``AnsibleModule`` class that your modules probably
+already use.
+The big difference is that when a module starts, it also spawns
+a little Python daemon. If a daemon already exists, it will just
+reuse it.
+All the module logic is run inside this Python daemon. This means:
+
+- Python modules are actually loaded one time
+- Ansible module can reuse an existing authenticated session.
+
+The background service
+======================
+
+The daemon kills itself after 15s, and communication are done
+through an Unix socket.
+It runs in one single process and uses ``asyncio`` internally.
+Consequently you can use the ``async`` keyword in your Ansible module.
+This will be handy if you interact with a lot of remote systems
+at the same time.
+
+Security impact
+===============
+
+``ansible_module.turbo`` open an Unix socket to interact with the background service.
+We use this service to open the connection toward the different target systems.
+
+This is similar to what SSH does with the sockets.
+
+Keep in mind that:
+
+- All the modules can access the same cache. Soon an isolation will be done at the collection level (https://github.com/ansible-collections/cloud.common/pull/17)
+- A task can load a different version of a library and impact the next tasks.
+- If the same user runs two ``ansible-playbook`` at the same time, they will have access to the same cache.
+
+When a module stores a session in a cache, it's a good idea to use a hash of the authentication information to identify the session.
+
+Error management
+================
+
+``ansible_module.turbo`` uses exceptions to communicate a result back to the module.
+
+- ``EmbeddedModuleFailure`` is raised when ``json_fail()`` is called.
+- ``EmbeddedModuleSuccess`` is raised in case of success and returns the result to the origin module process.
+
+These exceptions are defined in ``ansible_collections.cloud.common.plugins.module_utils.turbo.exceptions``.
+You can raise ``EmbeddedModuleFailure`` exception yourself, for instance from a module in ``module_utils``.
+
+.. note:: Be careful with the ``except Exception:`` blocks.
+    Not only they are bad practice, but also may interface with this
+    mechanism.
+
+
+Troubleshooting
+===============
+
+You may want to manually start the server. This can be done with the following command:
+
+.. code-block:: shell
+
+  PYTHONPATH=$HOME/.ansible/collections python -m ansible_collections.cloud.common.plugins.module_utils.turbo.server --socket-path $HOME/.ansible/tmp/turbo_mode.kubernetes.core.socket
+
+You can use the ``--help`` argument to get a list of the optional parameters.

docs/docsite/rst/kubernetes_scenarios/k8s_intro.rst

@@ -17,7 +17,7 @@ Requirements
 
 To use the modules, you'll need the following:
 
-- Ansible 2.16.0 or latest installed
+- Ansible 2.9.17 or latest installed
 - `Kubernetes Python client <https://pypi.org/project/kubernetes/>`_  installed on the host that will execute the modules.
 
 

docs/docsite/rst/kubernetes_scenarios/k8s_inventory.rst

@@ -0,0 +1,88 @@
+.. _ansible_collections.kubernetes.core.docsite.k8s_ansible_inventory:
+
+*****************************************
+Using Kubernetes dynamic inventory plugin
+*****************************************
+
+.. contents::
+  :local:
+
+Kubernetes dynamic inventory plugin
+===================================
+
+
+The best way to interact with your Pods is to use the Kubernetes dynamic inventory plugin, which queries Kubernetes APIs using ``kubectl`` command line available on controller node and tells Ansible what Pods can be managed.
+
+Requirements
+------------
+
+To use the Kubernetes dynamic inventory plugins, you must install `Kubernetes Python client <https://github.com/kubernetes-client/python>`_, `kubectl <https://github.com/kubernetes/kubectl>`_ on your control node (the host running Ansible).
+
+.. code-block:: bash
+
+    $ pip install kubernetes
+
+Please refer to Kubernetes official documentation for `installing kubectl <https://kubernetes.io/docs/tasks/tools/install-kubectl/>`_ on the given operating systems.
+
+To use this Kubernetes dynamic inventory plugin, you need to enable it first by specifying the following in the ``ansible.cfg`` file:
+
+.. code-block:: ini
+
+  [inventory]
+  enable_plugins = kubernetes.core.k8s
+
+Then, create a file that ends in ``.k8s.yml`` or ``.k8s.yaml`` in your working directory.
+
+The ``kubernetes.core.k8s`` inventory plugin takes in the same authentication information as any other Kubernetes modules.
+
+Here's an example of a valid inventory file:
+
+.. code-block:: yaml
+
+    plugin: kubernetes.core.k8s
+
+Executing ``ansible-inventory --list -i <filename>.k8s.yml`` will create a list of Pods that are ready to be configured using Ansible.
+
+You can also provide the namespace to gather information about specific pods from the given namespace. For example, to gather information about Pods under the ``test`` namespace you will specify the ``namespaces`` parameter:
+
+.. code-block:: yaml
+
+    plugin: kubernetes.core.k8s
+    connections:
+    - namespaces:
+        - test
+
+Using vaulted configuration files
+=================================
+
+Since the inventory configuration file contains Kubernetes related sensitive information in plain text, a security risk, you may want to
+encrypt your entire inventory configuration file.
+
+You can encrypt a valid inventory configuration file as follows:
+
+.. code-block:: bash
+
+    $ ansible-vault encrypt <filename>.k8s.yml
+      New Vault password:
+      Confirm New Vault password:
+      Encryption successful
+
+    $ echo "MySuperSecretPassw0rd!" > /path/to/vault_password_file
+
+And you can use this vaulted inventory configuration file using:
+
+.. code-block:: bash
+
+    $ ansible-inventory -i <filename>.k8s.yml --list --vault-password-file=/path/to/vault_password_file
+
+
+.. seealso::
+
+    `Kubernetes Python client - Issue Tracker <https://github.com/kubernetes-client/python/issues>`_
+        The issue tracker for Kubernetes Python client
+    `Kubectl installation <https://kubernetes.io/docs/tasks/tools/install-kubectl/>`_
+        Installation guide for installing Kubectl
+    :ref:`working_with_playbooks`
+        An introduction to playbooks
+    :ref:`playbooks_vault`
+        Using Vault in playbooks

docs/docsite/rst/scenario_guide.rst

@@ -13,5 +13,6 @@ To get started, please select one of the following topics.
    :maxdepth: 1
 
    kubernetes_scenarios/k8s_intro
+   kubernetes_scenarios/k8s_inventory
    kubernetes_scenarios/k8s_scenarios
 

docs/kubernetes.core.helm_info_module.rst

@@ -25,7 +25,7 @@ Requirements
 ------------
 The below requirements are needed on the host that executes this module.
 
-- helm >= 3.0.0 (https://github.com/helm/helm/releases)
+- helm (https://github.com/helm/helm/releases)
 - yaml (https://pypi.org/project/PyYAML/)
 
 
@@ -268,7 +268,7 @@ Examples
 
 Return Values
 -------------
-Common return values are documented `here <https://docs.ansible.com/projects/ansible/latest/reference_appendices/common_return_values.html#common-return-values>`_, the following are the fields unique to this module:
+Common return values are documented `here <https://docs.ansible.com/ansible/latest/reference_appendices/common_return_values.html#common-return-values>`_, the following are the fields unique to this module:
 
 .. raw:: html
 
@@ -410,23 +410,6 @@ Common return values are documented `here <https://docs.ansible.com/projects/ans
                     <br/>
                 </td>
             </tr>
-            <tr>
-                    <td class="elbow-placeholder">&nbsp;</td>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>release_values</b>
-                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
-                    <div style="font-size: small">
-                      <span style="color: purple">dictionary</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 6.3.0</div>
-                </td>
-                <td>always</td>
-                <td>
-                            <div>Dict of Values used to deploy.</div>
-                    <br/>
-                </td>
-            </tr>
             <tr>
                     <td class="elbow-placeholder">&nbsp;</td>
                 <td colspan="1">
@@ -482,13 +465,12 @@ Common return values are documented `here <https://docs.ansible.com/projects/ans
                     <b>values</b>
                     <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
                     <div style="font-size: small">
-                      <span style="color: purple">dictionary</span>
+                      <span style="color: purple">string</span>
                     </div>
                 </td>
                 <td>always</td>
                 <td>
                             <div>Dict of Values used to deploy</div>
-                            <div>This return value has been deprecated and will be removed in a release after 2027-01-08. Use RV(status.release_values) instead.</div>
                     <br/>
                 </td>
             </tr>

docs/kubernetes.core.helm_module.rst

@@ -25,7 +25,7 @@ Requirements
 ------------
 The below requirements are needed on the host that executes this module.
 
-- helm >= 3.0.0 (https://github.com/helm/helm/releases)
+- helm (https://github.com/helm/helm/releases)
 - yaml (https://pypi.org/project/PyYAML/)
 
 
@@ -330,27 +330,6 @@ Parameters
                         <div style="font-size: small; color: darkgreen"><br/>aliases: kubeconfig_path</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>plain_http</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">boolean</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 6.1.0</div>
-                </td>
-                <td>
-                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
-                                    <li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
-                                    <li>yes</li>
-                        </ul>
-                </td>
-                <td>
-                        <div>Use HTTP instead of HTTPS when working with OCI registries</div>
-                        <div>Requires Helm &gt;= 3.13.0</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -622,48 +601,6 @@ Parameters
                         <div>Skip custom resource definitions when installing or upgrading.</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>skip_schema_validation</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">boolean</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 6.2.0</div>
-                </td>
-                <td>
-                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
-                                    <li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
-                                    <li>yes</li>
-                        </ul>
-                </td>
-                <td>
-                        <div>Disables JSON schema validation for Chart and values.</div>
-                        <div>This feature requires helm &gt;= 3.16.0</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>take_ownership</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">boolean</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 6.1.0</div>
-                </td>
-                <td>
-                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
-                                    <li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
-                                    <li>yes</li>
-                        </ul>
-                </td>
-                <td>
-                        <div>Helm will ignore the check for helm annotations and take ownership of the existing resources</div>
-                        <div>This feature requires helm &gt;= 3.17.0</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -873,12 +810,6 @@ Examples
         chart_ref: "https://github.com/grafana/helm-charts/releases/download/grafana-5.6.0/grafana-5.6.0.tgz"
         release_namespace: monitoring
 
-    - name: Deploy Bitnami's MongoDB latest chart from OCI registry
-      kubernetes.core.helm:
-        name: test
-        chart_ref: "oci://registry-1.docker.io/bitnamicharts/mongodb"
-        release_namespace: database
-
     # Using complex Values
     - name: Deploy new-relic client chart
       kubernetes.core.helm:
@@ -920,7 +851,7 @@ Examples
 
 Return Values
 -------------
-Common return values are documented `here <https://docs.ansible.com/projects/ansible/latest/reference_appendices/common_return_values.html#common-return-values>`_, the following are the fields unique to this module:
+Common return values are documented `here <https://docs.ansible.com/ansible/latest/reference_appendices/common_return_values.html#common-return-values>`_, the following are the fields unique to this module:
 
 .. raw:: html
 
@@ -1026,23 +957,6 @@ Common return values are documented `here <https://docs.ansible.com/projects/ans
                     <br/>
                 </td>
             </tr>
-            <tr>
-                    <td class="elbow-placeholder">&nbsp;</td>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>release_values</b>
-                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
-                    <div style="font-size: small">
-                      <span style="color: purple">dictionary</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 6.3.0</div>
-                </td>
-                <td>always</td>
-                <td>
-                            <div>Dict of Values used to deploy.</div>
-                    <br/>
-                </td>
-            </tr>
             <tr>
                     <td class="elbow-placeholder">&nbsp;</td>
                 <td colspan="1">
@@ -1098,13 +1012,12 @@ Common return values are documented `here <https://docs.ansible.com/projects/ans
                     <b>values</b>
                     <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
                     <div style="font-size: small">
-                      <span style="color: purple">dictionary</span>
+                      <span style="color: purple">string</span>
                     </div>
                 </td>
                 <td>always</td>
                 <td>
-                            <div>Dict of Values used to deploy.</div>
-                            <div>This return value has been deprecated and will be removed in a release after 2027-01-08. Use RV(status.release_values) instead.</div>
+                            <div>Dict of Values used to deploy</div>
                     <br/>
                 </td>
             </tr>

docs/kubernetes.core.helm_plugin_info_module.rst

@@ -25,7 +25,7 @@ Requirements
 ------------
 The below requirements are needed on the host that executes this module.
 
-- helm >= 3.0.0 (https://github.com/helm/helm/releases)
+- helm (https://github.com/helm/helm/releases)
 
 
 Parameters
@@ -196,7 +196,7 @@ Examples
 
 Return Values
 -------------
-Common return values are documented `here <https://docs.ansible.com/projects/ansible/latest/reference_appendices/common_return_values.html#common-return-values>`_, the following are the fields unique to this module:
+Common return values are documented `here <https://docs.ansible.com/ansible/latest/reference_appendices/common_return_values.html#common-return-values>`_, the following are the fields unique to this module:
 
 .. raw:: html
 

docs/kubernetes.core.helm_plugin_module.rst

@@ -25,7 +25,7 @@ Requirements
 ------------
 The below requirements are needed on the host that executes this module.
 
-- helm >= 3.0.0 (https://github.com/helm/helm/releases)
+- helm (https://github.com/helm/helm/releases)
 
 
 Parameters
@@ -231,28 +231,6 @@ Parameters
                         <div style="font-size: small; color: darkgreen"><br/>aliases: verify_ssl</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>verify</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">boolean</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 6.4.0</div>
-                </td>
-                <td>
-                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
-                                    <li>no</li>
-                                    <li><div style="color: blue"><b>yes</b>&nbsp;&larr;</div></li>
-                        </ul>
-                </td>
-                <td>
-                        <div>Verify the plugin signature before installing.</div>
-                        <div>This option requires helm version &gt;= 4.0.0</div>
-                        <div>Used with <em>state=present</em>.</div>
-                </td>
-            </tr>
     </table>
     <br/>
 
@@ -294,7 +272,7 @@ Examples
 
 Return Values
 -------------
-Common return values are documented `here <https://docs.ansible.com/projects/ansible/latest/reference_appendices/common_return_values.html#common-return-values>`_, the following are the fields unique to this module:
+Common return values are documented `here <https://docs.ansible.com/ansible/latest/reference_appendices/common_return_values.html#common-return-values>`_, the following are the fields unique to this module:
 
 .. raw:: html
 

docs/kubernetes.core.helm_pull_module.rst

@@ -27,7 +27,7 @@ Requirements
 ------------
 The below requirements are needed on the host that executes this module.
 
-- helm >= 3.0.0 (https://github.com/helm/helm/releases)
+- helm >= 3.0, <4.0.0 (https://github.com/helm/helm/releases)
 
 
 Parameters
@@ -215,27 +215,6 @@ Parameters
                         <div>Pass credentials to all domains.</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>plain_http</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">boolean</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 6.1.0</div>
-                </td>
-                <td>
-                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
-                                    <li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
-                                    <li>yes</li>
-                        </ul>
-                </td>
-                <td>
-                        <div>Use HTTP instead of HTTPS when working with OCI registries</div>
-                        <div>Requires Helm &gt;= 3.13.0</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>

docs/kubernetes.core.helm_registry_auth_module.rst

@@ -25,7 +25,7 @@ Requirements
 ------------
 The below requirements are needed on the host that executes this module.
 
-- helm (https://github.com/helm/helm/releases) >= 3.8.0
+- helm (https://github.com/helm/helm/releases) >= 3.8.0, <4.0.0
 
 
 Parameters
@@ -151,27 +151,6 @@ Parameters
                         <div style="font-size: small; color: darkgreen"><br/>aliases: repo_password</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>plain_http</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">boolean</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 6.4.0</div>
-                </td>
-                <td>
-                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
-                                    <li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
-                                    <li>yes</li>
-                        </ul>
-                </td>
-                <td>
-                        <div>Use insecure HTTP connections for <code>helm registry login</code>.</div>
-                        <div>Requires Helm &gt;= 3.18.0</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>

docs/kubernetes.core.helm_repository_module.rst

@@ -25,7 +25,7 @@ Requirements
 ------------
 The below requirements are needed on the host that executes this module.
 
-- helm >= 3.0.0 (https://github.com/helm/helm/releases)
+- helm (https://github.com/helm/helm/releases)
 - yaml (https://pypi.org/project/PyYAML/)
 
 
@@ -336,7 +336,7 @@ Examples
 
 Return Values
 -------------
-Common return values are documented `here <https://docs.ansible.com/projects/ansible/latest/reference_appendices/common_return_values.html#common-return-values>`_, the following are the fields unique to this module:
+Common return values are documented `here <https://docs.ansible.com/ansible/latest/reference_appendices/common_return_values.html#common-return-values>`_, the following are the fields unique to this module:
 
 .. raw:: html
 

docs/kubernetes.core.helm_template_module.rst

@@ -20,13 +20,6 @@ Synopsis
 
 
 
-Requirements
-------------
-The below requirements are needed on the host that executes this module.
-
-- helm >= 3.0.0 (https://github.com/helm/helm/releases)
-- yaml (https://pypi.org/project/PyYAML/)
-
 
 Parameters
 ----------
@@ -201,27 +194,6 @@ Parameters
                         <div>If the directory already exists, it will be overwritten.</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>plain_http</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">boolean</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 6.1.0</div>
-                </td>
-                <td>
-                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
-                                    <li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
-                                    <li>yes</li>
-                        </ul>
-                </td>
-                <td>
-                        <div>Use HTTP instead of HTTPS when working with OCI registries</div>
-                        <div>Requires Helm &gt;= 3.13.0</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -437,7 +409,7 @@ Examples
 
 Return Values
 -------------
-Common return values are documented `here <https://docs.ansible.com/projects/ansible/latest/reference_appendices/common_return_values.html#common-return-values>`_, the following are the fields unique to this module:
+Common return values are documented `here <https://docs.ansible.com/ansible/latest/reference_appendices/common_return_values.html#common-return-values>`_, the following are the fields unique to this module:
 
 .. raw:: html
 

docs/kubernetes.core.k8s_inventory.rst

@@ -0,0 +1,372 @@
+.. _kubernetes.core.k8s_inventory:
+
+
+*******************
+kubernetes.core.k8s
+*******************
+
+**Kubernetes (K8s) inventory source**
+
+
+
+.. contents::
+   :local:
+   :depth: 1
+
+DEPRECATED
+----------
+:Removed in collection release after 
+:Why: As discussed in https://github.com/ansible-collections/kubernetes.core/issues/31, we decided to
+remove the k8s inventory plugin in release 6.0.0.
+
+:Alternative: Use :ref:`kubernetes.core.k8s_info <kubernetes.core.k8s_info_module>` and :ref:`ansible.builtin.add_host <ansible.builtin.add_host_module>` instead.
+
+
+
+Synopsis
+--------
+- Fetch containers and services for one or more clusters.
+- Groups by cluster name, namespace, namespace_services, namespace_pods, and labels.
+- Uses the kubectl connection plugin to access the Kubernetes cluster.
+- Uses k8s.(yml|yaml) YAML configuration file to set parameter values.
+
+
+
+Requirements
+------------
+The below requirements are needed on the local Ansible controller node that executes this inventory.
+
+- python >= 3.9
+- kubernetes >= 24.2.0
+- PyYAML >= 3.11
+
+
+Parameters
+----------
+
+.. raw:: html
+
+    <table  border=0 cellpadding=0 class="documentation-table">
+        <tr>
+            <th colspan="2">Parameter</th>
+            <th>Choices/<font color="blue">Defaults</font></th>
+                <th>Configuration</th>
+            <th width="100%">Comments</th>
+        </tr>
+            <tr>
+                <td colspan="2">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>connections</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">-</span>
+                    </div>
+                </td>
+                <td>
+                </td>
+                    <td>
+                    </td>
+                <td>
+                        <div>Optional list of cluster connection settings. If no connections are provided, the default <em>~/.kube/config</em> and active context will be used, and objects will be returned for all namespaces the active user is authorized to access.</div>
+                </td>
+            </tr>
+                                <tr>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>api_key</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">-</span>
+                    </div>
+                </td>
+                <td>
+                </td>
+                    <td>
+                    </td>
+                <td>
+                        <div>Token used to authenticate with the API. Can also be specified via K8S_AUTH_API_KEY environment variable.</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>ca_cert</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">-</span>
+                    </div>
+                </td>
+                <td>
+                </td>
+                    <td>
+                    </td>
+                <td>
+                        <div>Path to a CA certificate used to authenticate with the API. Can also be specified via K8S_AUTH_SSL_CA_CERT environment variable.</div>
+                        <div style="font-size: small; color: darkgreen"><br/>aliases: ssl_ca_cert</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>client_cert</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">-</span>
+                    </div>
+                </td>
+                <td>
+                </td>
+                    <td>
+                    </td>
+                <td>
+                        <div>Path to a certificate used to authenticate with the API. Can also be specified via K8S_AUTH_CERT_FILE environment variable.</div>
+                        <div style="font-size: small; color: darkgreen"><br/>aliases: cert_file</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>client_key</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">-</span>
+                    </div>
+                </td>
+                <td>
+                </td>
+                    <td>
+                    </td>
+                <td>
+                        <div>Path to a key file used to authenticate with the API. Can also be specified via K8S_AUTH_KEY_FILE environment variable.</div>
+                        <div style="font-size: small; color: darkgreen"><br/>aliases: key_file</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>context</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">-</span>
+                    </div>
+                </td>
+                <td>
+                </td>
+                    <td>
+                    </td>
+                <td>
+                        <div>The name of a context found in the config file. Can also be specified via K8S_AUTH_CONTEXT environment variable.</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>host</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">-</span>
+                    </div>
+                </td>
+                <td>
+                </td>
+                    <td>
+                    </td>
+                <td>
+                        <div>Provide a URL for accessing the API. Can also be specified via K8S_AUTH_HOST environment variable.</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>kubeconfig</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">-</span>
+                    </div>
+                </td>
+                <td>
+                </td>
+                    <td>
+                    </td>
+                <td>
+                        <div>Path to an existing Kubernetes config file. If not provided, and no other connection options are provided, the Kubernetes client will attempt to load the default configuration file from <em>~/.kube/config</em>. Can also be specified via K8S_AUTH_KUBECONFIG environment variable.</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>name</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">-</span>
+                    </div>
+                </td>
+                <td>
+                </td>
+                    <td>
+                    </td>
+                <td>
+                        <div>Optional name to assign to the cluster. If not provided, a name is constructed from the server and port.</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>namespaces</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">-</span>
+                    </div>
+                </td>
+                <td>
+                </td>
+                    <td>
+                    </td>
+                <td>
+                        <div>List of namespaces. If not specified, will fetch all containers for all namespaces user is authorized to access.</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>password</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">-</span>
+                    </div>
+                </td>
+                <td>
+                </td>
+                    <td>
+                    </td>
+                <td>
+                        <div>Provide a password for authenticating with the API. Can also be specified via K8S_AUTH_PASSWORD environment variable.</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>username</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">-</span>
+                    </div>
+                </td>
+                <td>
+                </td>
+                    <td>
+                    </td>
+                <td>
+                        <div>Provide a username for authenticating with the API. Can also be specified via K8S_AUTH_USERNAME environment variable.</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>validate_certs</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">boolean</span>
+                    </div>
+                </td>
+                <td>
+                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
+                                    <li>no</li>
+                                    <li>yes</li>
+                        </ul>
+                </td>
+                    <td>
+                    </td>
+                <td>
+                        <div>Whether or not to verify the API server&#x27;s SSL certificates. Can also be specified via K8S_AUTH_VERIFY_SSL environment variable.</div>
+                        <div style="font-size: small; color: darkgreen"><br/>aliases: verify_ssl</div>
+                </td>
+            </tr>
+
+            <tr>
+                <td colspan="2">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>plugin</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">-</span>
+                         / <span style="color: red">required</span>
+                    </div>
+                </td>
+                <td>
+                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
+                                    <li>kubernetes.core.k8s</li>
+                                    <li>k8s</li>
+                                    <li>community.kubernetes.k8s</li>
+                        </ul>
+                </td>
+                    <td>
+                    </td>
+                <td>
+                        <div>token that ensures this is a source file for the &#x27;k8s&#x27; plugin.</div>
+                </td>
+            </tr>
+    </table>
+    <br/>
+
+
+
+
+Examples
+--------
+
+.. code-block:: yaml
+
+    # File must be named k8s.yaml or k8s.yml
+
+    - name: Authenticate with token, and return all pods and services for all namespaces
+      plugin: kubernetes.core.k8s
+      connections:
+        - host: https://192.168.64.4:8443
+          api_key: xxxxxxxxxxxxxxxx
+          validate_certs: false
+
+    - name: Use default config (~/.kube/config) file and active context, and return objects for a specific namespace
+      plugin: kubernetes.core.k8s
+      connections:
+        - namespaces:
+            - testing
+
+    - name: Use a custom config file, and a specific context.
+      plugin: kubernetes.core.k8s
+      connections:
+        - kubeconfig: /path/to/config
+          context: 'awx/192-168-64-4:8443/developer'
+
+
+
+
+Status
+------
+
+
+- This inventory will be removed in version 6.0.0. *[deprecated]*
+- For more information see `DEPRECATED`_.
+
+
+Authors
+~~~~~~~
+
+- Chris Houseknecht (@chouseknecht)
+- Fabian von Feilitzsch (@fabianvf)
+
+
+.. hint::
+    Configuration entries for each entry type have a low to high priority order. For example, a variable that is lower in the list will override a variable that is higher up.

docs/kubernetes.core.k8s_json_patch_module.rst

@@ -140,25 +140,6 @@ Parameters
                         <div>The name of a context found in the config file. Can also be specified via K8S_AUTH_CONTEXT environment variable.</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>hidden_fields</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">list</span>
-                         / <span style="color: purple">elements=string</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 6.1.0</div>
-                </td>
-                <td>
-                        <b>Default:</b><br/><div style="color: blue">[]</div>
-                </td>
-                <td>
-                        <div>List of fields to hide from the diff output.</div>
-                        <div>This is useful for fields that are not relevant to the patch operation, such as `metadata.managedFields`.</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>

docs/kubernetes.core.kustomize_lookup.rst

@@ -95,26 +95,6 @@ Parameters
                         <div>Enable the helm chart inflation generator</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>environment</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">raw</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 6.2.0</div>
-                </td>
-                <td>
-                        <b>Default:</b><br/><div style="color: blue">{}</div>
-                </td>
-                    <td>
-                    </td>
-                <td>
-                        <div>The environment variables to pass to the kustomize or kubectl command.</div>
-                        <div>This can be a dictionary or a string in the format key=value, multiple pairs separated by space.</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -165,14 +145,6 @@ Examples
       kubernetes.core.k8s:
         definition: "{{ lookup('kubernetes.core.kustomize', dir='/path/to/kustomization', enable_helm=True) }}"
 
-    - name: Create kubernetes resources for lookup output with environment variables in string format
-      kubernetes.core.k8s:
-        definition: "{{ lookup('kubernetes.core.kustomize', binary_path='/path/to/kubectl', environment='HTTP_PROXY=http://proxy.example.com:3128') }}"
-
-    - name: Create kubernetes resources for lookup output with environment variables in dict format
-      kubernetes.core.k8s:
-        definition: "{{ lookup('kubernetes.core.kustomize', binary_path='/path/to/kubectl', environment={'HTTP_PROXY': 'http://proxy.example.com:3128'}) }}"
-
 
 
 Return Values

galaxy.yml

@@ -25,7 +25,7 @@ tags:
   - openshift
   - okd
   - cluster
-version: 6.4.0
+version: 5.4.2
 build_ignore:
   - .DS_Store
   - "*.tar.gz"

meta/runtime.yml

@@ -1,5 +1,5 @@
 ---
-requires_ansible: '>=2.16.0'
+requires_ansible: '>=2.15.0'
 
 action_groups:
   helm:
@@ -24,10 +24,11 @@ plugin_routing:
     openshift:
       redirect: community.okd.openshift
     k8s:
-      tombstone:
+      deprecation:
         removal_version: 6.0.0
         warning_text: >-
-          The k8s inventory plugin was slated for deprecation in 3.3.0 and has been removed in release 6.0.0. Use kubernetes.core.k8s_info and ansible.builtin.add_host instead.
+          The k8s inventory plugin has been deprecated and
+          will be removed in release 6.0.0.
   modules:
     k8s_auth:
       redirect: community.okd.k8s_auth

plugins/action/k8s_info.py

@@ -20,7 +20,7 @@ from ansible.errors import (
     AnsibleError,
     AnsibleFileNotFound,
 )
-from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
+from ansible.module_utils._text import to_bytes, to_native, to_text
 from ansible.module_utils.parsing.convert_bool import boolean
 from ansible.plugins.action import ActionBase
 

plugins/connection/kubectl.py

@@ -264,7 +264,7 @@ import subprocess
 import tempfile
 
 from ansible.errors import AnsibleError, AnsibleFileNotFound
-from ansible.module_utils.common.text.converters import to_bytes
+from ansible.module_utils._text import to_bytes
 from ansible.module_utils.parsing.convert_bool import boolean
 from ansible.module_utils.six.moves import shlex_quote
 from ansible.parsing.yaml.loader import AnsibleLoader

plugins/inventory/k8s.py

@@ -0,0 +1,476 @@
+# Copyright (c) 2018 Ansible Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
+
+DOCUMENTATION = """
+    name: k8s
+    author:
+      - Chris Houseknecht (@chouseknecht)
+      - Fabian von Feilitzsch (@fabianvf)
+
+    short_description: Kubernetes (K8s) inventory source
+
+    description:
+      - Fetch containers and services for one or more clusters.
+      - Groups by cluster name, namespace, namespace_services, namespace_pods, and labels.
+      - Uses the kubectl connection plugin to access the Kubernetes cluster.
+      - Uses k8s.(yml|yaml) YAML configuration file to set parameter values.
+
+    deprecated:
+      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 6.0.0.
+      alternative: "Use M(kubernetes.core.k8s_info) and M(ansible.builtin.add_host) instead."
+
+    options:
+      plugin:
+         description: token that ensures this is a source file for the 'k8s' plugin.
+         required: True
+         choices: ['kubernetes.core.k8s', 'k8s', 'community.kubernetes.k8s']
+      connections:
+          description:
+          - Optional list of cluster connection settings. If no connections are provided, the default
+            I(~/.kube/config) and active context will be used, and objects will be returned for all namespaces
+            the active user is authorized to access.
+          suboptions:
+              name:
+                  description:
+                  - Optional name to assign to the cluster. If not provided, a name is constructed from the server
+                    and port.
+              kubeconfig:
+                  description:
+                  - Path to an existing Kubernetes config file. If not provided, and no other connection
+                    options are provided, the Kubernetes client will attempt to load the default
+                    configuration file from I(~/.kube/config). Can also be specified via K8S_AUTH_KUBECONFIG
+                    environment variable.
+              context:
+                  description:
+                  - The name of a context found in the config file. Can also be specified via K8S_AUTH_CONTEXT environment
+                    variable.
+              host:
+                  description:
+                  - Provide a URL for accessing the API. Can also be specified via K8S_AUTH_HOST environment variable.
+              api_key:
+                  description:
+                  - Token used to authenticate with the API. Can also be specified via K8S_AUTH_API_KEY environment
+                    variable.
+              username:
+                  description:
+                  - Provide a username for authenticating with the API. Can also be specified via K8S_AUTH_USERNAME
+                    environment variable.
+              password:
+                  description:
+                  - Provide a password for authenticating with the API. Can also be specified via K8S_AUTH_PASSWORD
+                    environment variable.
+              client_cert:
+                  description:
+                  - Path to a certificate used to authenticate with the API. Can also be specified via K8S_AUTH_CERT_FILE
+                    environment variable.
+                  aliases: [ cert_file ]
+              client_key:
+                  description:
+                  - Path to a key file used to authenticate with the API. Can also be specified via K8S_AUTH_KEY_FILE
+                    environment variable.
+                  aliases: [ key_file ]
+              ca_cert:
+                  description:
+                  - Path to a CA certificate used to authenticate with the API. Can also be specified via
+                    K8S_AUTH_SSL_CA_CERT environment variable.
+                  aliases: [ ssl_ca_cert ]
+              validate_certs:
+                  description:
+                  - "Whether or not to verify the API server's SSL certificates. Can also be specified via
+                    K8S_AUTH_VERIFY_SSL environment variable."
+                  type: bool
+                  aliases: [ verify_ssl ]
+              namespaces:
+                  description:
+                  - List of namespaces. If not specified, will fetch all containers for all namespaces user is authorized
+                    to access.
+
+    requirements:
+    - "python >= 3.9"
+    - "kubernetes >= 24.2.0"
+    - "PyYAML >= 3.11"
+"""
+
+EXAMPLES = r"""
+# File must be named k8s.yaml or k8s.yml
+
+- name: Authenticate with token, and return all pods and services for all namespaces
+  plugin: kubernetes.core.k8s
+  connections:
+    - host: https://192.168.64.4:8443
+      api_key: xxxxxxxxxxxxxxxx
+      validate_certs: false
+
+- name: Use default config (~/.kube/config) file and active context, and return objects for a specific namespace
+  plugin: kubernetes.core.k8s
+  connections:
+    - namespaces:
+        - testing
+
+- name: Use a custom config file, and a specific context.
+  plugin: kubernetes.core.k8s
+  connections:
+    - kubeconfig: /path/to/config
+      context: 'awx/192-168-64-4:8443/developer'
+"""
+
+import json
+
+from ansible.errors import AnsibleError
+from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable, Constructable
+
+try:
+    from kubernetes.dynamic.exceptions import DynamicApiError
+
+    HAS_K8S_MODULE_HELPER = True
+    k8s_import_exception = None
+except ImportError as e:
+    HAS_K8S_MODULE_HELPER = False
+    k8s_import_exception = e
+from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
+    get_api_client,
+)
+
+
+def format_dynamic_api_exc(exc):
+    if exc.body:
+        if exc.headers and exc.headers.get("Content-Type") == "application/json":
+            message = json.loads(exc.body).get("message")
+            if message:
+                return message
+        return exc.body
+    else:
+        return "%s Reason: %s" % (exc.status, exc.reason)
+
+
+class K8sInventoryException(Exception):
+    pass
+
+
+class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
+    NAME = "kubernetes.core.k8s"
+
+    connection_plugin = "kubernetes.core.kubectl"
+    transport = "kubectl"
+
+    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 6.0.0",
+            version="6.0.0",
+            collection_name="kubernetes.core",
+        )
+        cache_key = self._get_cache_prefix(path)
+        config_data = self._read_config_data(path)
+        self.setup(config_data, cache, cache_key)
+
+    def setup(self, config_data, cache, cache_key):
+        connections = config_data.get("connections")
+
+        if not HAS_K8S_MODULE_HELPER:
+            raise K8sInventoryException(
+                "This module requires the Kubernetes Python client. Try `pip install kubernetes`. Detail: {0}".format(
+                    k8s_import_exception
+                )
+            )
+
+        source_data = None
+        if cache and cache_key in self._cache:
+            try:
+                source_data = self._cache[cache_key]
+            except KeyError:
+                pass
+
+        if not source_data:
+            self.fetch_objects(connections)
+
+    def fetch_objects(self, connections):
+        if connections:
+            if not isinstance(connections, list):
+                raise K8sInventoryException("Expecting connections to be a list.")
+
+            for connection in connections:
+                if not isinstance(connection, dict):
+                    raise K8sInventoryException(
+                        "Expecting connection to be a dictionary."
+                    )
+                client = get_api_client(**connection)
+                name = connection.get(
+                    "name", self.get_default_host_name(client.configuration.host)
+                )
+                if connection.get("namespaces"):
+                    namespaces = connection["namespaces"]
+                else:
+                    namespaces = self.get_available_namespaces(client)
+                for namespace in namespaces:
+                    self.get_pods_for_namespace(client, name, namespace)
+                    self.get_services_for_namespace(client, name, namespace)
+        else:
+            client = get_api_client()
+            name = self.get_default_host_name(client.configuration.host)
+            namespaces = self.get_available_namespaces(client)
+            for namespace in namespaces:
+                self.get_pods_for_namespace(client, name, namespace)
+                self.get_services_for_namespace(client, name, namespace)
+
+    @staticmethod
+    def get_default_host_name(host):
+        return (
+            host.replace("https://", "")
+            .replace("http://", "")
+            .replace(".", "-")
+            .replace(":", "_")
+        )
+
+    def get_available_namespaces(self, client):
+        v1_namespace = client.resources.get(api_version="v1", kind="Namespace")
+        try:
+            obj = v1_namespace.get()
+        except DynamicApiError as exc:
+            self.display.debug(exc)
+            raise K8sInventoryException(
+                "Error fetching Namespace list: %s" % format_dynamic_api_exc(exc)
+            )
+        return [namespace.metadata.name for namespace in obj.items]
+
+    def get_pods_for_namespace(self, client, name, namespace):
+        v1_pod = client.resources.get(api_version="v1", kind="Pod")
+        try:
+            obj = v1_pod.get(namespace=namespace)
+        except DynamicApiError as exc:
+            self.display.debug(exc)
+            raise K8sInventoryException(
+                "Error fetching Pod list: %s" % format_dynamic_api_exc(exc)
+            )
+
+        namespace_group = "namespace_{0}".format(namespace)
+        namespace_pods_group = "{0}_pods".format(namespace_group)
+
+        self.inventory.add_group(name)
+        self.inventory.add_group(namespace_group)
+        self.inventory.add_child(name, namespace_group)
+        self.inventory.add_group(namespace_pods_group)
+        self.inventory.add_child(namespace_group, namespace_pods_group)
+
+        for pod in obj.items:
+            pod_name = pod.metadata.name
+            pod_groups = []
+            pod_annotations = (
+                {} if not pod.metadata.annotations else dict(pod.metadata.annotations)
+            )
+
+            if pod.metadata.labels:
+                # create a group for each label_value
+                for key, value in pod.metadata.labels:
+                    group_name = "label_{0}_{1}".format(key, value)
+                    if group_name not in pod_groups:
+                        pod_groups.append(group_name)
+                    self.inventory.add_group(group_name)
+                pod_labels = dict(pod.metadata.labels)
+            else:
+                pod_labels = {}
+
+            if not pod.status.containerStatuses:
+                continue
+
+            for container in pod.status.containerStatuses:
+                # add each pod_container to the namespace group, and to each label_value group
+                container_name = "{0}_{1}".format(pod.metadata.name, container.name)
+                self.inventory.add_host(container_name)
+                self.inventory.add_child(namespace_pods_group, container_name)
+                if pod_groups:
+                    for group in pod_groups:
+                        self.inventory.add_child(group, container_name)
+
+                # Add hostvars
+                self.inventory.set_variable(container_name, "object_type", "pod")
+                self.inventory.set_variable(container_name, "labels", pod_labels)
+                self.inventory.set_variable(
+                    container_name, "annotations", pod_annotations
+                )
+                self.inventory.set_variable(
+                    container_name, "cluster_name", pod.metadata.clusterName
+                )
+                self.inventory.set_variable(
+                    container_name, "pod_node_name", pod.spec.nodeName
+                )
+                self.inventory.set_variable(container_name, "pod_name", pod.spec.name)
+                self.inventory.set_variable(
+                    container_name, "pod_host_ip", pod.status.hostIP
+                )
+                self.inventory.set_variable(
+                    container_name, "pod_phase", pod.status.phase
+                )
+                self.inventory.set_variable(container_name, "pod_ip", pod.status.podIP)
+                self.inventory.set_variable(
+                    container_name, "pod_self_link", pod.metadata.selfLink
+                )
+                self.inventory.set_variable(
+                    container_name, "pod_resource_version", pod.metadata.resourceVersion
+                )
+                self.inventory.set_variable(container_name, "pod_uid", pod.metadata.uid)
+                self.inventory.set_variable(
+                    container_name, "container_name", container.image
+                )
+                self.inventory.set_variable(
+                    container_name, "container_image", container.image
+                )
+                if container.state.running:
+                    self.inventory.set_variable(
+                        container_name, "container_state", "Running"
+                    )
+                if container.state.terminated:
+                    self.inventory.set_variable(
+                        container_name, "container_state", "Terminated"
+                    )
+                if container.state.waiting:
+                    self.inventory.set_variable(
+                        container_name, "container_state", "Waiting"
+                    )
+                self.inventory.set_variable(
+                    container_name, "container_ready", container.ready
+                )
+                self.inventory.set_variable(
+                    container_name, "ansible_remote_tmp", "/tmp/"
+                )
+                self.inventory.set_variable(
+                    container_name, "ansible_connection", self.connection_plugin
+                )
+                self.inventory.set_variable(
+                    container_name, "ansible_{0}_pod".format(self.transport), pod_name
+                )
+                self.inventory.set_variable(
+                    container_name,
+                    "ansible_{0}_container".format(self.transport),
+                    container.name,
+                )
+                self.inventory.set_variable(
+                    container_name,
+                    "ansible_{0}_namespace".format(self.transport),
+                    namespace,
+                )
+
+    def get_services_for_namespace(self, client, name, namespace):
+        v1_service = client.resources.get(api_version="v1", kind="Service")
+        try:
+            obj = v1_service.get(namespace=namespace)
+        except DynamicApiError as exc:
+            self.display.debug(exc)
+            raise K8sInventoryException(
+                "Error fetching Service list: %s" % format_dynamic_api_exc(exc)
+            )
+
+        namespace_group = "namespace_{0}".format(namespace)
+        namespace_services_group = "{0}_services".format(namespace_group)
+
+        self.inventory.add_group(name)
+        self.inventory.add_group(namespace_group)
+        self.inventory.add_child(name, namespace_group)
+        self.inventory.add_group(namespace_services_group)
+        self.inventory.add_child(namespace_group, namespace_services_group)
+
+        for service in obj.items:
+            service_name = service.metadata.name
+            service_labels = (
+                {} if not service.metadata.labels else dict(service.metadata.labels)
+            )
+            service_annotations = (
+                {}
+                if not service.metadata.annotations
+                else dict(service.metadata.annotations)
+            )
+
+            self.inventory.add_host(service_name)
+
+            if service.metadata.labels:
+                # create a group for each label_value
+                for key, value in service.metadata.labels:
+                    group_name = "label_{0}_{1}".format(key, value)
+                    self.inventory.add_group(group_name)
+                    self.inventory.add_child(group_name, service_name)
+
+            try:
+                self.inventory.add_child(namespace_services_group, service_name)
+            except AnsibleError:
+                raise
+
+            ports = [
+                {
+                    "name": port.name,
+                    "port": port.port,
+                    "protocol": port.protocol,
+                    "targetPort": port.targetPort,
+                    "nodePort": port.nodePort,
+                }
+                for port in service.spec.ports or []
+            ]
+
+            # add hostvars
+            self.inventory.set_variable(service_name, "object_type", "service")
+            self.inventory.set_variable(service_name, "labels", service_labels)
+            self.inventory.set_variable(
+                service_name, "annotations", service_annotations
+            )
+            self.inventory.set_variable(
+                service_name, "cluster_name", service.metadata.clusterName
+            )
+            self.inventory.set_variable(service_name, "ports", ports)
+            self.inventory.set_variable(service_name, "type", service.spec.type)
+            self.inventory.set_variable(
+                service_name, "self_link", service.metadata.selfLink
+            )
+            self.inventory.set_variable(
+                service_name, "resource_version", service.metadata.resourceVersion
+            )
+            self.inventory.set_variable(service_name, "uid", service.metadata.uid)
+
+            if service.spec.externalTrafficPolicy:
+                self.inventory.set_variable(
+                    service_name,
+                    "external_traffic_policy",
+                    service.spec.externalTrafficPolicy,
+                )
+            if service.spec.externalIPs:
+                self.inventory.set_variable(
+                    service_name, "external_ips", service.spec.externalIPs
+                )
+
+            if service.spec.externalName:
+                self.inventory.set_variable(
+                    service_name, "external_name", service.spec.externalName
+                )
+
+            if service.spec.healthCheckNodePort:
+                self.inventory.set_variable(
+                    service_name,
+                    "health_check_node_port",
+                    service.spec.healthCheckNodePort,
+                )
+            if service.spec.loadBalancerIP:
+                self.inventory.set_variable(
+                    service_name, "load_balancer_ip", service.spec.loadBalancerIP
+                )
+            if service.spec.selector:
+                self.inventory.set_variable(
+                    service_name, "selector", dict(service.spec.selector)
+                )
+
+            if (
+                hasattr(service.status.loadBalancer, "ingress")
+                and service.status.loadBalancer.ingress
+            ):
+                load_balancer = [
+                    {"hostname": ingress.hostname, "ip": ingress.ip}
+                    for ingress in service.status.loadBalancer.ingress
+                ]
+                self.inventory.set_variable(
+                    service_name, "load_balancer", load_balancer
+                )

plugins/lookup/kustomize.py

@@ -34,13 +34,6 @@ DOCUMENTATION = """
         description:
         - Enable the helm chart inflation generator
         default: "False"
-      environment:
-        description:
-        - The environment variables to pass to the kustomize or kubectl command.
-        - This can be a dictionary or a string in the format key=value, multiple pairs separated by space.
-        type: raw
-        default: {}
-        version_added: 6.2.0
 
     requirements:
       - "python >= 3.6"
@@ -62,14 +55,6 @@ EXAMPLES = """
 - name: Create kubernetes resources for lookup output with `--enable-helm` set
   kubernetes.core.k8s:
     definition: "{{ lookup('kubernetes.core.kustomize', dir='/path/to/kustomization', enable_helm=True) }}"
-
-- name: Create kubernetes resources for lookup output with environment variables in string format
-  kubernetes.core.k8s:
-    definition: "{{ lookup('kubernetes.core.kustomize', binary_path='/path/to/kubectl', environment='HTTP_PROXY=http://proxy.example.com:3128') }}"
-
-- name: Create kubernetes resources for lookup output with environment variables in dict format
-  kubernetes.core.k8s:
-    definition: "{{ lookup('kubernetes.core.kustomize', binary_path='/path/to/kubectl', environment={'HTTP_PROXY': 'http://proxy.example.com:3128'}) }}"
 """
 
 RETURN = """
@@ -87,7 +72,6 @@ RETURN = """
         key1: val1
 """
 
-import os
 import subprocess
 
 from ansible.errors import AnsibleLookupError
@@ -108,10 +92,8 @@ def get_binary_from_path(name, opt_dirs=None):
         return None
 
 
-def run_command(command, environ=None):
-    cmd = subprocess.Popen(
-        command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=environ
-    )
+def run_command(command):
+    cmd = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     stdout, stderr = cmd.communicate()
     return cmd.returncode, stdout, stderr
 
@@ -125,7 +107,6 @@ class LookupModule(LookupBase):
         binary_path=None,
         opt_dirs=None,
         enable_helm=False,
-        environment=None,
         **kwargs
     ):
         executable_path = binary_path
@@ -160,21 +141,7 @@ class LookupModule(LookupBase):
         if enable_helm:
             command += ["--enable-helm"]
 
-        environ = None
-        if environment:
-            environ = os.environ.copy()
-            if isinstance(environment, str):
-                if not all(env.count("=") == 1 for env in environment.split(" ")):
-                    raise AnsibleLookupError(
-                        "environment should be dict or string in the format key=value, multiple pairs separated by space"
-                    )
-                for env in environment.split(" "):
-                    key, value = env.split("=")
-                    environ[key] = value
-            if isinstance(environment, dict):
-                environ.update(environment)
-
-        (ret, out, err) = run_command(command, environ=environ)
+        (ret, out, err) = run_command(command)
         if ret != 0:
             if err:
                 raise AnsibleLookupError(

plugins/module_utils/common.py

@@ -23,7 +23,7 @@ import base64
 import os
 from tempfile import NamedTemporaryFile
 
-from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
+from ansible.module_utils._text import to_bytes, to_native, to_text
 from ansible.module_utils.urls import Request
 
 try:

plugins/module_utils/copy.py

@@ -23,7 +23,7 @@ from abc import ABCMeta, abstractmethod
 from select import select
 from tempfile import NamedTemporaryFile, TemporaryFile
 
-from ansible.module_utils.common.text.converters import to_native
+from ansible.module_utils._text import to_native
 
 # from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import AnsibleModule
 from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions import (

plugins/module_utils/helm.py

@@ -40,20 +40,16 @@ def parse_helm_plugin_list(output=None):
     if not output:
         return ret
 
-    parsing_grammar = None
     for line in output:
         if line.startswith("NAME"):
-            parsing_grammar = [s.strip().lower() for s in line.split("\t")]
             continue
-        if parsing_grammar is None:
+        name, version, description = line.split("\t", 3)
+        name = name.strip()
+        version = version.strip()
+        description = description.strip()
+        if name == "":
             continue
-        plugin = {
-            parsing_grammar[i]: v.strip()
-            for i, v in enumerate(line.split("\t", len(parsing_grammar)))
-        }
-        if plugin["name"] == "":
-            continue
-        ret.append(plugin)
+        ret.append((name, version, description))
 
     return ret
 
@@ -206,35 +202,21 @@ class AnsibleHelmModule(object):
             return m.group(1)
         return None
 
-    def is_helm_v4(self):
-        helm_version = self.get_helm_version()
-        if helm_version is None:
-            return False
-        return LooseVersion(helm_version) >= LooseVersion("4.0.0")
-
-    def is_helm_version_compatible_with_helm_diff(self, helm_diff_version):
+    def validate_helm_version(self):
         """
-        Return true if the helm version is compatible with the helm diff version
-        Helm v4 requires helm diff v3.14.0
-        """
-        if not helm_diff_version:
-            return False
-        if self.is_helm_v4():
-            return LooseVersion(helm_diff_version) >= LooseVersion("3.14.0")
-        return True
-
-    def validate_helm_version(self, version="3.0.0"):
-        """
-        Validate that Helm version is >= version (default version=3.0.0).
+        Validate that Helm version is >=3.0.0 and <4.0.0.
+        Helm 4 is not yet supported.
         """
         helm_version = self.get_helm_version()
         if helm_version is None:
             self.fail_json(msg="Unable to determine Helm version")
 
-        if LooseVersion(helm_version) < LooseVersion(version):
+        if (LooseVersion(helm_version) < LooseVersion("3.0.0")) or (
+            LooseVersion(helm_version) >= LooseVersion("4.0.0")
+        ):
             self.fail_json(
-                msg="Helm version must be >= {0}, current version is {1}".format(
-                    version, helm_version
+                msg="Helm version must be >=3.0.0,<4.0.0, current version is {0}".format(
+                    helm_version
                 )
             )
 

plugins/module_utils/k8s/runner.py

@@ -3,7 +3,7 @@
 
 from typing import Dict
 
-from ansible.module_utils.common.text.converters import to_native
+from ansible.module_utils._text import to_native
 from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
     get_api_client,
 )

plugins/module_utils/kubeconfig.py

@@ -1,91 +0,0 @@
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import absolute_import, division, print_function
-
-__metaclass__ = type
-
-import hashlib
-import os
-import traceback
-
-try:
-    import yaml
-
-    IMP_YAML = True
-    IMP_YAML_ERR = None
-except ImportError:
-    IMP_YAML = False
-    IMP_YAML_ERR = traceback.format_exc()
-
-
-def load_yaml_file(path):
-    if not path or not os.path.exists(path):
-        return {}
-    with open(path, "r") as f:
-        return yaml.safe_load(f) or {}
-
-
-def deep_merge(base, updates):
-    result = base.copy()
-    for key, value in updates.items():
-        if key in result and isinstance(result[key], dict) and isinstance(value, dict):
-            result[key] = deep_merge(result[key], value)
-        else:
-            result[key] = value
-    return result
-
-
-def merge_by_name(existing, new):
-    merged = {}
-    for item in existing:
-        if isinstance(item, dict) and "name" in item:
-            merged[item["name"]] = item
-
-    for item in new:
-        if not isinstance(item, dict) or "name" not in item:
-            continue
-
-        name = item["name"]
-        behavior = item.get("behavior", "merge")
-        item_copy = {k: v for k, v in item.items() if k != "behavior"}
-
-        if name in merged:
-            if behavior == "keep":
-                continue
-            elif behavior == "replace":
-                merged[name] = item_copy
-            else:
-                result = {"name": name}
-                for key in ["cluster", "user", "context"]:
-                    if key in merged[name] or key in item_copy:
-                        existing_config = merged[name].get(key, {})
-                        new_config = item_copy.get(key, {})
-                        result[key] = deep_merge(existing_config, new_config)
-                for key in merged[name]:
-                    if key not in ["name", "cluster", "user", "context"]:
-                        result[key] = merged[name][key]
-                for key in item_copy:
-                    if (
-                        key not in ["name", "cluster", "user", "context"]
-                        and key not in result
-                    ):
-                        result[key] = item_copy[key]
-                merged[name] = result
-        else:
-            merged[name] = item_copy
-
-    return list(merged.values())
-
-
-def hash_data(data):
-    """Generate SHA-256 hash for idempotency checking."""
-    return hashlib.sha256(yaml.safe_dump(data, sort_keys=True).encode()).hexdigest()
-
-
-def write_file(dest, data):
-    if not dest:
-        return False
-    with open(dest, "w") as f:
-        yaml.safe_dump(data, f, sort_keys=False)
-    return True

plugins/modules/helm.py

@@ -21,7 +21,7 @@ author:
   - Matthieu Diehr (@d-matt)
 
 requirements:
-  - "helm >= 3.0.0 (https://github.com/helm/helm/releases)"
+  - "helm (https://github.com/helm/helm/releases)"
   - "yaml (https://pypi.org/project/PyYAML/)"
 
 description:
@@ -237,27 +237,6 @@ options:
     default: False
     aliases: [ skip_tls_certs_check ]
     version_added: 5.3.0
-  plain_http:
-    description:
-      - Use HTTP instead of HTTPS when working with OCI registries
-      - Requires Helm >= 3.13.0
-    type: bool
-    default: False
-    version_added: 6.1.0
-  take_ownership:
-    description:
-      - Helm will ignore the check for helm annotations and take ownership of the existing resources
-      - This feature requires helm >= 3.17.0
-    type: bool
-    default: False
-    version_added: 6.1.0
-  skip_schema_validation:
-    description:
-      - Disables JSON schema validation for Chart and values.
-      - This feature requires helm >= 3.16.0
-    type: bool
-    default: False
-    version_added: 6.2.0
 extends_documentation_fragment:
   - kubernetes.core.helm_common_options
 """
@@ -340,12 +319,6 @@ EXAMPLES = r"""
     chart_ref: "https://github.com/grafana/helm-charts/releases/download/grafana-5.6.0/grafana-5.6.0.tgz"
     release_namespace: monitoring
 
-- name: Deploy Bitnami's MongoDB latest chart from OCI registry
-  kubernetes.core.helm:
-    name: test
-    chart_ref: "oci://registry-1.docker.io/bitnamicharts/mongodb"
-    release_namespace: database
-
 # Using complex Values
 - name: Deploy new-relic client chart
   kubernetes.core.helm:
@@ -500,13 +473,9 @@ def get_release_status(module, release_name, all_status=False):
         "--filter",
         release_name,
     ]
-    if all_status and not module.is_helm_v4():
-        # --all has been removed from `helm list` command on helm v4
+    if all_status:
         list_command.append("--all")
-    elif not all_status:
-        # The default behavior to display only deployed releases has been removed from
-        # Helm v4
-        list_command.append("--deployed")
+
     rc, out, err = module.run_helm_command(list_command)
 
     release = get_release(yaml.safe_load(out), release_name)
@@ -536,9 +505,7 @@ def run_dep_update(module, chart_ref):
     rc, out, err = module.run_helm_command(dep_update)
 
 
-def fetch_chart_info(
-    module, command, chart_ref, insecure_skip_tls_verify=False, plain_http=False
-):
+def fetch_chart_info(module, command, chart_ref, insecure_skip_tls_verify=False):
     """
     Get chart info
     """
@@ -547,17 +514,6 @@ def fetch_chart_info(
     if insecure_skip_tls_verify:
         inspect_command += " --insecure-skip-tls-verify"
 
-    if plain_http:
-        helm_version = module.get_helm_version()
-        if LooseVersion(helm_version) < LooseVersion("3.13.0"):
-            module.fail_json(
-                msg="plain_http requires helm >= 3.13.0, current version is {0}".format(
-                    helm_version
-                )
-            )
-        else:
-            inspect_command += " --plain-http"
-
     rc, out, err = module.run_helm_command(inspect_command)
 
     return yaml.safe_load(out)
@@ -587,9 +543,6 @@ def deploy(
     reset_values=True,
     reset_then_reuse_values=False,
     insecure_skip_tls_verify=False,
-    plain_http=False,
-    take_ownership=False,
-    skip_schema_validation=False,
 ):
     """
     Install/upgrade/rollback release chart
@@ -603,8 +556,6 @@ def deploy(
         deploy_command = command + " upgrade -i"  # install/upgrade
         if reset_values:
             deploy_command += " --reset-values"
-        if take_ownership:
-            deploy_command += " --take-ownership"
 
     if reuse_values is not None:
         deploy_command += " --reuse-values=" + str(reuse_values)
@@ -654,9 +605,6 @@ def deploy(
         else:
             deploy_command += " --insecure-skip-tls-verify"
 
-    if plain_http:
-        deploy_command += " --plain-http"
-
     if values_files:
         for value_file in values_files:
             deploy_command += " --values=" + value_file
@@ -680,17 +628,6 @@ def deploy(
     if set_value_args:
         deploy_command += " " + set_value_args
 
-    if skip_schema_validation:
-        helm_version = module.get_helm_version()
-        if LooseVersion(helm_version) < LooseVersion("3.16.0"):
-            module.fail_json(
-                msg="skip_schema_validation requires helm >= 3.16.0, current version is {0}".format(
-                    helm_version
-                )
-            )
-        else:
-            deploy_command += " --skip-schema-validation"
-
     deploy_command += " " + release_name + f" '{chart_name}'"
     return deploy_command
 
@@ -743,8 +680,8 @@ def get_plugin_version(plugin):
         return None
 
     for line in out:
-        if line["name"] == plugin:
-            return line["version"]
+        if line[0] == plugin:
+            return line[1]
     return None
 
 
@@ -763,8 +700,6 @@ def helmdiff_check(
     reset_values=True,
     reset_then_reuse_values=False,
     insecure_skip_tls_verify=False,
-    plain_http=False,
-    skip_schema_validation=False,
 ):
     """
     Use helm diff to determine if a release would change by upgrading a chart.
@@ -820,28 +755,6 @@ def helmdiff_check(
     if insecure_skip_tls_verify:
         cmd += " --insecure-skip-tls-verify"
 
-    if skip_schema_validation:
-        helm_version = module.get_helm_version()
-        if LooseVersion(helm_version) < LooseVersion("3.16.0"):
-            module.fail_json(
-                msg="skip_schema_validation requires helm >= 3.16.0, current version is {0}".format(
-                    helm_version
-                )
-            )
-        else:
-            cmd += " --skip-schema-validation"
-
-    if plain_http:
-        helm_version = module.get_helm_version()
-        if LooseVersion(helm_version) < LooseVersion("3.13.0"):
-            module.fail_json(
-                msg="plain_http requires helm >= 3.13.0, current version is {0}".format(
-                    helm_version
-                )
-            )
-        else:
-            cmd += " --plain-http"
-
     rc, out, err = module.run_helm_command(cmd)
     return (len(out.strip()) > 0, out.strip())
 
@@ -905,9 +818,6 @@ def argument_spec():
             insecure_skip_tls_verify=dict(
                 type="bool", default=False, aliases=["skip_tls_certs_check"]
             ),
-            plain_http=dict(type="bool", default=False),
-            take_ownership=dict(type="bool", default=False),
-            skip_schema_validation=dict(type="bool", default=False),
         )
     )
     return arg_spec
@@ -932,7 +842,7 @@ def main():
     if not IMP_YAML:
         module.fail_json(msg=missing_required_lib("yaml"), exception=IMP_YAML_ERR)
 
-    # Validate Helm version >=3.0.0
+    # Validate Helm version >=3.0.0,<4.0.0
     module.validate_helm_version()
 
     changed = False
@@ -965,9 +875,6 @@ def main():
     reset_values = module.params.get("reset_values")
     reset_then_reuse_values = module.params.get("reset_then_reuse_values")
     insecure_skip_tls_verify = module.params.get("insecure_skip_tls_verify")
-    plain_http = module.params.get("plain_http")
-    take_ownership = module.params.get("take_ownership")
-    skip_schema_validation = module.params.get("skip_schema_validation")
 
     if update_repo_cache:
         run_repo_update(module)
@@ -977,33 +884,6 @@ def main():
     release_status = get_release_status(module, release_name, all_status=all_status)
 
     helm_cmd = module.get_helm_binary()
-
-    if plain_http:
-        helm_version = module.get_helm_version()
-        if LooseVersion(helm_version) < LooseVersion("3.13.0"):
-            module.fail_json(
-                msg="plain_http requires helm >= 3.13.0, current version is {0}".format(
-                    helm_version
-                )
-            )
-    if take_ownership:
-        helm_version = module.get_helm_version()
-        if LooseVersion(helm_version) < LooseVersion("3.17.0"):
-            module.fail_json(
-                msg="take_ownership requires helm >= 3.17.0, current version is {0}".format(
-                    helm_version
-                )
-            )
-
-    if skip_schema_validation:
-        helm_version = module.get_helm_version()
-        if LooseVersion(helm_version) < LooseVersion("3.16.0"):
-            module.fail_json(
-                msg="skip_schema_validation requires helm >= 3.16.0, current version is {0}".format(
-                    helm_version
-                )
-            )
-
     opt_result = {}
     if release_state == "absent" and release_status is not None:
         # skip release statuses 'uninstalled' and 'uninstalling'
@@ -1014,7 +894,8 @@ def main():
             if wait:
                 helm_version = module.get_helm_version()
                 if LooseVersion(helm_version) < LooseVersion("3.7.0"):
-                    module.warn(
+                    opt_result["warnings"] = []
+                    opt_result["warnings"].append(
                         "helm uninstall support option --wait for helm release >= 3.7.0"
                     )
                     wait = False
@@ -1032,7 +913,7 @@ def main():
 
         # Fetch chart info to have real version and real name for chart_ref from archive, folder or url
         chart_info = fetch_chart_info(
-            module, helm_cmd, chart_ref, insecure_skip_tls_verify, plain_http
+            module, helm_cmd, chart_ref, insecure_skip_tls_verify
         )
 
         if dependency_update:
@@ -1094,29 +975,19 @@ def main():
                 reset_values=reset_values,
                 reset_then_reuse_values=reset_then_reuse_values,
                 insecure_skip_tls_verify=insecure_skip_tls_verify,
-                plain_http=plain_http,
-                take_ownership=take_ownership,
-                skip_schema_validation=skip_schema_validation,
             )
             changed = True
 
         else:
             helm_diff_version = get_plugin_version("diff")
-            helm_version_compatible = module.is_helm_version_compatible_with_helm_diff(
-                helm_diff_version
-            )
-            if (
-                helm_diff_version
-                and helm_version_compatible
-                and (
-                    not chart_repo_url
-                    or (
-                        chart_repo_url
-                        and LooseVersion(helm_diff_version) >= LooseVersion("3.4.1")
-                    )
+            if helm_diff_version and (
+                not chart_repo_url
+                or (
+                    chart_repo_url
+                    and LooseVersion(helm_diff_version) >= LooseVersion("3.4.1")
                 )
             ):
-                would_change, prepared = helmdiff_check(
+                (would_change, prepared) = helmdiff_check(
                     module,
                     release_name,
                     chart_ref,
@@ -1131,24 +1002,14 @@ def main():
                     reset_values=reset_values,
                     reset_then_reuse_values=reset_then_reuse_values,
                     insecure_skip_tls_verify=insecure_skip_tls_verify,
-                    plain_http=plain_http,
-                    skip_schema_validation=skip_schema_validation,
                 )
                 if would_change and module._diff:
                     opt_result["diff"] = {"prepared": prepared}
             else:
-                if helm_diff_version and not helm_version_compatible:
-                    module.warn(
-                        "Idempotency checks are currently disabled due to a version mismatch."
-                        f" Helm version {module.get_helm_version()} requires helm-diff >= 3.14.0,"
-                        f" but the environment is currently running {helm_diff_version}."
-                        " Please align the plugin versions to restore standard behavior."
-                    )
-                else:
-                    module.warn(
-                        "The default idempotency check can fail to report changes in certain cases. "
-                        "Install helm diff >= 3.4.1 for better results."
-                    )
+                module.warn(
+                    "The default idempotency check can fail to report changes in certain cases. "
+                    "Install helm diff >= 3.4.1 for better results."
+                )
                 would_change = default_check(
                     release_status, chart_info, release_values, values_files
                 )
@@ -1178,9 +1039,6 @@ def main():
                     reset_values=reset_values,
                     reset_then_reuse_values=reset_then_reuse_values,
                     insecure_skip_tls_verify=insecure_skip_tls_verify,
-                    plain_http=plain_http,
-                    take_ownership=take_ownership,
-                    skip_schema_validation=skip_schema_validation,
                 )
                 changed = True
 

plugins/modules/helm_info.py

@@ -20,7 +20,7 @@ author:
   - Lucas Boisserie (@LucasBoisserie)
 
 requirements:
-  - "helm >= 3.0.0 (https://github.com/helm/helm/releases)"
+  - "helm (https://github.com/helm/helm/releases)"
   - "yaml (https://pypi.org/project/PyYAML/)"
 
 description:
@@ -245,7 +245,7 @@ def main():
     if not IMP_YAML:
         module.fail_json(msg=missing_required_lib("yaml"), exception=IMP_YAML_ERR)
 
-    # Validate Helm version >=3.0.0
+    # Validate Helm version >=3.0.0,<4.0.0
     module.validate_helm_version()
 
     release_name = module.params.get("release_name")

plugins/modules/helm_plugin.py

@@ -16,7 +16,7 @@ version_added: 1.0.0
 author:
   - Abhijeet Kasurde (@Akasurde)
 requirements:
-  - "helm >= 3.0.0 (https://github.com/helm/helm/releases)"
+  - "helm (https://github.com/helm/helm/releases)"
 description:
   -  Manages Helm plugins.
 options:
@@ -48,14 +48,6 @@ options:
     required: false
     type: str
     version_added: 2.3.0
-  verify:
-    description:
-      - Verify the plugin signature before installing.
-      - This option requires helm version >= 4.0.0
-      - Used with I(state=present).
-    type: bool
-    default: true
-    version_added: 6.4.0
 extends_documentation_fragment:
   - kubernetes.core.helm_common_options
 """
@@ -126,9 +118,6 @@ from ansible_collections.kubernetes.core.plugins.module_utils.helm_args_common i
     HELM_AUTH_ARG_SPEC,
     HELM_AUTH_MUTUALLY_EXCLUSIVE,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.version import (
-    LooseVersion,
-)
 
 
 def argument_spec():
@@ -149,10 +138,6 @@ def argument_spec():
                 default="present",
                 choices=["present", "absent", "latest"],
             ),
-            verify=dict(
-                type="bool",
-                default=True,
-            ),
         )
     )
     return arg_spec
@@ -176,7 +161,7 @@ def main():
         mutually_exclusive=mutually_exclusive(),
     )
 
-    # Validate helm version >= 3.0.0
+    # Validate Helm version >=3.0.0,<4.0.0
     module.validate_helm_version()
 
     state = module.params.get("state")
@@ -186,19 +171,8 @@ def main():
     if state == "present":
         helm_cmd_common += " install %s" % module.params.get("plugin_path")
         plugin_version = module.params.get("plugin_version")
-        verify = module.params.get("verify")
         if plugin_version is not None:
             helm_cmd_common += " --version=%s" % plugin_version
-        if not verify:
-            helm_version = module.get_helm_version()
-            if LooseVersion(helm_version) < LooseVersion("4.0.0"):
-                module.warn(
-                    "verify parameter requires helm >= 4.0.0, current version is {0}".format(
-                        helm_version
-                    )
-                )
-            else:
-                helm_cmd_common += " --verify=false"
         if not module.check_mode:
             rc, out, err = module.run_helm_command(
                 helm_cmd_common, fails_on_error=False
@@ -237,9 +211,9 @@ def main():
     elif state == "absent":
         plugin_name = module.params.get("plugin_name")
         rc, output, err, command = module.get_helm_plugin_list()
-        plugins = parse_helm_plugin_list(output=output.splitlines())
+        out = parse_helm_plugin_list(output=output.splitlines())
 
-        if not plugins:
+        if not out:
             module.exit_json(
                 failed=False,
                 changed=False,
@@ -250,7 +224,12 @@ def main():
                 rc=rc,
             )
 
-        if all(plugin["name"] != plugin_name for plugin in plugins):
+        found = False
+        for line in out:
+            if line[0] == plugin_name:
+                found = True
+                break
+        if not found:
             module.exit_json(
                 failed=False,
                 changed=False,
@@ -288,9 +267,9 @@ def main():
     elif state == "latest":
         plugin_name = module.params.get("plugin_name")
         rc, output, err, command = module.get_helm_plugin_list()
-        plugins = parse_helm_plugin_list(output=output.splitlines())
+        out = parse_helm_plugin_list(output=output.splitlines())
 
-        if not plugins:
+        if not out:
             module.exit_json(
                 failed=False,
                 changed=False,
@@ -301,7 +280,12 @@ def main():
                 rc=rc,
             )
 
-        if all(plugin["name"] != plugin_name for plugin in plugins):
+        found = False
+        for line in out:
+            if line[0] == plugin_name:
+                found = True
+                break
+        if not found:
             module.exit_json(
                 failed=False,
                 changed=False,

plugins/modules/helm_plugin_info.py

@@ -16,7 +16,7 @@ version_added: 1.0.0
 author:
   - Abhijeet Kasurde (@Akasurde)
 requirements:
-  - "helm >= 3.0.0 (https://github.com/helm/helm/releases)"
+  - "helm (https://github.com/helm/helm/releases)"
 description:
   -  Gather information about Helm plugins installed in namespace.
 options:
@@ -98,16 +98,29 @@ def main():
         supports_check_mode=True,
     )
 
-    # Validate helm version >= 3.0.0
+    # Validate Helm version >=3.0.0,<4.0.0
     module.validate_helm_version()
 
     plugin_name = module.params.get("plugin_name")
 
+    plugin_list = []
+
     rc, output, err, command = module.get_helm_plugin_list()
 
-    plugins = parse_helm_plugin_list(output=output.splitlines())
-    if plugin_name is not None:
-        plugins = [plugin for plugin in plugins if plugin.get("name") == plugin_name]
+    out = parse_helm_plugin_list(output=output.splitlines())
+
+    for line in out:
+        if plugin_name is None:
+            plugin_list.append(
+                {"name": line[0], "version": line[1], "description": line[2]}
+            )
+            continue
+
+        if plugin_name == line[0]:
+            plugin_list.append(
+                {"name": line[0], "version": line[1], "description": line[2]}
+            )
+            break
 
     module.exit_json(
         changed=True,
@@ -115,7 +128,7 @@ def main():
         stdout=output,
         stderr=err,
         rc=rc,
-        plugin_list=plugins,
+        plugin_list=plugin_list,
     )
 
 

plugins/modules/helm_pull.py

@@ -21,7 +21,7 @@ description:
   - There are options for unpacking the chart after download.
 
 requirements:
-  - "helm >= 3.0.0 (https://github.com/helm/helm/releases)"
+  - "helm >= 3.0, <4.0.0 (https://github.com/helm/helm/releases)"
 
 options:
   chart_ref:
@@ -122,13 +122,6 @@ options:
       - The path of a helm binary to use.
     required: false
     type: path
-  plain_http:
-    description:
-      - Use HTTP instead of HTTPS when working with OCI registries
-      - Requires Helm >= 3.13.0
-    type: bool
-    default: False
-    version_added: 6.1.0
 """
 
 EXAMPLES = r"""
@@ -360,7 +353,6 @@ def main():
         chart_ssl_cert_file=dict(type="path"),
         chart_ssl_key_file=dict(type="path"),
         binary_path=dict(type="path"),
-        plain_http=dict(type="bool", default=False),
     )
     module = AnsibleHelmModule(
         argument_spec=argspec,
@@ -372,7 +364,7 @@ def main():
         mutually_exclusive=[("chart_version", "chart_devel")],
     )
 
-    # Validate Helm version >=3.0.0
+    # Validate Helm version >=3.0.0,<4.0.0
     module.validate_helm_version()
 
     helm_version = module.get_helm_version()
@@ -382,7 +374,6 @@ def main():
         chart_ca_cert="3.1.0",
         chart_ssl_cert_file="3.1.0",
         chart_ssl_key_file="3.1.0",
-        plain_http="3.13.0",
     )
 
     def test_version_requirement(opt):
@@ -422,7 +413,6 @@ def main():
         skip_tls_certs_check=dict(key="insecure-skip-tls-verify"),
         chart_devel=dict(key="devel"),
         untar_chart=dict(key="untar"),
-        plain_http=dict(key="plain-http"),
     )
 
     for k, v in helm_flag_args.items():

plugins/modules/helm_registry_auth.py

@@ -20,7 +20,7 @@ author:
   - Yuriy Novostavskiy (@yurnov)
 
 requirements:
-  - "helm (https://github.com/helm/helm/releases) >= 3.8.0"
+  - "helm (https://github.com/helm/helm/releases) >= 3.8.0, <4.0.0"
 
 description:
   -  Helm registry authentication module allows you to login C(helm registry login) and logout C(helm registry logout) from a Helm registry.
@@ -75,14 +75,6 @@ options:
       - Path to the CA certificate SSL file for verify registry server certificate.
     required: false
     type: path
-  plain_http:
-    description:
-      - Use insecure HTTP connections for C(helm registry login).
-      - Requires Helm >= 3.18.0
-    required: false
-    type: bool
-    default: False
-    version_added: 6.4.0
   binary_path:
     description:
       - The path of a helm binary to use.
@@ -156,7 +148,6 @@ def arg_spec():
         key_file=dict(type="path", required=False),
         cert_file=dict(type="path", required=False),
         ca_file=dict(type="path", required=False),
-        plain_http=dict(type="bool", default=False),
     )
 
 
@@ -169,7 +160,6 @@ def login(
     key_file,
     cert_file,
     ca_file,
-    plain_http,
 ):
     login_command = command + " registry login " + host
 
@@ -187,8 +177,6 @@ def login(
 
     if ca_file is not None:
         login_command += " --ca-file=" + ca_file
-    if plain_http:
-        login_command += " --plain-http"
 
     return login_command
 
@@ -206,8 +194,8 @@ def main():
         supports_check_mode=True,
     )
 
-    # Validate Helm version >=3.8.0
-    module.validate_helm_version(version="3.8.0")
+    # Validate Helm version >=3.0.0,<4.0.0
+    module.validate_helm_version()
 
     changed = False
 
@@ -219,19 +207,6 @@ def main():
     key_file = module.params.get("key_file")
     cert_file = module.params.get("cert_file")
     ca_file = module.params.get("ca_file")
-    plain_http = module.params.get("plain_http")
-
-    helm_version = module.get_helm_version()
-
-    if plain_http:
-        if LooseVersion(helm_version) < LooseVersion("3.18.0"):
-            module.warn(
-                "plain_http option requires helm >= 3.18.0, current version is {0}".format(
-                    helm_version
-                )
-            )
-            # reset option
-            plain_http = False
 
     helm_cmd = module.get_helm_binary()
 
@@ -240,15 +215,7 @@ def main():
         changed = True
     elif state == "present":
         helm_cmd = login(
-            helm_cmd,
-            host,
-            insecure,
-            username,
-            password,
-            key_file,
-            cert_file,
-            ca_file,
-            plain_http,
+            helm_cmd, host, insecure, username, password, key_file, cert_file, ca_file
         )
         changed = True
 
@@ -271,6 +238,7 @@ def main():
                 command=helm_cmd,
             )
 
+    helm_version = module.get_helm_version()
     if LooseVersion(helm_version) >= LooseVersion("3.18.0") and state == "absent":
         # https://github.com/ansible-collections/kubernetes.core/issues/944
         module.warn(

plugins/modules/helm_repository.py

@@ -20,7 +20,7 @@ author:
   - Lucas Boisserie (@LucasBoisserie)
 
 requirements:
-  - "helm >= 3.0.0 (https://github.com/helm/helm/releases)"
+  - "helm (https://github.com/helm/helm/releases)"
   - "yaml (https://pypi.org/project/PyYAML/)"
 
 description:
@@ -295,7 +295,7 @@ def main():
     if not IMP_YAML:
         module.fail_json(msg=missing_required_lib("yaml"), exception=IMP_YAML_ERR)
 
-    # Validate Helm version >= 3.0.0
+    # Validate Helm version >=3.0.0,<4.0.0
     module.validate_helm_version()
 
     changed = False

plugins/modules/helm_template.py

@@ -21,10 +21,6 @@ author:
 description:
   - Render chart templates to an output directory or as text of concatenated yaml documents.
 
-requirements:
-  - "helm >= 3.0.0 (https://github.com/helm/helm/releases)"
-  - "yaml (https://pypi.org/project/PyYAML/)"
-
 options:
   binary_path:
     description:
@@ -151,13 +147,6 @@ options:
           - json
           - file
     version_added: 2.4.0
-  plain_http:
-    description:
-      - Use HTTP instead of HTTPS when working with OCI registries
-      - Requires Helm >= 3.13.0
-    type: bool
-    default: False
-    version_added: 6.1.0
 """
 
 EXAMPLES = r"""
@@ -229,9 +218,6 @@ from ansible.module_utils.basic import missing_required_lib
 from ansible_collections.kubernetes.core.plugins.module_utils.helm import (
     AnsibleHelmModule,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.version import (
-    LooseVersion,
-)
 
 
 def template(
@@ -250,7 +236,6 @@ def template(
     values_files=None,
     include_crds=False,
     set_values=None,
-    plain_http=False,
 ):
     cmd += " template "
 
@@ -277,9 +262,6 @@ def template(
     if insecure_registry:
         cmd += " --insecure-skip-tls-verify"
 
-    if plain_http:
-        cmd += " --plain-http"
-
     if show_only:
         for template in show_only:
             cmd += " -s " + template
@@ -325,7 +307,6 @@ def main():
             values_files=dict(type="list", default=[], elements="str"),
             update_repo_cache=dict(type="bool", default=False),
             set_values=dict(type="list", elements="dict"),
-            plain_http=dict(type="bool", default=False),
         ),
         supports_check_mode=True,
     )
@@ -346,25 +327,15 @@ def main():
     values_files = module.params.get("values_files")
     update_repo_cache = module.params.get("update_repo_cache")
     set_values = module.params.get("set_values")
-    plain_http = module.params.get("plain_http")
 
     if not IMP_YAML:
         module.fail_json(msg=missing_required_lib("yaml"), exception=IMP_YAML_ERR)
 
-    # Validate Helm version >=3.0.0
+    # Validate Helm version >=3.0.0,<4.0.0
     module.validate_helm_version()
 
     helm_cmd = module.get_helm_binary()
 
-    if plain_http:
-        helm_version = module.get_helm_version()
-        if LooseVersion(helm_version) < LooseVersion("3.13.0"):
-            module.fail_json(
-                msg="plain_http requires helm >= 3.13.0, current version is {0}".format(
-                    helm_version
-                )
-            )
-
     if update_repo_cache:
         update_cmd = helm_cmd + " repo update"
         module.run_helm_command(update_cmd)
@@ -389,7 +360,6 @@ def main():
         values_files=values_files,
         include_crds=include_crds,
         set_values=set_values_args,
-        plain_http=plain_http,
     )
 
     if not check_mode:

plugins/modules/k8s_cp.py

@@ -140,7 +140,7 @@ result:
 
 import copy
 
-from ansible.module_utils.common.text.converters import to_native
+from ansible.module_utils._text import to_native
 from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import (
     AnsibleModule,
 )

plugins/modules/k8s_drain.py

@@ -149,7 +149,7 @@ import time
 import traceback
 from datetime import datetime
 
-from ansible.module_utils.common.text.converters import to_native
+from ansible.module_utils._text import to_native
 from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import (
     AnsibleModule,
 )
@@ -230,7 +230,7 @@ def filter_pods(pods, force, ignore_daemonset, delete_emptydir_data):
                 else:
                     to_delete.append((pod.metadata.namespace, pod.metadata.name))
 
-    warnings, errors, info = [], [], []
+    warnings, errors = [], []
     if unmanaged:
         pod_names = ",".join([pod[0] + "/" + pod[1] for pod in unmanaged])
         if not force:
@@ -242,7 +242,7 @@ def filter_pods(pods, force, ignore_daemonset, delete_emptydir_data):
             )
         else:
             # Pod not managed will be deleted as 'force' is true
-            info.append(
+            warnings.append(
                 "Deleting Pods not managed by ReplicationController, ReplicaSet, Job, DaemonSet or StatefulSet: {0}.".format(
                     pod_names
                 )
@@ -264,7 +264,7 @@ def filter_pods(pods, force, ignore_daemonset, delete_emptydir_data):
                 "cannot delete Pods with local storage: {0}.".format(pod_names)
             )
         else:
-            info.append("Deleting Pods with local storage: {0}.".format(pod_names))
+            warnings.append("Deleting Pods with local storage: {0}.".format(pod_names))
             for pod in localStorage:
                 to_delete.append((pod[0], pod[1]))
 
@@ -278,8 +278,8 @@ def filter_pods(pods, force, ignore_daemonset, delete_emptydir_data):
                 )
             )
         else:
-            info.append("Ignoring DaemonSet-managed Pods: {0}.".format(pod_names))
-    return to_delete, warnings, errors, info
+            warnings.append("Ignoring DaemonSet-managed Pods: {0}.".format(pod_names))
+    return to_delete, warnings, errors
 
 
 class K8sDrainAnsible(object):
@@ -334,19 +334,18 @@ class K8sDrainAnsible(object):
     def evict_pods(self, pods):
         for namespace, name in pods:
             try:
-                if not self._module.check_mode:
-                    if self._drain_options.get("disable_eviction"):
-                        self._api_instance.delete_namespaced_pod(
-                            name=name, namespace=namespace, body=self._delete_options
-                        )
-                    else:
-                        body = v1_eviction(
-                            delete_options=self._delete_options,
-                            metadata=V1ObjectMeta(name=name, namespace=namespace),
-                        )
-                        self._api_instance.create_namespaced_pod_eviction(
-                            name=name, namespace=namespace, body=body
-                        )
+                if self._drain_options.get("disable_eviction"):
+                    self._api_instance.delete_namespaced_pod(
+                        name=name, namespace=namespace, body=self._delete_options
+                    )
+                else:
+                    body = v1_eviction(
+                        delete_options=self._delete_options,
+                        metadata=V1ObjectMeta(name=name, namespace=namespace),
+                    )
+                    self._api_instance.create_namespaced_pod_eviction(
+                        name=name, namespace=namespace, body=body
+                    )
                 self._changed = True
             except ApiException as exc:
                 if exc.reason != "Not Found":
@@ -363,7 +362,11 @@ class K8sDrainAnsible(object):
                 )
 
     def list_pods(self):
-        params = {"field_selector": "spec.nodeName=" + self._module.params.get("name")}
+        params = {
+            "field_selector": "spec.nodeName={name}".format(
+                name=self._module.params.get("name")
+            )
+        }
         pod_selectors = self._module.params.get("pod_selectors")
         if pod_selectors:
             params["label_selector"] = ",".join(pod_selectors)
@@ -373,8 +376,7 @@ class K8sDrainAnsible(object):
         # Mark node as unschedulable
         result = []
         if not node_unschedulable:
-            if not self._module.check_mode:
-                self.patch_node(unschedulable=True)
+            self.patch_node(unschedulable=True)
             result.append(
                 "node {0} marked unschedulable.".format(self._module.params.get("name"))
             )
@@ -389,8 +391,7 @@ class K8sDrainAnsible(object):
         def _revert_node_patch():
             if self._changed:
                 self._changed = False
-                if not self._module.check_mode:
-                    self.patch_node(unschedulable=False)
+                self.patch_node(unschedulable=False)
 
         try:
             pod_list = self.list_pods()
@@ -400,7 +401,7 @@ class K8sDrainAnsible(object):
             delete_emptydir_data = self._drain_options.get(
                 "delete_emptydir_data", False
             )
-            pods, warnings, errors, info = filter_pods(
+            pods, warnings, errors = filter_pods(
                 pod_list.items, force, ignore_daemonset, delete_emptydir_data
             )
             if errors:
@@ -430,25 +431,18 @@ class K8sDrainAnsible(object):
         if pods:
             self.evict_pods(pods)
             number_pod = len(pods)
-            if self._module.check_mode:
-                result.append(
-                    "Would have deleted {0} Pod(s) from node if not in check mode.".format(
-                        number_pod
-                    )
+            if self._drain_options.get("wait_timeout") is not None:
+                warn = self.wait_for_pod_deletion(
+                    pods,
+                    self._drain_options.get("wait_timeout"),
+                    self._drain_options.get("wait_sleep"),
                 )
-            else:
-                wait_timeout = self._drain_options.get("wait_timeout")
-                wait_sleep = self._drain_options.get("wait_sleep")
-                if wait_timeout is not None:
-                    warn = self.wait_for_pod_deletion(pods, wait_timeout, wait_sleep)
-                    if warn:
-                        warnings.append(warn)
-                result.append("{0} Pod(s) deleted from node.".format(number_pod))
+                if warn:
+                    warnings.append(warn)
+            result.append("{0} Pod(s) deleted from node.".format(number_pod))
         if warnings:
             for warning in warnings:
                 self._module.warn(warning)
-        for line in info:
-            self._module.debug(line)
         return dict(result=" ".join(result))
 
     def patch_node(self, unschedulable):
@@ -489,8 +483,7 @@ class K8sDrainAnsible(object):
                 self._module.exit_json(
                     result="node {0} already marked unschedulable.".format(name)
                 )
-            if not self._module.check_mode:
-                self.patch_node(unschedulable=True)
+            self.patch_node(unschedulable=True)
             result["result"] = "node {0} marked unschedulable.".format(name)
             self._changed = True
 
@@ -499,8 +492,7 @@ class K8sDrainAnsible(object):
                 self._module.exit_json(
                     result="node {0} already marked schedulable.".format(name)
                 )
-            if not self._module.check_mode:
-                self.patch_node(unschedulable=False)
+            self.patch_node(unschedulable=False)
             result["result"] = "node {0} marked schedulable.".format(name)
             self._changed = True
 
@@ -543,9 +535,7 @@ def argspec():
 
 
 def main():
-    module = AnsibleK8SModule(
-        module_class=AnsibleModule, argument_spec=argspec(), supports_check_mode=True
-    )
+    module = AnsibleK8SModule(module_class=AnsibleModule, argument_spec=argspec())
 
     if not HAS_EVICTION_API:
         module.fail_json(

plugins/modules/k8s_exec.py

@@ -131,7 +131,7 @@ except ImportError:
     # ImportError are managed by the common module already.
     pass
 
-from ansible.module_utils.common.text.converters import to_native
+from ansible.module_utils._text import to_native
 from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import (
     AnsibleModule,
 )

plugins/modules/k8s_json_patch.py

@@ -33,14 +33,6 @@ options:
     aliases:
       - api
       - version
-  hidden_fields:
-    description:
-      - List of fields to hide from the diff output.
-      - This is useful for fields that are not relevant to the patch operation, such as `metadata.managedFields`.
-    type: list
-    elements: str
-    default: []
-    version_added: 6.1.0
   kind:
     description:
       - Use to specify an object model.
@@ -135,8 +127,8 @@ error:
 import copy
 import traceback
 
+from ansible.module_utils._text import to_native
 from ansible.module_utils.basic import missing_required_lib
-from ansible.module_utils.common.text.converters import to_native
 from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import (
     AnsibleModule,
 )
@@ -155,7 +147,6 @@ from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions imp
 )
 from ansible_collections.kubernetes.core.plugins.module_utils.k8s.service import (
     diff_objects,
-    hide_fields,
 )
 from ansible_collections.kubernetes.core.plugins.module_utils.k8s.waiter import (
     get_waiter,
@@ -183,7 +174,6 @@ JSON_PATCH_ARGS = {
     "namespace": {"type": "str"},
     "name": {"type": "str", "required": True},
     "patch": {"type": "list", "required": True, "elements": "dict"},
-    "hidden_fields": {"type": "list", "elements": "str", "default": []},
 }
 
 
@@ -213,7 +203,6 @@ def execute_module(module, client):
     namespace = module.params.get("namespace")
     patch = module.params.get("patch")
 
-    hidden_fields = module.params.get("hidden_fields")
     wait = module.params.get("wait")
     wait_sleep = module.params.get("wait_sleep")
     wait_timeout = module.params.get("wait_timeout")
@@ -271,13 +260,13 @@ def execute_module(module, client):
             module.fail_json(msg=msg, error=to_native(exc), status="", reason="")
 
     success = True
-    result = {"result": hide_fields(obj, hidden_fields)}
+    result = {"result": obj}
     if wait and not module.check_mode:
         waiter = get_waiter(client, resource, condition=wait_condition)
         success, result["result"], result["duration"] = waiter.wait(
             wait_timeout, wait_sleep, name, namespace
         )
-    match, diffs = diff_objects(existing.to_dict(), obj, hidden_fields)
+    match, diffs = diff_objects(existing.to_dict(), obj)
     result["changed"] = not match
     if module._diff:
         result["diff"] = diffs

plugins/modules/k8s_scale.py

@@ -149,7 +149,7 @@ except ImportError:
     # Handled in module setup
     pass
 
-from ansible.module_utils.common.text.converters import to_native
+from ansible.module_utils._text import to_native
 from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import (
     AnsibleModule,
 )

plugins/modules/k8s_taint.py

@@ -126,7 +126,7 @@ result:
 
 import copy
 
-from ansible.module_utils.common.text.converters import to_native
+from ansible.module_utils._text import to_native
 from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import (
     AnsibleModule,
 )

plugins/modules/kubeconfig.py

@@ -1,441 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-DOCUMENTATION = r"""
----
-module: kubeconfig
-
-short_description: Generate, update, and optionally write Kubernetes kubeconfig files
-
-version_added: "6.5.0"
-
-author: "Youssef Khalid Ali (@YoussefKhalidAli)"
-
-description:
-  - Build, update, and manage Kubernetes kubeconfig files using structured input.
-  - Supports loading an existing kubeconfig file and merging clusters, users, and contexts.
-  - Can optionally write the resulting kubeconfig to a destination path.
-  - Ensures idempotent behavior by only updating files when changes occur.
-
-requirements:
-  - "PyYAML >= 5.1"
-
-notes:
-  - Input data is merged by resource name (cluster, user, context).
-  - Updates under O(clusters), O(users), and O(contexts) are matched by C(name) against the kubeconfig loaded from O(path).
-  - For an existing C(name), each entry's C(behavior) suboption controls the update.
-  - The default is V(merge), which merges nested C(cluster), C(user), and C(context) data so unspecified keys are preserved.
-  - With V(replace), the previous entry for that name is dropped and only the new definition is used.
-  - With V(keep), the existing entry is left unchanged.
-  - This can be used to move kubeconfig files to a different location with different content.
-  - This module does not validate cluster connectivity or authentication.
-  - The module supports C(check_mode) and will not write files when enabled.
-  - The structure follows standard Kubernetes kubeconfig format as defined in the Kubernetes documentation.
-  - Tokens and sensitive data should be protected using ansible-vault or environment variables.
-
-options:
-  path:
-    description:
-      - Path to an existing kubeconfig file to load and merge from.
-      - If the file does not exist, a new kubeconfig will be created.
-      - This becomes the default destination if O(dest) is not specified.
-    type: str
-    required: true
-
-  dest:
-    description:
-      - Destination path where the final kubeconfig should be written.
-      - If not specified, the kubeconfig will be saved to O(path).
-      - Allows copying and modifying a kubeconfig to a new location.
-    type: str
-    required: false
-
-  clusters:
-    description:
-      - List of cluster definitions to merge into the kubeconfig.
-      - Each cluster is identified by its C(name).
-      - When C(name) matches an existing cluster, the default C(behavior) is V(merge).
-      - See the C(behavior) suboption for V(replace) and V(keep).
-    type: list
-    elements: dict
-    required: false
-    default: []
-    suboptions:
-      name:
-        description:
-          - Unique name identifier for the cluster.
-        type: str
-        required: true
-      behavior:
-        description:
-          - How to handle merging if a cluster with this name already exists.
-          - C(merge) - Update only the specified fields, preserve others (default).
-          - C(replace) - Replace the entire cluster definition.
-          - C(keep) - Keep existing cluster, skip this entry.
-        type: str
-        choices: ['merge', 'replace', 'keep']
-        default: merge
-      cluster:
-        description:
-          - Cluster configuration details.
-        type: dict
-        required: true
-        suboptions:
-          server:
-            description:
-              - Kubernetes API server URL (e.g., C(https://k8s.example.com:6443)).
-            type: str
-            required: true
-          certificate-authority:
-            description:
-              - Path to a CA certificate file for validating the API server certificate.
-            type: str
-          certificate-authority-data:
-            description:
-              - Base64 encoded CA certificate data.
-              - Use this instead of C(certificate-authority) for embedded certificates.
-            type: str
-          insecure-skip-tls-verify:
-            description:
-              - If true, the server's certificate will not be validated.
-            type: bool
-          proxy-url:
-            description:
-              - Optional proxy URL for cluster connections.
-            type: str
-          tls-server-name:
-            description:
-              - Server name to use for server certificate validation.
-            type: str
-
-  users:
-    description:
-      - List of user authentication configurations.
-      - Each user is identified by its C(name).
-      - When C(name) matches an existing user, the default C(behavior) is V(merge).
-      - See the C(behavior) suboption for V(replace) and V(keep).
-    type: list
-    elements: dict
-    required: false
-    default: []
-    suboptions:
-      name:
-        description:
-          - Unique name identifier for the user.
-        type: str
-        required: true
-      behavior:
-        description:
-          - How to handle merging if a user with this name already exists.
-          - C(merge) - Update only the specified fields, preserve others (default).
-          - C(replace) - Replace the entire user definition.
-          - C(keep) - Keep existing user, skip this entry.
-        type: str
-        choices: ['merge', 'replace', 'keep']
-        default: merge
-      user:
-        description:
-          - User authentication configuration.
-        type: dict
-        required: true
-        suboptions:
-          token:
-            description:
-              - Bearer token for authentication.
-            type: str
-          username:
-            description:
-              - Username for basic authentication.
-            type: str
-          password:
-            description:
-              - Password for basic authentication.
-            type: str
-          client-certificate:
-            description:
-              - Path to client certificate file.
-              - Used for certificate-based authentication.
-            type: str
-          client-key:
-            description:
-              - Path to client private key file.
-              - Must be provided with C(client-certificate).
-            type: str
-          client-certificate-data:
-            description:
-              - Base64 encoded client certificate.
-              - Use instead of C(client-certificate) for embedded certificates.
-            type: str
-          client-key-data:
-            description:
-              - Base64 encoded client private key.
-              - Use instead of C(client-key) for embedded keys.
-            type: str
-          auth-provider:
-            description:
-              - Authentication provider configuration (e.g., for GCP, Azure).
-            type: dict
-          exec:
-            description:
-              - Exec-based credential plugin configuration.
-              - Used for external authentication providers.
-            type: dict
-
-  contexts:
-    description:
-      - List of context definitions linking users and clusters.
-      - Each context is identified by its C(name).
-      - When C(name) matches an existing context, the default C(behavior) is V(merge).
-      - See the C(behavior) suboption for V(replace) and V(keep).
-    type: list
-    elements: dict
-    required: false
-    default: []
-    suboptions:
-      name:
-        description:
-          - Unique name identifier for the context.
-        type: str
-        required: true
-      behavior:
-        description:
-          - How to handle merging if a context with this name already exists.
-          - C(merge) - Update only the specified fields, preserve others (default).
-          - C(replace) - Replace the entire context definition.
-          - C(keep) - Keep existing context, skip this entry.
-        type: str
-        choices: ['merge', 'replace', 'keep']
-        default: merge
-      context:
-        description:
-          - Context configuration linking cluster and user.
-        type: dict
-        required: true
-        suboptions:
-          cluster:
-            description:
-              - Name of the cluster to use (must match a cluster name in O(clusters)).
-            type: str
-            required: true
-          user:
-            description:
-              - Name of the user to authenticate as (must match a user name in O(users)).
-            type: str
-            required: true
-          namespace:
-            description:
-              - Default namespace to use for this context.
-              - If not specified, defaults to C(default).
-            type: str
-
-  preferences:
-    description:
-      - Kubeconfig preferences.
-      - Used for client-side settings like color output, default editor, etc.
-    type: dict
-    required: false
-    default: {}
-
-  current_context:
-    description:
-      - Name of the context to set as current/active.
-      - This context will be used by default when using kubectl.
-      - Must match one of the context names defined in O(contexts).
-    type: str
-    required: false
-
-seealso:
-  - name: Kubernetes kubeconfig documentation
-    description: Official Kubernetes documentation for kubeconfig files
-    link: https://kubernetes.io/docs/concepts/configuration/organize-cluster-access-kubeconfig/
-  - name: kubectl config documentation
-    description: kubectl commands for working with kubeconfig files
-    link: https://kubernetes.io/docs/reference/kubectl/generated/kubectl_config/
-"""
-
-EXAMPLES = r"""
-# Create a new kubeconfig file with a single cluster
-- name: Create basic kubeconfig
-  kubernetes.core.kubeconfig:
-    path: /home/user/.kube/config
-    clusters:
-      - name: production-cluster
-        cluster:
-          server: https://prod.k8s.example.com:6443
-          certificate-authority-data: LS0tLS1CRUdJTi...
-    users:
-      - name: admin-user
-        user:
-          token: eyJhbGciOiJSUzI1NiIsImtpZCI6IiJ9...
-    contexts:
-      - name: prod-admin
-        context:
-          cluster: production-cluster
-          user: admin-user
-          namespace: production
-    current_context: prod-admin
-
-- name: Copy and modify kubeconfig
-  kubernetes.core.kubeconfig:
-    path: /home/user/.kube/config
-    dest: /home/user/.kube/config-backup
-    clusters:
-      - name: new-cluster
-        cluster:
-          server: https://new.example.com:6443
-
-- name: Switch current context
-  kubernetes.core.kubeconfig:
-    path: ~/.kube/config
-    current_context: prod-context
-
-- name: Update user credentials
-  kubernetes.core.kubeconfig:
-    path: ~/.kube/config
-    users:
-      - name: admin-user
-        user:
-          token: "{{ new_admin_token }}"
-"""
-
-RETURN = r"""
-kubeconfig:
-  description: The complete kubeconfig data structure.
-  type: dict
-  returned: always
-
-dest:
-  description: The path where the kubeconfig was written.
-  type: str
-  returned: always
-  sample: /home/user/.kube/config
-"""
-import os
-import traceback
-
-from ansible.module_utils.basic import AnsibleModule, missing_required_lib
-from ansible.module_utils.common.text.converters import to_native
-from ansible_collections.kubernetes.core.plugins.module_utils.args_common import (
-    extract_sensitive_values_from_kubeconfig,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.kubeconfig import (
-    hash_data,
-    load_yaml_file,
-    merge_by_name,
-    write_file,
-)
-
-try:
-    import yaml
-
-    IMP_YAML = True
-    IMP_YAML_ERR = None
-except ImportError:
-    IMP_YAML = False
-    IMP_YAML_ERR = traceback.format_exc()
-
-
-def run_module():
-    module_args = dict(
-        path=dict(type="str", required=True),
-        dest=dict(type="str", required=False),
-        clusters=dict(type="list", elements="dict", required=False, default=[]),
-        users=dict(type="list", elements="dict", required=False, default=[]),
-        contexts=dict(type="list", elements="dict", required=False, default=[]),
-        preferences=dict(type="dict", required=False, default={}),
-        current_context=dict(type="str", required=False),
-    )
-
-    module = AnsibleModule(argument_spec=module_args, supports_check_mode=True)
-
-    path = module.params["path"]
-    dest = module.params["dest"] or path
-
-    clusters_input = module.params["clusters"]
-    users_input = module.params["users"]
-    contexts_input = module.params["contexts"]
-
-    preferences = module.params["preferences"]
-    current_context = module.params["current_context"]
-
-    # Load existing kubeconfig
-    try:
-        if not IMP_YAML:
-            module.fail_json(
-                msg=missing_required_lib("pyyaml"),
-                exception=IMP_YAML_ERR,
-            )
-        existing = load_yaml_file(path) if path else {}
-    except Exception as e:
-        module.fail_json(
-            msg="Failed to load existing kubeconfig: %s" % to_native(e),
-            exception=traceback.format_exc(),
-        )
-
-    clusters = merge_by_name(existing.get("clusters", []), clusters_input)
-    users = merge_by_name(existing.get("users", []), users_input)
-    contexts = merge_by_name(existing.get("contexts", []), contexts_input)
-
-    # Build final kubeconfig
-    kubeconfig = {
-        "apiVersion": "v1",
-        "kind": "Config",
-        "preferences": preferences or existing.get("preferences", {}),
-        "clusters": clusters,
-        "users": users,
-        "contexts": contexts,
-        "current-context": current_context or existing.get("current-context") or "",
-    }
-
-    changed = False
-    old_data = {}
-
-    if os.path.exists(dest):
-        try:
-            with open(dest, "r") as f:
-                old_data = yaml.safe_load(f) or {}
-        except Exception as e:
-            module.fail_json(
-                msg="Failed to read destination file: %s" % to_native(e),
-                exception=traceback.format_exc(),
-            )
-
-    old_hash = hash_data(old_data)
-    new_hash = hash_data(kubeconfig)
-
-    if old_hash != new_hash:
-        if not module.check_mode:
-            try:
-                write_file(dest, kubeconfig)
-            except Exception as e:
-                module.fail_json(
-                    msg="Failed to write kubeconfig: %s" % to_native(e),
-                    exception=traceback.format_exc(),
-                )
-        changed = True
-
-    if isinstance(kubeconfig, dict):
-        module.no_log_values.update(
-            extract_sensitive_values_from_kubeconfig(kubeconfig)
-        )
-
-    module.exit_json(
-        changed=changed,
-        kubeconfig=kubeconfig,
-        dest=dest,
-        msg=(
-            "Kubeconfig file has been updated."
-            if changed
-            else "Kubeconfig file is already up to date."
-        ),
-    )
-
-
-def main():
-    run_module()
-
-
-if __name__ == "__main__":
-    main()

tests/integration/targets/helm/aliases

@@ -1 +1,4 @@
-disabled # used by test targets helm_vX_XX_XX
+time=100
+helm_info
+helm_repository
+helm_template

tests/integration/targets/helm/defaults/main.yml

@@ -9,25 +9,23 @@ chart_test_version: 4.2.4
 chart_test_version_local_path: 1.32.0
 chart_test_version_upgrade: 4.2.5
 chart_test_version_upgrade_local_path: 1.33.0
-chart_test_repo: "https://stenic.github.io/k8status/"
+chart_test_repo: "https://kubernetes.github.io/ingress-nginx"
 chart_test_git_repo: "http://github.com/helm/charts.git"
 chart_test_values:
   revisionHistoryLimit: 0
   myValue: "changed"
 
 test_namespace:
-  - "helm-test-crds-{{ helm_version | replace('.', '-') }}"
-  - "helm-uninstall-{{ helm_version | replace('.', '-') }}"
-  - "helm-read-envvars-{{ helm_version | replace('.', '-') }}"
-  - "helm-dep-update-{{ helm_version | replace('.', '-') }}"
-  - "helm-local-path-001-{{ helm_version | replace('.', '-') }}"
-  - "helm-local-path-002-{{ helm_version | replace('.', '-') }}"
-  - "helm-local-path-003-{{ helm_version | replace('.', '-') }}"
-  - "helm-from-repository-{{ helm_version | replace('.', '-') }}"
-  - "helm-from-url-{{ helm_version | replace('.', '-') }}"
-  - "helm-reuse-values-{{ helm_version | replace('.', '-') }}"
-  - "helm-chart-with-space-into-name-{{ helm_version | replace('.', '-') }}"
-  - "helm-reset-then-reuse-values-{{ helm_version | replace('.', '-') }}"
-  - "helm-insecure-{{ helm_version | replace('.', '-') }}"
-  - "helm-test-take-ownership-{{ helm_version | replace('.', '-') }}"
-  - "helm-skip-schema-validation-{{ helm_version | replace('.', '-') }}"
+  - "helm-test-crds"
+  - "helm-uninstall"
+  - "helm-read-envvars"
+  - "helm-dep-update"
+  - "helm-local-path-001"
+  - "helm-local-path-002"
+  - "helm-local-path-003"
+  - "helm-from-repository"
+  - "helm-from-url"
+  - "helm-reuse-values"
+  - "helm-chart-with-space-into-name"
+  - "helm-reset-then-reuse-values"
+  - "helm-insecure"

tests/integration/targets/helm/library/helm_test_pending.py

@@ -52,9 +52,7 @@ import json
 import subprocess
 import time
 
-from ansible_collections.kubernetes.core.plugins.module_utils.helm import (
-    AnsibleHelmModule,
-)
+from ansible.module_utils.basic import AnsibleModule
 
 
 class HelmReleaseNotFoundError(Exception):
@@ -62,9 +60,7 @@ class HelmReleaseNotFoundError(Exception):
         super().__init__(message)
 
 
-def create_pending_install_release(
-    module, helm_binary, chart_ref, chart_release, namespace
-):
+def create_pending_install_release(helm_binary, chart_ref, chart_release, namespace):
     # create pending-install release
     command = [
         helm_binary,
@@ -82,14 +78,13 @@ def create_pending_install_release(
     command = [
         helm_binary,
         "list",
+        "--all",
         "--output=json",
         "--namespace",
         namespace,
         "--filter",
         chart_release,
     ]
-    if not module.is_helm_v4():
-        command.append("--all")
     cmd = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     out, err = cmd.communicate()
 
@@ -97,11 +92,11 @@ def create_pending_install_release(
     if not data:
         error = "Release %s not found." % chart_release
         raise HelmReleaseNotFoundError(message=error)
-    return data[0]["status"] in ("pending-install", "failed"), data[0]["status"]
+    return data[0]["status"] == "pending-install", data[0]["status"]
 
 
 def main():
-    module = AnsibleHelmModule(
+    module = AnsibleModule(
         argument_spec=dict(
             binary_path=dict(type="path", required=True),
             chart_ref=dict(type="str", required=True),
@@ -111,7 +106,6 @@ def main():
     )
 
     params = dict(
-        module=module,
         helm_binary=module.params.get("binary_path"),
         chart_release=module.params.get("chart_release"),
         chart_ref=module.params.get("chart_ref"),
@@ -122,7 +116,7 @@ def main():
         result, status = create_pending_install_release(**params)
         if not result:
             module.fail_json(
-                msg="unable to create pending-install/failed release, current status is %s"
+                msg="unable to create pending-install release, current status is %s"
                 % status
             )
         module.exit_json(changed=True, msg="Release created with status '%s'" % status)

tests/integration/targets/helm/meta/main.yml

@@ -1,3 +1,5 @@
 ---
 collections:
   - kubernetes.core
+dependencies:
+  - remove_namespace

tests/integration/targets/helm/playbook.yaml

@@ -0,0 +1,7 @@
+---
+- connection: local
+  gather_facts: true
+  hosts: localhost
+
+  roles:
+  - helm

tests/integration/targets/helm/tasks/install.yml

@@ -0,0 +1,15 @@
+---
+- name: Init Helm folders
+  file:
+    path: /tmp/helm/
+    state: directory
+
+- name: Unarchive Helm binary
+  unarchive:
+    src: 'https://get.helm.sh/{{ helm_archive_name | default(helm_default_archive_name) }}'
+    dest: /tmp/helm/
+    remote_src: yes
+  retries: 10
+  delay: 5
+  register: result
+  until: result is not failed

tests/integration/targets/helm/tasks/main.yml

@@ -1,22 +1,10 @@
 ---
-- name: Ensure helm is not installed
-  file:
-    path: "{{ item }}"
-    state: absent
-  with_items:
-    - "/tmp/helm"
-
-- name: Check failed if helm is not installed
-  include_tasks: test_helm_not_installed.yml
-
-- name: Install Helm v4
-  ansible.builtin.include_role:
-    name: install_helm
-  vars:
-    helm_version: v3.6.0
-
-- name: Test helm uninstall
-  ansible.builtin.include_tasks: test_helm_uninstall.yml
-
 - name: Run tests
   include_tasks: run_test.yml
+  loop_control:
+    loop_var: helm_version
+  with_items:
+    - "v3.15.4"
+    - "v3.16.0"
+    - "v3.17.0"
+    - "v4.0.0"

tests/integration/targets/helm/tasks/run_test.yml

@@ -1,19 +1,25 @@
 ---
+- name: Ensure helm is not installed
+  file:
+    path: "{{ item }}"
+    state: absent
+  with_items:
+    - "/tmp/helm"
+
+- name: Check failed if helm is not installed
+  include_tasks: test_helm_not_installed.yml
+
 - name: "Install {{ helm_version }}"
   include_role:
     name: install_helm
 
-- name: Main helm tests
+- name: Main helm tests with Helm v3
+  when: helm_version != "v4.0.0"
   block:
-    - name: Install helm-diff plugin
-      helm_plugin:
-        binary_path: "{{ helm_binary }}"
-        plugin_path: https://github.com/databus23/helm-diff
-        plugin_version: "{{ helm_version is version('v4.0.0', '>=') | ternary('v3.14.0', 'v3.10.0') }}"
-        verify: false
 
     - name: "Ensure we honor the environment variables"
       include_tasks: test_read_envvars.yml
+      when: helm_version != "v4.0.0"
 
     - name: Deploy charts
       include_tasks: "tests_chart/{{ test_chart_type }}.yml"
@@ -33,6 +39,9 @@
     - name: test helm dependency update
       include_tasks: test_up_dep.yml
 
+    - name: Test helm uninstall
+      include_tasks: test_helm_uninstall.yml
+
     - name: Test helm install with chart name containing space
       include_tasks: test_helm_with_space_into_chart_name.yml
 
@@ -43,21 +52,12 @@
     - name: Test insecure registry flag feature
       include_tasks: test_helm_insecure.yml
 
-    - name: Test take ownership flag feature
-      include_tasks: test_helm_take_ownership.yml
+- name: Test helm version
+  include_tasks: test_helm_version.yml
 
-    - name: Test helm skip_schema_validation
-      include_tasks: test_skip_schema_validation.yml
-
-  always:
-    - name: Remove helm-diff plugin
-      helm_plugin:
-        binary_path: "{{ helm_binary }}"
-        plugin_name: diff
-        state: absent
-      ignore_errors: true
-
-    - name: Clean helm install
-      ansible.builtin.file:
-        path: "/tmp/helm/"
-        state: absent
+- name: Clean helm install
+  file:
+    path: "{{ item }}"
+    state: absent
+  with_items:
+    - "/tmp/helm/"

tests/integration/targets/helm/tasks/test_helm_not_installed.yml

@@ -5,7 +5,7 @@
     name: test
     chart_ref: "{{ chart_test }}"
     namespace: "helm-test"
-  ignore_errors: true
+  ignore_errors: yes
   register: helm_missing_binary
 
 - name: Assert that helm is not installed

tests/integration/targets/helm/tasks/test_helm_reset_then_reuse_values.yml

@@ -38,28 +38,6 @@
           - '"--reset-then-reuse-values" not in install.command'
           - release_value["status"]["release_values"] == chart_release_values
 
-    # We need to provide the actual redis password otherwise the update command
-    # will fail with the following:
-    # Error: execution error at (redis/templates/replicas/application.yaml:55:35):
-    # PASSWORDS ERROR: You must provide your current passwords when upgrading the release.
-    #              Note that even after reinstallation, old credentials may be needed as they may be kept in persistent volume claims.
-    #              Further information can be obtained at https://docs.bitnami.com/general/how-to/troubleshoot-helm-chart-issues/#credential-errors-while-upgrading-chart-releases
-    # 'global.redis.password' must not be empty, please add '--set global.redis.password=$REDIS_PASSWORD' to the command. To get the current value:
-    - name: Retrieve release password
-      kubernetes.core.k8s_info:
-        namespace: "{{ helm_namespace }}"
-        kind: Secret
-        name: test-redis
-      register: redis_secret
-
-    - ansible.builtin.set_fact:
-        chart_reset_then_reuse_values: "{{ chart_reset_then_reuse_values | combine(redis_global_password) }}"
-      vars:
-        redis_global_password:
-          global:
-            redis:
-              password: "{{ redis_secret.resources.0.data['redis-password'] | b64decode }}"
-
     - name: Upgrade chart using reset_then_reuse_values=true
       helm:
         binary_path: "{{ helm_binary }}"
@@ -95,4 +73,3 @@
         kind: Namespace
         name: "{{ helm_namespace }}"
         state: absent
-        wait: false

tests/integration/targets/helm/tasks/test_helm_reuse_values.yml

@@ -38,21 +38,6 @@
           - '"--reuse-values=True" not in install.command'
           - release_value["status"]["release_values"] == chart_release_values
 
-    - name: Retrieve release password
-      kubernetes.core.k8s_info:
-        namespace: "{{ helm_namespace }}"
-        kind: Secret
-        name: test-redis
-      register: redis_secret
-
-    - ansible.builtin.set_fact:
-        chart_reuse_values: "{{ chart_reuse_values | combine(redis_global_password) }}"
-      vars:
-        redis_global_password:
-          global:
-            redis:
-              password: "{{ redis_secret.resources.0.data['redis-password'] | b64decode }}"
-
     - name: Upgrade chart using reuse_values=true
       helm:
         binary_path: "{{ helm_binary }}"

tests/integration/targets/helm/tasks/test_helm_take_ownership.yml

@@ -1,101 +0,0 @@
----
-- name: Test helm take ownership
-  vars:
-    helm_namespace: "{{ test_namespace[13] }}"
-  block:
-
-    - name: Initial chart installation (no flag set)
-      helm:
-        binary_path: "{{ helm_binary }}"
-        chart_ref: "{{ chart_test_oci }}"
-        release_name: test-take-ownership
-        release_namespace: "{{ helm_namespace }}"
-        create_namespace: true
-      register: install
-
-    - name: Validate that take-ownership flag is not set
-      assert:
-        that:
-          - install is changed
-          - '"--take-ownership" not in install.command'
-
-    # We need to provide the actual redis password otherwise the update command
-    # will fail with the following:
-    # Error: execution error at (redis/templates/replicas/application.yaml:55:35):
-    # PASSWORDS ERROR: You must provide your current passwords when upgrading the release.
-    #              Note that even after reinstallation, old credentials may be needed as they may be kept in persistent volume claims.
-    #              Further information can be obtained at https://docs.bitnami.com/general/how-to/troubleshoot-helm-chart-issues/#credential-errors-while-upgrading-chart-releases
-    # 'global.redis.password' must not be empty, please add '--set global.redis.password=$REDIS_PASSWORD' to the command. To get the current value:
-    - name: Retrieve release password
-      kubernetes.core.k8s_info:
-        namespace: "{{ helm_namespace }}"
-        kind: Secret
-        name: test-take-ownership-redis
-      register: redis_secret
-
-    - name: Upgrade chart (take-onwership flag set)
-      helm:
-        binary_path: "{{ helm_binary }}"
-        chart_ref: "{{ chart_test_oci }}"
-        release_name: test-take-ownership
-        release_namespace: "{{ helm_namespace }}"
-        take_ownership: true
-        values:
-          commonLabels:
-            take-onwership: "set"
-          global:
-            redis:
-              password: "{{ redis_secret.resources.0.data['redis-password'] | b64decode }}"
-      register: upgrade
-      ignore_errors: true
-
-    - name: Validate that take-ownership flag IS set if helm version is >= 3.17.0
-      assert:
-        that:
-          - upgrade is changed
-          - '"--take-ownership" in upgrade.command'
-      when: '"v3.17.0" <= helm_version'
-
-    - name: Validate that feature fails for helm < 3.17.0
-      assert:
-        that:
-          - upgrade is failed
-          - '"take_ownership requires helm >= 3.17.0" in upgrade.msg'
-      when: 'helm_version < "v3.17.0"'
-
-    - name: Upgrade chart (take-onwership flag not set)
-      helm:
-        binary_path: "{{ helm_binary }}"
-        chart_ref: "{{ chart_test_oci }}"
-        release_name: test-take-ownership
-        release_namespace: "{{ helm_namespace }}"
-        values:
-          commonLabels:
-            take-onwership: "not-set"
-          global:
-            redis:
-              password: "{{ redis_secret.resources.0.data['redis-password'] | b64decode }}"
-      register: upgrade
-      ignore_errors: true
-
-    - name: Validate that take-ownership flag IS set if helm version is >= 3.17.0
-      assert:
-        that:
-          - upgrade is changed
-          - '"--take-ownership" not in upgrade.command'
-      when: '"v3.17.0" <= helm_version'
-
-    - name: Validate that feature fails for helm < 3.17.0
-      assert:
-        that:
-          - upgrade is changed
-          - upgrade.msg is not defined
-      when: 'helm_version < "v3.17.0"'
-
-  always:
-    - name: Remove helm namespace
-      k8s:
-        api_version: v1
-        kind: Namespace
-        name: "{{ helm_namespace }}"
-        state: absent

tests/integration/targets/helm/tasks/test_helm_uninstall.yml

@@ -31,18 +31,26 @@
   - name: assert warning has been raised
     assert:
       that:
-      - uninstall.warnings is defined
-      - '"helm uninstall support option --wait for helm release >= 3.7.0" in uninstall.warnings'
+      - uninstall.warnings
 
-  - name: Install Helm v4
-    ansible.builtin.include_role:
-      name: install_helm
-    vars:
-      helm_version: v4.0.0
+  - name: Create temp directory
+    tempfile:
+      state: directory
+      suffix: .test
+    register: _result
+
+  - set_fact:
+      helm_tmp_dir: "{{ _result.path }}"
+
+  - name: Unarchive Helm binary
+    unarchive:
+      src: 'https://get.helm.sh/helm-v3.7.0-linux-amd64.tar.gz'
+      dest: "{{ helm_tmp_dir }}"
+      remote_src: yes
 
   - name: Install chart
     helm:
-      binary_path: "{{ helm_binary }}"
+      binary_path: "{{ helm_tmp_dir }}/linux-amd64/helm"
       name: "{{ chart_name }}"
       chart_ref: "{{ chart_source }}"
       namespace: "{{ helm_namespace }}"
@@ -51,7 +59,7 @@
   - name: uninstall chart again using recent version
     helm:
       state: absent
-      binary_path: "{{ helm_binary }}"
+      binary_path: "{{ helm_tmp_dir }}/linux-amd64/helm"
       name: "{{ chart_name }}"
       namespace: "{{ helm_namespace }}"
       wait: yes
@@ -88,6 +96,12 @@
       - _info.status is undefined
 
   always:
+  - name: Delete temp directory
+    file:
+      path: "{{ helm_tmp_dir }}"
+      state: absent
+    ignore_errors: true
+
   - name: Remove namespace
     k8s:
       kind: Namespace

tests/integration/targets/helm/tasks/test_helm_version.yml

@@ -1,15 +1,20 @@
 ---
-- name: Test helm skip_schema_validation
+- name: Test helm reuse_values
   vars:
-    helm_namespace: "{{ test_namespace[14] }}"
+    helm_namespace: "{{ test_namespace[12] }}"
     chart_release_values:
       replica:
         replicaCount: 3
       master:
         count: 1
         kind: Deployment
+    chart_reuse_values:
+      replica:
+        replicaCount: 1
+      master:
+        count: 3
   block:
-    - name: Chart installation
+    - name: Initial chart installation
       helm:
         binary_path: "{{ helm_binary }}"
         chart_ref: oci://registry-1.docker.io/bitnamicharts/redis
@@ -17,27 +22,21 @@
         release_namespace: "{{ helm_namespace }}"
         create_namespace: true
         release_values: "{{ chart_release_values }}"
-        skip_schema_validation: true
       register: install
       ignore_errors: true
+      when: helm_version == "v4.0.0"
 
     - name: Debug install result
       debug:
         var: install
+      when: helm_version == "v4.0.0"
 
-    - name: Validate skip_schema_validation with helm >= 3.16.0 works
-      assert:
-        that:
-          - install is changed
-          - "'--skip-schema-validation' in install.command"
-      when: "helm_version is ansible.builtin.version('v3.16.0', '>=')"
-
-    - name: Validate skip_schema_validation with helm < 3.16.0 fails
+    - name: Ensure helm installation was failed for v4.0.0
       assert:
         that:
           - install is failed
-          - "'skip_schema_validation requires helm >= 3.16.0' in install.msg"
-      when: "helm_version is ansible.builtin.version('v3.16.0', '<')"
+          - "'Helm version must be >=3.0.0,<4.0.0' in install.msg"
+      when: helm_version == "v4.0.0"
 
   always:
     - name: Remove helm namespace

tests/integration/targets/helm/tasks/tests_chart.yml

@@ -30,9 +30,9 @@
         binary_path: "{{ helm_binary }}"
         name: "{{ chart_release_name }}"
         chart_ref: "{{ chart_source }}"
-        chart_version: "{{ chart_test_version }}"
+        chart_version: "{{ chart_source_version | default(omit) }}"
         namespace: "{{ helm_namespace }}"
-      ignore_errors: true
+      ignore_errors: yes
       register: install_fail
 
     - name: "Assert that Install fail {{ chart_test }} from {{ source }}"
@@ -46,7 +46,7 @@
         binary_path: "{{ helm_binary }}"
         name: "{{ chart_release_name }}"
         chart_ref: "{{ chart_source }}"
-        chart_version: "{{ chart_test_version }}"
+        chart_version: "{{ chart_source_version | default(omit) }}"
         namespace: "{{ helm_namespace }}"
         create_namespace: true
       register: install_check_mode
@@ -64,18 +64,17 @@
         binary_path: "{{ helm_binary }}"
         name: "{{ chart_release_name }}"
         chart_ref: "{{ chart_source }}"
-        chart_version: "{{ chart_test_version }}"
+        chart_version: "{{ chart_source_version | default(omit) }}"
         namespace: "{{ helm_namespace }}"
         create_namespace: true
       register: install
 
-    - name: "Assert that {{ chart_test }} chart version {{ chart_test_version }} is installed from {{ source }}"
+    - name: "Assert that {{ chart_test }} chart is installed from {{ source }}"
       assert:
         that:
           - install is changed
           - install.status.chart == chart_test+"-"+chart_test_version
           - install.status.status | lower == 'deployed'
-          - install.status.release_values == {}
 
     - name: Check helm_info content
       helm_info:
@@ -93,7 +92,7 @@
           - deployed
       register: release_state_content_info
 
-    - name: "Assert that {{ chart_test }} chart version {{ chart_test_version }} is installed from {{ source }} with helm_info"
+    - name: "Assert that {{ chart_test }} is installed from {{ source }} with helm_info"
       assert:
         that:
           - content_info.status.chart == chart_test+"-"+chart_test_version
@@ -105,10 +104,9 @@
         binary_path: "{{ helm_binary }}"
         name: "{{ chart_release_name }}"
         chart_ref: "{{ chart_source }}"
-        chart_version: "{{ chart_test_version }}"
+        chart_version: "{{ chart_source_version | default(omit) }}"
         namespace: "{{ helm_namespace }}"
       register: install
-      diff: true
 
     - name: Assert idempotency
       assert:
@@ -122,7 +120,7 @@
         binary_path: "{{ helm_binary }}"
         name: "{{ chart_release_name }}"
         chart_ref: "{{ chart_source }}"
-        chart_version: "{{ chart_test_version }}"
+        chart_version: "{{ chart_source_version | default(omit) }}"
         namespace: "{{ helm_namespace }}"
         values: "{{ chart_test_values }}"
       register: install
@@ -133,18 +131,17 @@
           - install is changed
           - install.status.status | lower == 'deployed'
           - install.status.chart == chart_test+"-"+chart_test_version
-          - install.status['release_values'] == chart_test_values
+          - "install.status['release_values'].revisionHistoryLimit == 0"
 
     - name: Check idempotency after adding vars
       helm:
         binary_path: "{{ helm_binary }}"
         name: "{{ chart_release_name }}"
         chart_ref: "{{ chart_source }}"
-        chart_version: "{{ chart_test_version }}"
+        chart_version: "{{ chart_source_version | default(omit) }}"
         namespace: "{{ helm_namespace }}"
         values: "{{ chart_test_values }}"
       register: install
-      diff: true
 
     - name: Assert idempotency after add vars
       assert:
@@ -152,14 +149,14 @@
           - install is not changed
           - install.status.status | lower == 'deployed'
           - install.status.chart == chart_test+"-"+chart_test_version
-          - install.status['release_values'] == chart_test_values
+          - "install.status['release_values'].revisionHistoryLimit == 0"
 
     - name: "Remove Vars to {{ chart_test }} from {{ source }}"
       helm:
         binary_path: "{{ helm_binary }}"
         name: "{{ chart_release_name }}"
         chart_ref: "{{ chart_source }}"
-        chart_version: "{{ chart_test_version }}"
+        chart_version: "{{ chart_source_version | default(omit) }}"
         namespace: "{{ helm_namespace }}"
       register: install
 
@@ -176,10 +173,9 @@
         binary_path: "{{ helm_binary }}"
         name: "{{ chart_release_name }}"
         chart_ref: "{{ chart_source }}"
-        chart_version: "{{ chart_test_version }}"
+        chart_version: "{{ chart_source_version | default(omit) }}"
         namespace: "{{ helm_namespace }}"
       register: install
-      diff: true
 
     - name: Assert idempotency after removing vars
       assert:
@@ -194,7 +190,7 @@
         binary_path: "{{ helm_binary }}"
         name: "{{ chart_release_name }}"
         chart_ref: "{{ chart_source_upgrade | default(chart_source) }}"
-        chart_version: "{{ chart_test_version_upgrade }}"
+        chart_version: "{{ chart_source_version_upgrade | default(omit) }}"
         namespace: "{{ helm_namespace }}"
       register: install
 
@@ -210,10 +206,9 @@
         binary_path: "{{ helm_binary }}"
         name: "{{ chart_release_name }}"
         chart_ref: "{{ chart_source_upgrade | default(chart_source) }}"
-        chart_version: "{{ chart_test_version_upgrade }}"
+        chart_version: "{{ chart_source_version_upgrade | default(omit) }}"
         namespace: "{{ helm_namespace }}"
       register: install
-      diff: true
 
     - name: Assert idempotency after upgrade
       assert:
@@ -242,7 +237,6 @@
         name: "{{ chart_release_name }}"
         namespace: "{{ helm_namespace }}"
       register: install
-      diff: true
 
     - name: Assert idempotency
       assert:
@@ -255,7 +249,7 @@
         binary_path: "{{ helm_binary }}"
         name: "{{ chart_release_replaced_name }}"
         chart_ref: "{{ chart_source }}"
-        chart_version: "{{ chart_test_version }}"
+        chart_version: "{{ chart_source_version | default(omit) }}"
         namespace: "{{ helm_namespace }}"
       register: install
 
@@ -283,7 +277,7 @@
         binary_path: "{{ helm_binary }}"
         name: "{{ chart_release_replaced_name }}"
         chart_ref: "{{ chart_source }}"
-        chart_version: "{{ chart_test_version }}"
+        chart_version: "{{ chart_source_version | default(omit) }}"
         namespace: "{{ helm_namespace }}"
         replace: True
       register: install
@@ -311,7 +305,7 @@
         binary_path: "{{ helm_binary }}"
         name: "{{ chart_release_name }}"
         chart_ref: "{{ chart_source }}"
-        chart_version: "{{ chart_test_version }}"
+        chart_version: "{{ chart_source_version | default(omit) }}"
         namespace: "{{ helm_namespace }}"
         values_files:
           - "{{ role_path }}/files/values.yaml"
@@ -330,7 +324,7 @@
         binary_path: "{{ helm_binary }}"
         name: "{{ chart_release_name }}"
         chart_ref: "{{ chart_source }}"
-        chart_version: "{{ chart_test_version }}"
+        chart_version: "{{ chart_source_version | default(omit) }}"
         namespace: "{{ helm_namespace }}"
         values_files:
           - "{{ role_path }}/files/values.yaml"
@@ -352,7 +346,7 @@
       helm_template:
         binary_path: "{{ helm_binary }}"
         chart_ref: "{{ chart_source }}"
-        chart_version: "{{ chart_test_version }}"
+        chart_version: "{{ chart_source_version | default(omit) }}"
         output_dir: "{{ temp_dir }}"
         values_files:
           - "{{ role_path }}/files/values.yaml"
@@ -378,7 +372,7 @@
       helm_template:
         binary_path: "{{ helm_binary }}"
         chart_ref: "{{ chart_source }}"
-        chart_version: "{{ chart_test_version }}"
+        chart_version: "{{ chart_source_version | default(omit) }}"
         disable_hook: True
         release_name: "myrelease"
         release_namespace: "myreleasenamespace"
@@ -404,7 +398,7 @@
         binary_path: "{{ helm_binary }}"
         name: "{{ chart_release_name }}"
         chart_ref: "{{ chart_source }}"
-        chart_version: "{{ chart_test_version }}"
+        chart_version: "{{ chart_source_version | default(omit) }}"
         namespace: "{{ helm_namespace }}"
         create_namespace: true
         context: does-not-exist
@@ -423,7 +417,6 @@
         state: absent
         path: "{{ temp_dir }}"
       ignore_errors: true
-      when: temp_dir is defined
 
     - name: Remove helm namespace
       k8s:

tests/integration/targets/helm/tasks/tests_chart/from_repository.yml

@@ -5,38 +5,18 @@
     name: test_helm
     repo_url: "{{ chart_test_repo }}"
 
-- name: Create temporary file to save values in
-  ansible.builtin.tempfile:
-    suffix: .helm_values
-  register: value_file
-
-- vars:
+- name: Install Chart from repository
+  include_tasks: "../tests_chart.yml"
+  vars:
     source: repository
-    chart_test: k8status
-    chart_source: "test_helm/k8status"
-    chart_test_version: "0.16.1"
-    chart_test_version_upgrade: "0.16.2"
+    chart_source: "test_helm/{{ chart_test }}"
+    chart_source_version: "{{ chart_test_version }}"
+    chart_source_version_upgrade: "{{ chart_test_version_upgrade }}"
     helm_namespace: "{{ test_namespace[7] }}"
-    chart_test_values:
-      replicaCount: 3
-  block:
-    - name: Save values into file
-      ansible.builtin.copy:
-        content: "{{ chart_test_values }}"
-        dest: "{{ value_file.path }}"
 
-    - name: Install Chart from repository
-      ansible.builtin.include_tasks: "../tests_chart.yml"
-
-  always:
-    - name: Remove temporary file
-      ansible.builtin.file:
-        state: absent
-        path: "{{ value_file.path }}"
-
-    - name: Remove chart repo
-      helm_repository:
-        binary_path: "{{ helm_binary }}"
-        name: test_helm
-        repo_url: "{{ chart_test_repo }}"
-        state: absent
+- name: Remove chart repo
+  helm_repository:
+    binary_path: "{{ helm_binary }}"
+    name: test_helm
+    repo_url: "{{ chart_test_repo }}"
+    state: absent

tests/integration/targets/helm/tasks/tests_chart/from_url.yml

@@ -3,11 +3,6 @@
   include_tasks: "../tests_chart.yml"
   vars:
     source: url
-    chart_test: "k8status"
-    chart_test_values:
-      replicaCount: 3
-    chart_test_version: "0.16.1"
-    chart_test_version_upgrade: "0.16.2"
-    chart_source: https://github.com/stenic/k8status/releases/download/k8status-0.16.1/k8status-0.16.1.tgz
-    chart_source_upgrade: https://github.com/stenic/k8status/releases/download/k8status-0.16.2/k8status-0.16.2.tgz
+    chart_source: "https://github.com/kubernetes/ingress-nginx/releases/download/helm-chart-{{ chart_test_version }}/{{ chart_test }}-{{ chart_test_version }}.tgz"
+    chart_source_upgrade: "https://github.com/kubernetes/ingress-nginx/releases/download/helm-chart-{{ chart_test_version_upgrade }}/{{ chart_test }}-{{ chart_test_version_upgrade }}.tgz"
     helm_namespace: "{{ test_namespace[8] }}"

tests/integration/targets/helm_diff/tasks/main.yml

@@ -239,7 +239,6 @@
           vars:
             chart_local_path: '{{ _tmpd.path }}/test-chart-deployment-time'
             chart_repo_path: 'testing'
-            helm_binary_path: "{{ helm_binary }}"
       always:
         - name: Delete temporary directory
           ansible.builtin.file:

tests/integration/targets/helm_diff/tasks/reset_then_reuse_values.yml

@@ -92,11 +92,25 @@
         path: /tmp/helm/
         state: absent
 
-    - name: Install old version of helm
-      ansible.builtin.include_role:
-        name: install_helm
-      vars:
-        helm_version: "v3.8.0"
+    - name: Init Helm folders
+      file:
+        path: /tmp/helm
+        state: directory
+
+    - name: Set Helm old version
+      set_fact:
+        helm_archive_name: "helm-v3.8.0-linux-amd64.tar.gz"
+        helm_diff_old_version: "3.8.0"
+
+    - name: Unarchive Helm binary
+      unarchive:
+        src: "https://get.helm.sh/{{ helm_archive_name | default(helm_default_archive_name) }}"
+        dest: /tmp/helm/
+        remote_src: yes
+      retries: 10
+      delay: 5
+      register: result
+      until: result is not failed
 
     - name: Upgrade helm release (with reset_then_reuse_values=true)
       kubernetes.core.helm:
@@ -126,7 +140,7 @@
         binary_path: "{{ helm_binary }}"
         state: present
         plugin_path: https://github.com/databus23/helm-diff
-        plugin_version: "3.8.0"
+        plugin_version: "{{ helm_diff_old_version }}"
 
     - name: Upgrade helm release (with reset_then_reuse_values=true)
       kubernetes.core.helm:
@@ -152,11 +166,6 @@
           - '"reset_then_reuse_values requires helm diff >= 3.9.12, current version is" in helm_upgrade.msg'
 
   always:
-    - name: Delete Helm folders
-      file:
-        path: /tmp/helm/
-        state: absent
-
     - name: Remove temporary directory
       file:
         path: "{{ helm_dir.path }}"

tests/integration/targets/helm_kubeconfig/defaults/main.yml

@@ -1,10 +1,7 @@
 ---
+helm_binary: "/tmp/helm/{{ ansible_system | lower }}-amd64/helm"
 default_kubeconfig_path: "~/.kube/config"
 test_namespace:
   - "helm-in-memory-kubeconfig"
   - "helm-kubeconfig-with-ca-cert"
   - "helm-kubeconfig-with-insecure-skip-tls-verify"
-helm_versions:
-  - v3.10.3
-  - v3.16.4
-  - v4.0.0

tests/integration/targets/helm_kubeconfig/meta/main.yml

@@ -0,0 +1,4 @@
+---
+dependencies:
+  - remove_namespace
+  - install_helm

tests/integration/targets/helm_kubeconfig/tasks/from_kubeconfig_with_cacert.yml

@@ -57,7 +57,7 @@
       assert:
         that:
           - _install is failed
-          - '"error: kubernetes cluster unreachable" in _install.msg | lower()'
+          - '"Error: Kubernetes cluster unreachable" in _install.msg'
 
     - name: Test helm modules using in-memory kubeconfig
       include_tasks: "tests_helm_auth.yml"

tests/integration/targets/helm_kubeconfig/tasks/from_kubeconfig_with_validate_certs.yml

@@ -48,7 +48,7 @@
       assert:
         that:
           - _install is failed
-          - '"error: kubernetes cluster unreachable" in _install.msg | lower()'
+          - '"Error: Kubernetes cluster unreachable" in _install.msg'
 
     - name: Test helm modules using in-memory kubeconfig
       include_tasks: "tests_helm_auth.yml"

tests/integration/targets/helm_kubeconfig/tasks/main.yml

@@ -1,5 +1,21 @@
 ---
-- ansible.builtin.include_tasks: run_tests.yml
-  loop: "{{ helm_versions }}"
+- name: Test helm with in-memory kubeconfig
+  include_tasks: "from_in_memory_kubeconfig.yml"
   loop_control:
-    loop_var: helm_version
+    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"
+  loop_control:
+    loop_var: test_helm_version
+  with_items:
+    - "v3.10.3"
+
+- 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.10.3"

tests/integration/targets/helm_kubeconfig/tasks/run_tests.yml

@@ -1,15 +0,0 @@
----
-- name: Run tests with helm version "{{ helm_version }}"
-  block:
-    - name: "Install Helm"
-      ansible.builtin.include_role:
-        name: install_helm
-
-    - name: Test helm with in-memory kubeconfig
-      ansible.builtin.include_tasks: "from_in_memory_kubeconfig.yml"
-
-    - name: Test helm with custom kubeconfig and validate_certs=false
-      include_tasks: "from_kubeconfig_with_validate_certs.yml"
-
-    - name: Test helm with custom kubeconfig and ca_cert
-      include_tasks: "from_kubeconfig_with_cacert.yml"

tests/integration/targets/helm_kubeconfig/tasks/tests_helm_auth.yml

@@ -5,6 +5,16 @@
     suffix: .helm
   register: _dir
 
+- name: Install helm binary
+  block:
+    - name: "Install {{ test_helm_version }}"
+      include_role:
+        name: install_helm
+      vars:
+        helm_version: "{{ test_helm_version }}"
+
+  when: test_helm_version is defined
+
 - set_fact:
     saved_kubeconfig_path: "{{ _dir.path }}/config"
 
@@ -34,7 +44,6 @@
         ca_cert: "{{ test_ca_cert | default(omit) }}"
         state: present
         plugin_path: https://github.com/hydeenoble/helm-subenv
-        verify: false
       register: plugin
 
     - assert:

tests/integration/targets/helm_plain_http/.gitignore

@@ -1 +0,0 @@
-redis*

tests/integration/targets/helm_plain_http/aliases

@@ -1,3 +0,0 @@
-helm_template
-helm_pull
-helm

tests/integration/targets/helm_plain_http/inventory.ini

@@ -1,4 +0,0 @@
-[all]
-helm-3.12.3 helm_version=v3.12.3 test_namespace=helm-plain-http-v3-12-3 tests_should_failed=true
-helm-3.18.2 helm_version=v3.18.2 test_namespace=helm-plain-http-v3-18-2 tests_should_failed=false
-helm-4.0.0 helm_version=v4.0.0 test_namespace=helm-plain-http-v4-0-0 tests_should_failed=false

tests/integration/targets/helm_plain_http/playbooks/play.yaml

@@ -1,15 +0,0 @@
-- name: Run test for helm plain http option
-  hosts: all
-  gather_facts: true
-  strategy: free
-
-  vars:
-    ansible_connection: local
-    ansible_python_interpreter: "{{ ansible_playbook_python  }}"
-    chart_test_oci: "oci://registry-1.docker.io/bitnamicharts/redis"
-
-  roles:
-    - role: setup_namespace
-
-  tasks:
-    - ansible.builtin.include_tasks: tasks/test.yaml

tests/integration/targets/helm_plain_http/playbooks/tasks/test.yaml

@@ -1,95 +0,0 @@
----
-- name: Run test for helm
-  block:
-    - name: Create temporary directory to install chart In
-      ansible.builtin.tempfile:
-        state: directory
-        suffix: .helm
-      register: install_path
-
-    - name: Install required helm version
-      ansible.builtin.include_role:
-        name: install_helm
-      vars:
-        helm_install_path: "{{ install_path.path }}"
-
-    # helm
-    - name: Run helm with plain_http
-      kubernetes.core.helm:
-        binary_path: "{{ helm_binary }}"
-        chart_ref: "{{ chart_test_oci }}"
-        release_name: test-secure
-        release_namespace: "{{ test_namespace }}"
-        create_namespace: true
-        plain_http: true
-      register: install_chart
-      ignore_errors: true
-
-    - name: Ensure module failed as expected
-      ansible.builtin.assert:
-        that:
-          - install_chart is failed
-          - '"plain_http requires helm >= 3.13.0" in install_chart.msg'
-      when: tests_should_failed | bool
-
-    - name: Ensure the result command contains the expected option
-      ansible.builtin.assert:
-        that:
-          - install_chart is not failed
-          - '"--plain-http" in install_chart.command'
-      when: not (tests_should_failed | bool)
-
-    # helm_pull
-    - name: Trying to download helm chart with option plain_http
-      kubernetes.core.helm_pull:
-        chart_ref: "{{ chart_test_oci }}"
-        destination: "{{ playbook_dir }}"
-        binary_path: "{{ helm_binary }}"
-        plain_http: true
-      register: pull_chart
-      ignore_errors: true
-
-    - name: Ensure module failed as expected
-      ansible.builtin.assert:
-        that:
-          - pull_chart is failed
-          - '"plain_http requires helm >= 3.13.0" in pull_chart.msg'
-      when: tests_should_failed | bool
-
-    - name: Ensure the result command contains the expected option
-      ansible.builtin.assert:
-        that:
-          - pull_chart is not failed
-          - '"--plain-http" in pull_chart.command'
-      when: not (tests_should_failed | bool)
-
-    # helm_template
-    - name: Test helm render template
-      kubernetes.core.helm_template:
-        binary_path: "{{ helm_binary }}"
-        chart_ref: "{{ chart_test_oci }}"
-        output_dir: "{{ playbook_dir }}"
-        plain_http: true
-      register: template
-      ignore_errors: true
-
-    - name: Ensure module failed as expected
-      ansible.builtin.assert:
-        that:
-          - template is failed
-          - '"plain_http requires helm >= 3.13.0" in template.msg'
-      when: tests_should_failed | bool
-
-    - name: Ensure the result command contains the expected option
-      ansible.builtin.assert:
-        that:
-          - template is not failed
-          - '"--plain-http" in template.command'
-      when: not (tests_should_failed | bool)
-
-  always:
-    - name: Delete temporary file
-      ansible.builtin.file:
-        path: "{{ install_path.path }}"
-        state: absent
-      ignore_errors: true

tests/integration/targets/helm_plain_http/runme.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -eux
-export ANSIBLE_ROLES_PATH=../
-ansible-playbook playbooks/play.yaml -i inventory.ini "$@"

tests/integration/targets/helm_plugin/meta/main.yml

@@ -0,0 +1,3 @@
+---
+dependencies:
+  - install_helm

tests/integration/targets/helm_plugin/tasks/main.yml

@@ -1,8 +1,165 @@
 ---
-- name: Run tests
-  include_tasks: run_tests.yml
-  loop_control:
-    loop_var: helm_version
-  with_items:
-    - "v3.17.0"
-    - "v4.0.0"
+- name: Install env plugin in check mode
+  helm_plugin:
+    binary_path: "{{ helm_binary }}"
+    state: present
+    plugin_path: https://github.com/adamreese/helm-env
+  register: check_install_env
+  check_mode: true
+
+- assert:
+    that:
+      - check_install_env.changed
+
+- name: Install env plugin
+  helm_plugin:
+    binary_path: "{{ helm_binary }}"
+    state: present
+    plugin_path: https://github.com/adamreese/helm-env
+  register: install_env
+
+- assert:
+    that:
+      - install_env.changed
+
+- name: Gather info about all plugin
+  helm_plugin_info:
+    binary_path: "{{ helm_binary }}"
+  register: plugin_info
+
+- assert:
+    that:
+      - plugin_info.plugin_list is defined
+
+- name: Install env plugin again
+  helm_plugin:
+    binary_path: "{{ helm_binary }}"
+    state: present
+    plugin_path: https://github.com/adamreese/helm-env
+  register: install_env
+
+- assert:
+    that:
+      - not install_env.changed
+
+- name: Uninstall env plugin in check mode
+  helm_plugin:
+    binary_path: "{{ helm_binary }}"
+    state: absent
+    plugin_name: env
+  register: check_uninstall_env
+  check_mode: true
+
+- assert:
+    that:
+      - check_uninstall_env.changed
+
+- name: Uninstall env plugin
+  helm_plugin:
+    binary_path: "{{ helm_binary }}"
+    state: absent
+    plugin_name: env
+  register: uninstall_env
+
+- assert:
+    that:
+      - uninstall_env.changed
+
+- name: Uninstall env plugin again
+  helm_plugin:
+    binary_path: "{{ helm_binary }}"
+    state: absent
+    plugin_name: env
+  register: uninstall_env
+
+- assert:
+    that:
+      - not uninstall_env.changed
+
+# https://github.com/ansible-collections/community.kubernetes/issues/399
+- block:
+    - name: Copy required plugin files
+      copy:
+        src: "files/sample_plugin"
+        dest: "/tmp/helm_plugin_test/"
+
+    - name: Install sample_plugin from the directory
+      helm_plugin:
+        binary_path: "{{ helm_binary }}"
+        state: present
+        plugin_path: "/tmp/helm_plugin_test/sample_plugin"
+      register: sample_plugin_output
+
+    - name: Assert that sample_plugin is installed or not
+      assert:
+        that:
+          - sample_plugin_output.changed
+
+    - name: Gather Helm plugin info
+      helm_plugin_info:
+        binary_path: "{{ helm_binary }}"
+      register: r
+
+    - name: Set sample_plugin version
+      set_fact:
+        plugin_version: "{{ ( r.plugin_list | selectattr('name', 'equalto', plugin_name) | list )[0].version }}"
+      vars:
+        plugin_name: "sample_plugin"
+
+    - name: Assert if sample_plugin with multiline comment is installed
+      assert:
+        that:
+          - plugin_version == "0.0.1"
+  always:
+    - name: Uninstall sample_plugin
+      helm_plugin:
+        binary_path: "{{ helm_binary }}"
+        state: absent
+        plugin_name: sample_plugin
+      ignore_errors: yes
+
+- block:
+    - name: uninstall helm plugin secrets
+      helm_plugin:
+        binary_path: "{{ helm_binary }}"
+        plugin_name: secrets
+        state: absent
+
+    - name: install helm-secrets on a specific version
+      helm_plugin:
+        binary_path: "{{ helm_binary }}"
+        plugin_path: https://github.com/jkroepke/helm-secrets
+        plugin_version: 3.4.1
+        state: present
+
+    - name: list helm plugin
+      helm_plugin_info:
+        plugin_name: secrets
+        binary_path: "{{ helm_binary }}"
+      register: plugin_list
+
+    - name: assert that secrets has been installed with specified version
+      assert:
+        that:
+          - plugin_list.plugin_list[0].version == "3.4.1"
+
+    - name: Update helm plugin version to latest
+      helm_plugin:
+        binary_path: "{{ helm_binary }}"
+        plugin_name: secrets
+        state: latest
+      register: _update
+
+    - name: assert update was performed
+      assert:
+        that:
+          - _update.changed
+          - '"Updated plugin: secrets" in _update.stdout'
+
+  always:
+    - name: Uninstall sample_plugin
+      helm_plugin:
+        binary_path: "{{ helm_binary }}"
+        state: absent
+        plugin_name: secrets
+      ignore_errors: yes

tests/integration/targets/helm_plugin/tasks/run_tests.yml

@@ -1,195 +0,0 @@
----
-- name: "Install {{ helm_version }}"
-  include_role:
-    name: install_helm
-
-- block:
-    - name: Install env plugin in check mode
-      helm_plugin:
-        binary_path: "{{ helm_binary }}"
-        state: present
-        plugin_path: https://github.com/adamreese/helm-env
-        verify: false
-      register: check_install_env
-      check_mode: true
-
-    - assert:
-        that:
-          - check_install_env.changed
-
-    - name: Install env plugin
-      helm_plugin:
-        binary_path: "{{ helm_binary }}"
-        state: present
-        plugin_path: https://github.com/adamreese/helm-env
-        verify: false
-      register: install_env
-
-    - assert:
-        that:
-          - install_env.changed
-
-    - name: Gather info about all plugin
-      helm_plugin_info:
-        binary_path: "{{ helm_binary }}"
-      register: plugin_info
-
-    - assert:
-        that:
-          - plugin_info.plugin_list is defined
-
-    - name: Install env plugin again
-      helm_plugin:
-        binary_path: "{{ helm_binary }}"
-        state: present
-        plugin_path: https://github.com/adamreese/helm-env
-        verify: false
-      register: install_env
-
-    - assert:
-        that:
-          - not install_env.changed
-
-    - name: Uninstall env plugin in check mode
-      helm_plugin:
-        binary_path: "{{ helm_binary }}"
-        state: absent
-        plugin_name: env
-        verify: false
-      register: check_uninstall_env
-      check_mode: true
-
-    - assert:
-        that:
-          - check_uninstall_env.changed
-
-    - name: Uninstall env plugin
-      helm_plugin:
-        binary_path: "{{ helm_binary }}"
-        state: absent
-        plugin_name: env
-      register: uninstall_env
-
-    - assert:
-        that:
-          - uninstall_env.changed
-
-    - name: Uninstall env plugin again
-      helm_plugin:
-        binary_path: "{{ helm_binary }}"
-        state: absent
-        plugin_name: env
-      register: uninstall_env
-
-    - assert:
-        that:
-          - not uninstall_env.changed
-
-  always:
-    - name: Uninstall env plugin
-      helm_plugin:
-        binary_path: "{{ helm_binary }}"
-        state: absent
-        plugin_name: env
-
-# https://github.com/ansible-collections/community.kubernetes/issues/399
-- block:
-    - name: Copy required plugin files
-      copy:
-        src: "files/sample_plugin"
-        dest: "/tmp/helm_plugin_test/"
-
-    - name: Install sample_plugin from the directory
-      helm_plugin:
-        binary_path: "{{ helm_binary }}"
-        state: present
-        plugin_path: "/tmp/helm_plugin_test/sample_plugin"
-      register: sample_plugin_output
-
-    - name: Assert that sample_plugin is installed or not
-      assert:
-        that:
-          - sample_plugin_output.changed
-
-    - name: Gather Helm plugin info
-      helm_plugin_info:
-        binary_path: "{{ helm_binary }}"
-      register: r
-
-    - name: Set sample_plugin version
-      set_fact:
-        plugin_version: "{{ ( r.plugin_list | selectattr('name', 'equalto', plugin_name) | list )[0].version }}"
-      vars:
-        plugin_name: "sample_plugin"
-
-    - name: Assert if sample_plugin with multiline comment is installed
-      assert:
-        that:
-          - plugin_version == "0.0.1"
-  always:
-    - name: Uninstall sample_plugin
-      helm_plugin:
-        binary_path: "{{ helm_binary }}"
-        state: absent
-        plugin_name: sample_plugin
-      ignore_errors: true
-
-- block:
-    - name: uninstall helm plugin unittest
-      helm_plugin:
-        binary_path: "{{ helm_binary }}"
-        plugin_name: unittest
-        state: absent
-
-    - name: install helm-unittest on a specific version
-      helm_plugin:
-        binary_path: "{{ helm_binary }}"
-        plugin_path: https://github.com/helm-unittest/helm-unittest
-        plugin_version: v1.0.1
-        verify: false
-        state: present
-
-    - name: list helm plugin
-      helm_plugin_info:
-        plugin_name: unittest
-        binary_path: "{{ helm_binary }}"
-      register: plugin_list
-
-    - name: assert that unittest has been installed with specified version
-      assert:
-        that:
-          - plugin_list.plugin_list[0].version == "1.0.1"
-
-    - name: Update helm plugin version to latest (check mode)
-      helm_plugin:
-        binary_path: "{{ helm_binary }}"
-        plugin_name: unittest
-        state: latest
-      register: _update_checkmode
-      check_mode: true
-
-    - name: Assert that module reported change while running in check mode
-      assert:
-        that:
-          - _update_checkmode.changed
-          - '"Updated plugin: unittest" not in _update_checkmode.stdout'
-
-    - name: Update helm plugin version to latest
-      helm_plugin:
-        binary_path: "{{ helm_binary }}"
-        plugin_name: unittest
-        state: latest
-      register: _update
-
-    - name: assert update was performed
-      assert:
-        that:
-          - _update.changed
-          - '"Updated plugin: unittest" in _update.stdout'
-
-  always:
-    - name: Uninstall sample_plugin
-      helm_plugin:
-        binary_path: "{{ helm_binary }}"
-        state: absent
-        plugin_name: unittest

tests/integration/targets/helm_pull/tasks/main.yml

@@ -5,7 +5,7 @@
       - 3.8.0
       - 3.1.0
       - 3.0.0
-      - 4.0.0
+      - 2.3.0
 
 - block:
     - name: Create temp directory for helm tests
@@ -20,13 +20,37 @@
     - set_fact:
         destination: "{{ temp_dir }}"
 
-    - name: Install Helm versions
-      ansible.builtin.include_role:
-        name: install_helm
-      loop: "{{ helm_versions }}"
+    - name: Create Helm directories
+      file:
+        state: directory
+        path: "{{ temp_dir }}/{{ item }}"
+      with_items: "{{ helm_versions }}"
+
+    - name: Unarchive Helm binary
+      unarchive:
+        src: "https://get.helm.sh/helm-v{{ item }}-linux-amd64.tar.gz"
+        dest: "{{ temp_dir }}/{{ item }}"
+        remote_src: yes
+      with_items: "{{ helm_versions }}"
+
+    # Testing helm pull with helm version == 2.3.0
+    - block:
+        - name: Assert that helm pull failed with helm <= 3.0.0
+          helm_pull:
+            binary_path: "{{ helm_path }}"
+            chart_ref: https://github.com/grafana/helm-charts/releases/download/grafana-5.6.0/grafana-5.6.0.tgz
+            destination: "{{ destination }}"
+          ignore_errors: true
+          register: _result
+
+        - name: assert that module failed with proper message
+          assert:
+            that:
+              - _result is failed
+              - _result.msg == "Helm version must be >=3.0.0,<4.0.0, current version is 2.3.0"
+
       vars:
-        helm_version: "v{{ item }}"
-        helm_install_path: "{{ temp_dir }}/{{ item }}"
+        helm_path: "{{ temp_dir }}/2.3.0/linux-amd64/helm"
 
     # Testing helm pull with helm version == 3.0.0
     - block:
@@ -79,7 +103,7 @@
               - _result.msg == "Parameter chart_ca_cert requires helm >= 3.1.0, current version is 3.0.0"
 
       vars:
-        helm_path: "{{ temp_dir }}/3.0.0/helm"
+        helm_path: "{{ temp_dir }}/3.0.0/linux-amd64/helm"
 
     # Testing helm pull with helm version == 3.1.0
     - block:
@@ -119,7 +143,7 @@
               - _result.msg == "Parameter skip_tls_certs_check requires helm >= 3.3.0, current version is 3.1.0"
 
       vars:
-        helm_path: "{{ temp_dir }}/3.1.0/helm"
+        helm_path: "{{ temp_dir }}/3.1.0/linux-amd64/helm"
 
     # Testing helm pull with helm version == 3.8.0
     - block:
@@ -293,7 +317,7 @@
               - _chart_after_force.stat.isdir
 
       vars:
-        helm_path: "{{ temp_dir }}/3.8.0/helm"
+        helm_path: "{{ temp_dir }}/3.8.0/linux-amd64/helm"
 
 
   always:

tests/integration/targets/helm_registry_auth/defaults/main.yaml

@@ -5,9 +5,5 @@ username: testuser
 password: testpassword
 wrong_password: 'WrongPassword'
 registry_name: oci_registry
-registry_port: 5002
+registry_port: 5000
 test_chart: https://github.com/grafana/helm-charts/releases/download/k8s-monitoring-1.6.8/k8s-monitoring-1.6.8.tgz
-helm_versions:
-  - v3.17.0
-  - v3.20.0
-  - v4.0.0

tests/integration/targets/helm_registry_auth/meta/main.yml

@@ -0,0 +1,3 @@
+---
+dependencies:
+  - install_helm

tests/integration/targets/helm_registry_auth/tasks/main.yaml

@@ -0,0 +1,182 @@
+---
+- name: Run module test
+  # using a shell and command module to run the test as test can be non-idempotent
+  # and it allow to not install any additional dependencies
+  block:
+    - name: Ensure that helm is installed
+      ansible.builtin.shell: helm version --client --short | grep v3
+      register: _helm_version
+      failed_when: _helm_version.rc != 0
+
+    - name: Ensure that Docker demon is running
+      ansible.builtin.command: "docker info"
+      register: _docker_info
+      failed_when: _docker_info.rc != 0
+
+    - name: Create a tmpfile htpasswd directory
+      ansible.builtin.tempfile:
+        state: directory
+        suffix: .httppasswd
+      register: _tmpfile
+
+    - name: Copy htpasswd to the tmpfile directory
+      ansible.builtin.copy:
+        src: registry.password
+        dest: "{{ _tmpfile.path }}/registry.password"
+
+    - name: Setup the registry
+      ansible.builtin.command: >-
+        docker run -d --rm
+        -p {{ registry_port }}:5000
+        --name "{{ registry_name }}"
+        -v "{{ _tmpfile.path }}:/auth"
+        -e "REGISTRY_AUTH=htpasswd"
+        -e "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm"
+        -e REGISTRY_AUTH_HTPASSWD_PATH=/auth/registry.password
+        registry:2
+      register: _setup_registry
+      failed_when: _setup_registry.rc != 0
+
+    - name: Ensure that the registry is running and rechable
+      ansible.builtin.wait_for:
+        host: localhost
+        port: "{{ registry_port }}"
+
+    - name: Test the registry with correct credentials to ensure that the registry is running
+      ansible.builtin.shell: >-
+        echo {{ password | quote }} | helm registry login localhost:{{ registry_port }}
+        -u {{ username }} --password-stdin
+      register: _login_correct
+      failed_when: _login_correct.rc != 0
+
+    - name: Clean up credentials to run test on clean environment
+      ansible.builtin.shell: >-
+        helm registry logout localhost:{{ registry_port }}
+      register: _logout
+      failed_when: _logout.rc != 0
+
+    - name: Create directory for helm chart
+      ansible.builtin.tempfile:
+        state: directory
+        suffix: ".helm"
+      register: _destination
+
+    - name: Pull test helm chart
+      ansible.builtin.uri:
+        url: "{{ test_chart }}"
+        dest: "{{ _destination.path }}/k8s-monitoring-1.6.8.tgz"
+        return_content: no
+        status_code: 200
+
+    - name: Test module helm_registry_auth with correct credentials
+      helm_registry_auth:
+        username: "{{ username }}"
+        password: "{{ password }}"
+        host: localhost:{{ registry_port }}
+        state: present
+      register: _helm_registry_auth_correct
+
+    - name: Assert that the registry is logged in
+      # Helm binary prints the message to stderr, refence: https://github.com/helm/helm/issues/13464
+      assert:
+        that:
+          - "'Login Succeeded' in _helm_registry_auth_correct.stderr"
+          - "'{{ password }}' not in _helm_registry_auth_correct.command"
+          - "'{{ password }}' not in _helm_registry_auth_correct.stdout"
+          - "'{{ password }}' not in _helm_registry_auth_correct.stderr"
+
+    - name: Ensure that push to the registry is working
+      ansible.builtin.shell: >-
+        helm push "{{ _destination.path }}/k8s-monitoring-1.6.8.tgz"  oci://localhost:{{ registry_port }}/test/
+      register: _save_chart
+      failed_when: _save_chart.rc != 0
+
+    - name: Assert that the chart is saved
+      # Helm binary prints the message to stderr, refence: https://github.com/helm/helm/issues/13464
+      assert:
+        that: "'Pushed: localhost:{{ registry_port }}/test/k8s-monitoring' in _save_chart.stderr"
+
+
+    - name: Test logout
+      helm_registry_auth:
+        host: localhost:{{ registry_port }}
+        state: absent
+      register: _helm_registry_auth_logout
+
+    - name: Assert logout
+      # Helm binary prints the message to stderr
+      assert:
+        that: "'Removing login credentials' in _helm_registry_auth_logout.stderr"
+
+    - name: Test idempotency of logout with helm < 3.18.0
+      when: _helm_version.stdout is ansible.builtin.version('v3.18.0', '<')
+      block:
+
+        - name: Test logout idempotency
+          helm_registry_auth:
+            host: localhost:{{ registry_port }}
+            state: absent
+          register: _helm_registry_auth_logout_idempotency
+
+        - name: Assert logout operation did not report change
+          ansible.builtin.assert:
+            that: _helm_registry_auth_logout_idempotency is not changed
+
+    - name: Ensure that not able to push to the registry
+      ansible.builtin.shell: >-
+        helm push "{{ _destination.path }}/k8s-monitoring-1.6.8.tgz"  oci://localhost:{{ registry_port }}/test/
+      register: _save_chart
+      failed_when: _save_chart.rc == 0
+
+    - name: Read content of ~/.config/helm/registry/config.json
+      ansible.builtin.slurp:
+        src: ~/.config/helm/registry/config.json
+      register: _config_json
+
+    - name: Assert that auth data is remove and the chart is not saved
+      # Helm binary prints the message to stderr
+      ansible.builtin.assert:
+        that:
+          - "'push access denied' in _save_chart.stderr or 'basic credential not found' in _save_chart.stderr"
+          - "_save_chart.rc != 0"
+          - "'localhost:{{ registry_port }}' not in _config_json.content | b64decode"
+
+    - name: Test module helm_registry_auth with wrong credentials
+      helm_registry_auth:
+        username: "{{ username }}"
+        password: "{{ wrong_password }}"
+        host: localhost:{{ registry_port }}
+        state: present
+      register: _helm_registry_auth_wrong
+      ignore_errors: true
+
+    - name: Read content of ~/.config/helm/registry/config.json
+      ansible.builtin.slurp:
+        src: ~/.config/helm/registry/config.json
+      register: _config_json
+
+    - name: Assert that the registry is not logged in and auth data is not saved
+      ansible.builtin.assert:
+        that:
+          - "'401' in _helm_registry_auth_wrong.stderr"
+          - "'unauthorized' in _helm_registry_auth_wrong.stderr | lower"
+          - "'{{ wrong_password }}' not in _helm_registry_auth_correct.command"
+          - "'{{ wrong_password }}' not in _helm_registry_auth_correct.stdout"
+          - "'{{ wrong_password }}' not in _helm_registry_auth_correct.stderr"
+          - "'localhost:{{ registry_port }}' not in _config_json.content | b64decode"
+
+  # Clean up
+  always:
+    - name: Stop and remove the registry
+      ansible.builtin.command: docker stop {{ registry_name }}
+      ignore_errors: true
+
+    - name: Remove the tmpfile
+      ansible.builtin.file:
+        state: absent
+        path: "{{ item }}"
+        force: true
+      loop:
+        - "{{ _tmpfile.path }}"
+        - "{{ _destination.path }}"
+      ignore_errors: true

tests/integration/targets/helm_registry_auth/tasks/main.yml

@@ -1,60 +0,0 @@
----
-- name: Run tests for helm_registry_auth with different helm versions
-  block:
-    - name: Create temporary directory to install helm binaries
-      ansible.builtin.tempfile:
-        state: directory
-        suffix: .helm
-      register: _tmpdir
-
-    - name: Ensure that Docker demon is running
-      ansible.builtin.command: "docker info"
-      register: _docker_info
-      failed_when: _docker_info.rc != 0
-
-    - name: Copy htpasswd to the tmpfile directory
-      ansible.builtin.copy:
-        src: registry.password
-        dest: "{{ _tmpdir.path }}/registry.password"
-
-    - name: Pull test helm chart
-      ansible.builtin.uri:
-        url: "{{ test_chart }}"
-        dest: "{{ _tmpdir.path }}/k8s-monitoring-1.6.8.tgz"
-        return_content: no
-        status_code: 200
-
-    - name: Setup the registry
-      ansible.builtin.command: >-
-        docker run -d --rm
-        -p {{ registry_port }}:5000
-        --name "{{ registry_name }}"
-        -v "{{ _tmpdir.path }}:/auth"
-        -e "REGISTRY_AUTH=htpasswd"
-        -e "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm"
-        -e REGISTRY_AUTH_HTPASSWD_PATH=/auth/registry.password
-        registry:2
-      register: _setup_registry
-      failed_when: _setup_registry.rc != 0
-
-    - name: Ensure that the registry is running and rechable
-      ansible.builtin.wait_for:
-        host: localhost
-        port: "{{ registry_port }}"
-
-    - name: Run tests
-      ansible.builtin.include_tasks: run_tests.yml
-      loop: "{{ helm_versions }}"
-      loop_control:
-        loop_var: helm_version
-
-  always:
-    - name: Stop and remove the registry
-      ansible.builtin.command: docker stop {{ registry_name }}
-      ignore_errors: true
-
-    - name: Delete temporary directory
-      ansible.builtin.file:
-        state: absent
-        path: "{{ _tmpdir.path }}"
-      ignore_errors: true

tests/integration/targets/helm_registry_auth/tasks/run_tests.yml

@@ -1,108 +0,0 @@
----
-- block:
-    - name: Install helm versions
-      ansible.builtin.include_role:
-        name: install_helm
-
-    # - name: Test the registry with correct credentials to ensure that the registry is running
-    #   ansible.builtin.shell: >-
-    #     echo {{ password | quote }} | {{ helm_binary }} registry login localhost:{{ registry_port }}
-    #     -u {{ username }} --password-stdin --plain-http
-    #   register: _login_correct
-    #   failed_when: _login_correct.rc != 0
-
-    # - name: Clean up credentials to run test on clean environment
-    #   ansible.builtin.shell: >-
-    #     {{ helm_binary }} registry logout localhost:{{ registry_port }}
-    #   register: _logout
-    #   failed_when: _logout.rc != 0
-
-    - name: Test module helm_registry_auth with correct credentials
-      helm_registry_auth:
-        binary_path: "{{ helm_binary }}"
-        username: "{{ username }}"
-        password: "{{ password }}"
-        host: localhost:{{ registry_port }}
-        plain_http: true
-        state: present
-      register: _helm_registry_auth_correct
-
-    - name: Assert that the registry is logged in
-      # Helm binary prints the message to stderr, refence: https://github.com/helm/helm/issues/13464
-      assert:
-        that:
-          - "'Login Succeeded' in _helm_registry_auth_correct.stdout_lines + _helm_registry_auth_correct.stderr_lines"
-          - password not in _helm_registry_auth_correct.command
-          - password not in _helm_registry_auth_correct.stdout
-          - password not in _helm_registry_auth_correct.stderr
-
-    - name: Ensure that push to the registry is working
-      ansible.builtin.shell: >-
-        {{ helm_binary }} push --plain-http "{{ _tmpdir.path }}/k8s-monitoring-1.6.8.tgz"  oci://localhost:{{ registry_port }}/test/
-      register: _save_chart
-      failed_when: _save_chart.rc != 0
-
-    - name: Assert that the chart is saved
-      # Helm binary prints the message to stderr, refence: https://github.com/helm/helm/issues/13464
-      assert:
-        that: "'Pushed: localhost:' + registry_port | string + '/test/k8s-monitoring' in _save_chart.stderr"
-
-    - name: Test logout
-      helm_registry_auth:
-        binary_path: "{{ helm_binary }}"
-        host: localhost:{{ registry_port }}
-        state: absent
-      register: _helm_registry_auth_logout
-
-    - name: Assert logout
-      # Helm binary prints the message to stderr
-      assert:
-        that: "'Removing login credentials' in _helm_registry_auth_logout.stderr"
-
-    - name: Ensure that not able to push to the registry
-      ansible.builtin.shell: >-
-        {{ helm_binary }} push --plain-http "{{ _tmpdir.path }}/k8s-monitoring-1.6.8.tgz"  oci://localhost:{{ registry_port }}/test/
-      register: _save_chart
-      failed_when: _save_chart.rc == 0
-
-    - name: Assert that auth data is remove and the chart is not saved
-      # Helm binary prints the message to stderr
-      ansible.builtin.assert:
-        that:
-          - "'push access denied' in _save_chart.stderr or 'basic credential not found' in _save_chart.stderr"
-          - "_save_chart.rc != 0"
-
-    - name: Test idempotency of logout with helm < 3.18.0
-      when: helm_version is ansible.builtin.version('v3.18.0', '<')
-      block:
-
-        - name: Test logout idempotency
-          helm_registry_auth:
-            binary_path: "{{ helm_binary }}"
-            host: localhost:{{ registry_port }}
-            state: absent
-          register: _helm_registry_auth_logout_idempotency
-
-        - name: Assert logout operation did not report change
-          ansible.builtin.assert:
-            that: _helm_registry_auth_logout_idempotency is not changed
-
-    - name: Test module helm_registry_auth with wrong credentials
-      helm_registry_auth:
-        binary_path: "{{ helm_binary }}"
-        username: "{{ username }}"
-        password: "{{ wrong_password }}"
-        host: localhost:{{ registry_port }}
-        state: present
-        plain_http: true
-      register: _helm_registry_auth_wrong
-      ignore_errors: true
-
-    - name: Assert that the registry is not logged in and auth data is not saved
-      ansible.builtin.assert:
-        that:
-          - "'401' in _helm_registry_auth_wrong.stderr"
-          - "'unauthorized' in _helm_registry_auth_wrong.stderr | lower"
-          - "'{{ wrong_password }}' not in _helm_registry_auth_correct.command"
-          - "'{{ wrong_password }}' not in _helm_registry_auth_correct.stdout"
-          - "'{{ wrong_password }}' not in _helm_registry_auth_correct.stderr"

tests/integration/targets/helm_repository/aliases

@@ -1,2 +1,5 @@
-time=1
+time=20
 helm_repository
+helm_info
+helm
+helm_template

tests/integration/targets/helm_repository/defaults/main.yml

@@ -1,5 +1,3 @@
 ---
 chart_test_repo: "https://kubernetes.github.io/ingress-nginx"
-helm_versions:
-  - v3.20.0
-  - v4.0.0
+helm_binary: "/tmp/helm/{{ ansible_system | lower }}-amd64/helm"

tests/integration/targets/helm_repository/meta/main.yml

@@ -0,0 +1,5 @@
+---
+collections:
+  - kubernetes.core
+dependencies:
+  - install_helm

tests/integration/targets/helm_repository/tasks/main.yml

@@ -1,6 +1,101 @@
 ---
-- name: Run test for helm_repository module
-  ansible.builtin.include_tasks: run_tests.yml
-  loop: "{{ helm_versions }}"
-  loop_control:
-    loop_var: helm_version
+- name: "Ensure test_helm_repo doesn't exist"
+  helm_repository:
+    binary_path: "{{ helm_binary }}"
+    name: test_helm_repo
+    state: absent
+
+- name: Add test_helm_repo chart repository
+  helm_repository:
+    binary_path: "{{ helm_binary }}"
+    name: test_helm_repo
+    repo_url: "{{ chart_test_repo }}"
+  register: repository
+
+- name: Assert that test_helm_repo repository is added
+  assert:
+    that:
+      - repository is changed
+      - '"--insecure-skip-tls-verify" not in repository.command'
+
+- name: Check idempotency
+  helm_repository:
+    binary_path: "{{ helm_binary }}"
+    name: test_helm_repo
+    repo_url: "{{ chart_test_repo }}"
+  register: repository
+
+- name: Assert idempotency
+  assert:
+    that:
+      - repository is not changed
+
+- name: Failed to add repository with the same name
+  helm_repository:
+    binary_path: "{{ helm_binary }}"
+    name: test_helm_repo
+    repo_url: "https://other-charts.url"
+  register: repository_errors
+  ignore_errors: yes
+
+- name: Assert that adding repository with the same name failed
+  assert:
+    that:
+      - repository_errors is failed
+
+- name: Succesfully add repository with the same name when forcing
+  helm_repository:
+    binary_path: "{{ helm_binary }}"
+    name: test_helm_repo
+    repo_url: "{{ chart_test_repo }}"
+    force: true
+  register: repository
+
+- name: Assert that test_helm_repo repository is changed
+  assert:
+    that:
+      - repository is changed
+
+- name: Remove test_helm_repo chart repository
+  helm_repository:
+    binary_path: "{{ helm_binary }}"
+    name: test_helm_repo
+    state: absent
+  register: repository
+
+- name: Assert that test_helm_repo repository is removed
+  assert:
+    that:
+      - repository is changed
+
+- name: Check idempotency after remove
+  helm_repository:
+    binary_path: "{{ helm_binary }}"
+    name: test_helm_repo
+    state: absent
+  register: repository
+
+- name: Assert idempotency
+  assert:
+    that:
+      - repository is not changed
+
+- name: Add test_helm_repo chart repository as insecure
+  helm_repository:
+    binary_path: "{{ helm_binary }}"
+    name: test_helm_repo
+    repo_url: "{{ chart_test_repo }}"
+    insecure_skip_tls_verify: true
+  register: repository
+
+- name: Assert that repository added and flag set
+  assert:
+    that:
+      - repository is changed
+      - '"--insecure-skip-tls-verify" in repository.command'
+
+- name: Clean test_helm_repo chart repository
+  helm_repository:
+    binary_path: "{{ helm_binary }}"
+    name: test_helm_repo
+    state: absent

tests/integration/targets/helm_repository/tasks/run_tests.yml

@@ -1,105 +0,0 @@
----
-- name: "Install helm version {{ helm_version }}"
-  ansible.builtin.include_role:
-    name: install_helm
-
-- name: "Ensure test_helm_repo doesn't exist"
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    state: absent
-
-- name: Add test_helm_repo chart repository
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    repo_url: "{{ chart_test_repo }}"
-  register: repository
-
-- name: Assert that test_helm_repo repository is added
-  assert:
-    that:
-      - repository is changed
-      - '"--insecure-skip-tls-verify" not in repository.command'
-
-- name: Check idempotency
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    repo_url: "{{ chart_test_repo }}"
-  register: repository
-
-- name: Assert idempotency
-  assert:
-    that:
-      - repository is not changed
-
-- name: Failed to add repository with the same name
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    repo_url: "https://other-charts.url"
-  register: repository_errors
-  ignore_errors: true
-
-- name: Assert that adding repository with the same name failed
-  assert:
-    that:
-      - repository_errors is failed
-
-- name: Succesfully add repository with the same name when forcing
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    repo_url: "{{ chart_test_repo }}"
-    force: true
-  register: repository
-
-- name: Assert that test_helm_repo repository is changed
-  assert:
-    that:
-      - repository is changed
-
-- name: Remove test_helm_repo chart repository
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    state: absent
-  register: repository
-
-- name: Assert that test_helm_repo repository is removed
-  assert:
-    that:
-      - repository is changed
-
-- name: Check idempotency after remove
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    state: absent
-  register: repository
-
-- name: Assert idempotency
-  assert:
-    that:
-      - repository is not changed
-
-- name: Add test_helm_repo chart repository as insecure
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    repo_url: "{{ chart_test_repo }}"
-    insecure_skip_tls_verify: true
-  register: repository
-
-- name: Assert that repository added and flag set
-  assert:
-    that:
-      - repository is changed
-      - '"--insecure-skip-tls-verify" in repository.command'
-
-- name: Clean test_helm_repo chart repository
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    state: absent

tests/integration/targets/helm_set_values/defaults/main.yml

@@ -1,5 +1,3 @@
 ---
+helm_binary: "/tmp/helm/{{ ansible_system | lower }}-amd64/helm"
 helm_namespace: helm-set-values
-helm_versions:
-  - v3.10.3
-  - v4.0.0

tests/integration/targets/helm_set_values/tasks/main.yml

@@ -25,14 +25,79 @@
     - user_values.status["release_values"]["phase"] == "integration"
     - user_values.status["release_values"]["versioned"] is false
 
-- block:
-  - name: create temporary file to save values in
-    tempfile:
-      suffix: .yml
-    register: ymlfile
+# install chart using set_values and release_values
+- name: Install helm binary (> 3.10.0) requires to use set-json
+  include_role:
+    name: install_helm
+  vars:
+    helm_version: "v3.10.3"
 
-  - ansible.builtin.include_tasks: run_tests.yml
-    loop: "{{ helm_versions }}"
+- name: Install helm using set_values parameters
+  helm:
+    binary_path: "{{ helm_binary }}"
+    chart_ref: oci://registry-1.docker.io/bitnamicharts/apache
+    release_name: test-apache
+    release_namespace: "{{ helm_namespace }}"
+    create_namespace: true
+    set_values:
+    - value: 'master.image={"registry": "docker.io", "repository": "bitnami/apache", "tag": "2.4.54-debian-11-r74"}'
+      value_type: json
+    release_values:
+      replicaCount: 3
+
+- name: Get release info
+  helm_info:
+    binary_path: "{{ helm_binary }}"
+    release_name: test-apache
+    release_namespace: "{{ helm_namespace }}"
+  register: values
+
+- name: Assert that release was created with user-defined variables
+  assert:
+    that:
+    - values.status["release_values"].replicaCount == 3
+    - values.status["release_values"].master.image.registry == "docker.io"
+    - values.status["release_values"].master.image.repository == "bitnami/apache"
+    - values.status["release_values"].master.image.tag == "2.4.54-debian-11-r74"
+
+# install chart using set_values and values_files
+- name: create temporary file to save values in
+  tempfile:
+    suffix: .yml
+  register: ymlfile
+
+- block:
+  - name: copy content into values file
+    copy:
+      content: |
+        ---
+        mode: distributed
+      dest: "{{ ymlfile.path }}"
+
+  - name: Install helm using set_values parameters
+    helm:
+      binary_path: "{{ helm_binary }}"
+      chart_ref: oci://registry-1.docker.io/bitnamicharts/minio
+      release_name: test-minio
+      release_namespace: "{{ helm_namespace }}"
+      create_namespace: true
+      set_values:
+      - value: 'disableWebUI=true'
+      values_files:
+      - "{{ ymlfile.path }}"
+
+  - name: Get release info
+    helm_info:
+      binary_path: "{{ helm_binary }}"
+      release_name: test-minio
+      release_namespace: "{{ helm_namespace }}"
+    register: values
+
+  - name: Assert that release was created with user-defined variables
+    assert:
+      that:
+      - values.status["release_values"].mode == "distributed"
+      - values.status["release_values"].disableWebUI is true
 
   always:
   - name: Delete temporary file

tests/integration/targets/helm_set_values/tasks/run_tests.yml

@@ -1,68 +0,0 @@
----
-# install chart using set_values and release_values
-- name: 'Install helm binary (> 3.10.0) requires to use set-json (helm_version={{ item }})'
-  include_role:
-    name: install_helm
-  vars:
-    helm_version: "{{ item }}"
-
-- name: Install helm using set_values parameters
-  helm:
-    binary_path: "{{ helm_binary }}"
-    chart_ref: oci://registry-1.docker.io/bitnamicharts/apache
-    release_name: 'test-apache-{{ item }}'
-    release_namespace: "{{ helm_namespace }}"
-    create_namespace: true
-    set_values:
-    - value: 'master.image={"registry": "docker.io", "repository": "bitnami/apache", "tag": "2.4.54-debian-11-r74"}'
-      value_type: json
-    release_values:
-      replicaCount: 3
-
-- name: Get release info
-  helm_info:
-    binary_path: "{{ helm_binary }}"
-    release_name: 'test-apache-{{ item }}'
-    release_namespace: "{{ helm_namespace }}"
-  register: values
-
-- name: Assert that release was created with user-defined variables
-  assert:
-    that:
-    - values.status["release_values"].replicaCount == 3
-    - values.status["release_values"].master.image.registry == "docker.io"
-    - values.status["release_values"].master.image.repository == "bitnami/apache"
-    - values.status["release_values"].master.image.tag == "2.4.54-debian-11-r74"
-
-# install chart using set_values and values_files
-- name: copy content into values file
-  copy:
-    content: |
-      ---
-      mode: distributed
-    dest: "{{ ymlfile.path }}"
-
-- name: Install helm using set_values parameters
-  helm:
-    binary_path: "{{ helm_binary }}"
-    chart_ref: oci://registry-1.docker.io/bitnamicharts/minio
-    release_name: 'test-minio-{{ item }}'
-    release_namespace: "{{ helm_namespace }}"
-    create_namespace: true
-    set_values:
-    - value: 'disableWebUI=true'
-    values_files:
-    - "{{ ymlfile.path }}"
-
-- name: Get release info
-  helm_info:
-    binary_path: "{{ helm_binary }}"
-    release_name: 'test-minio-{{ item }}'
-    release_namespace: "{{ helm_namespace }}"
-  register: values
-
-- name: Assert that release was created with user-defined variables
-  assert:
-    that:
-    - values.status["release_values"].mode == "distributed"
-    - values.status["release_values"].disableWebUI is true

tests/integration/targets/helm_v3_15_4/aliases

@@ -1,4 +0,0 @@
-helm
-helm_template
-helm_info
-helm_repository

tests/integration/targets/helm_v3_15_4/inventory.ini

@@ -1,2 +0,0 @@
-[all]
-v3.15.4

tests/integration/targets/helm_v3_15_4/play.yaml

@@ -1,11 +0,0 @@
-- name: Run tests for Helm v3.15.4
-  hosts: all
-  connection: local
-  gather_facts: true
-
-  vars:
-    ansible_python_interpreter: "{{ ansible_playbook_python  }}"
-    helm_version: "{{ inventory_hostname }}"
-
-  roles:
-    - role: helm

tests/integration/targets/helm_v3_15_4/runme.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -eux
-export ANSIBLE_ROLES_PATH=../
-ansible-playbook play.yaml -i inventory.ini "$@"