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>

.ansible-lint

@@ -3,6 +3,7 @@ profile: production
 
 exclude_paths:
   - .ansible/
+  - .github/
   - tests/integration
   - tests/unit
   - tests/sanity

.ansible-lint-ignore

@@ -3,3 +3,4 @@
 plugins/connection/kubectl.py no-changed-when
 # false positive result
 plugins/connection/kubectl.py var-naming[no-reserved]
+plugins/connection/kubectl.py jinja[invalid]

.github/workflows/integration-tests.yaml

@@ -26,6 +26,7 @@ jobs:
         with:
           path: ${{ env.source_dir }}
           fetch-depth: "0"
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: list changes for pull request
         id: splitter
@@ -54,13 +55,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ansible-version:
-          - milestone
+        # Ref must match a branch/tag on github.com/ansible/ansible (e.g. stable-2.18, not 2.18).
+        ansible-version: ["stable-2.18", "milestone"]
+        enable-turbo-mode: [true, false]
+        exclude:
+          - ansible-version: "milestone"
+            enable-turbo-mode: true
         python-version:
           - "3.12"
-        enable-turbo-mode:
-          - true
-          - false
         workflow-id: ${{ fromJson(needs.splitter.outputs.test_jobs) }}
     name: "integration-py${{ matrix.python-version }}-${{ matrix.ansible-version }}-${{ matrix.workflow-id }}-enable_turbo=${{ matrix.enable-turbo-mode }}"
     steps:
@@ -106,6 +108,7 @@ jobs:
           source_path: ${{ env.source }}
 
       - name: checkout ansible-collections/cloud.common
+        if: ${{ matrix.enable-turbo-mode == true }}
         uses: ansible-network/github_actions/.github/actions/checkout_dependency@main
         with:
           repository: ansible-collections/cloud.common
@@ -127,6 +130,7 @@ jobs:
           ref: main
 
       - name: install cloud.common collection
+        if: ${{ matrix.enable-turbo-mode == true }}
         uses: ansible-network/github_actions/.github/actions/build_install_collection@main
         with:
           install_python_dependencies: true

.github/workflows/label-new-prs.yaml

@@ -0,0 +1,28 @@
+---
+name: label new prs
+on:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+      - converted_to_draft
+      - ready_for_review
+
+jobs:
+  add_label:
+    if: github.actor != 'patchback[bot]'
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Add 'needs_triage' label if the pr is not a draft
+        uses: actions-ecosystem/action-add-labels@v1
+        if: github.event.pull_request.draft == false
+        with:
+          labels: needs_triage
+
+      - name: Remove 'needs_triage' label if the pr is a draft
+        uses: actions-ecosystem/action-remove-labels@v1
+        if: github.event.pull_request.draft == true
+        with:
+          labels: needs_triage

.github/workflows/linters.yaml

@@ -20,4 +20,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: run-ansible-lint
-        uses: ansible/ansible-lint@v25.1.2
+        uses: ansible/ansible-lint@main
+        with:
+          gh_action_ref: "v25.5.0"

.gitignore

@@ -21,3 +21,6 @@ tests/integration/*-chart-*.tgz
 # ansible-test generated file
 tests/integration/inventory
 tests/integration/*-*.yml
+
+# VS Code settings
+.vscode/

.yamllint

@@ -26,3 +26,4 @@ ignore: |
   .tox
   .ansible
   tests/output
+  plugins/connection/kubectl.py

CHANGELOG.rst

@@ -4,19 +4,68 @@ Kubernetes Collection Release Notes
 
 .. contents:: Topics
 
-v6.0.0
+v5.4.2
 ======
 
 Release Summary
 ---------------
 
-This major release removes the deprecated ``k8s`` inventory plugin and also removes ``ansible-core<2.16`` support.
+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.
 
-Breaking Changes / Porting Guide
---------------------------------
+Minor 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).
+- 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).
+
+Deprecated Features
+-------------------
+
+- helm - the ``status.values`` return value has been deprecated and will be removed in a release after 2027-01-08. Use ``status.release_values`` instead (https://github.com/ansible-collections/kubernetes.core/pull/1056).
+- helm_info - the ``status.values`` return value has been deprecated and will be removed in a release after 2027-01-08. Use ``status.release_values`` instead (https://github.com/ansible-collections/kubernetes.core/pull/1056).
+
+Security Fixes
+--------------
+
+- Selectively redact sensitive info from kubeconfig instead of applying blanket ``no_log=True`` (https://github.com/ansible-collections/kubernetes.core/pull/1014).
+
+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).
+- 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).
+
+v5.4.1
+======
+
+Release Summary
+---------------
+
+This release includes bugfixes for k8s service field handling, k8s_cp init containers support, and removes deprecated ansible.module_utils.six imports.
+
+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).
+- module_utils/k8s/service - hide fields first before creating diffs (https://github.com/ansible-collections/kubernetes.core/pull/915).
+
+v5.4.0
+======
+
+Release Summary
+---------------
+
+This release updates the ``helm_registry_auth`` module to match the behavior of ``helm >= 3.18.0`` which reports a successful logout regardless of the current state (i.e., no idempotency).
+
+Minor Changes
+-------------
+
+- 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
 ======
@@ -29,15 +78,15 @@ This release includes minor changes, bug fixes and also bumps ``ansible-lint`` v
 Minor Changes
 -------------
 
-- kubernetes.core - Bump version of ``ansible-lint`` to ``25.1.2`` (https://github.com/ansible-collections/kubernetes.core/pull/919).
+- 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).
 
 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).
+- 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).
 
 v5.2.0
 ======
@@ -65,7 +114,7 @@ This release came with new module ``helm_registry_auth``, improvements to the er
 Minor Changes
 -------------
 
-- Bump version of ansible-lint to minimum 24.7.0 (https://github.com/ansible-collections/kubernetes.core/pull/765).
+- Bump version of ``ansible-lint`` to minimum 24.7.0 (https://github.com/ansible-collections/kubernetes.core/pull/765).
 - Parameter insecure_registry added to helm_template as equivalent of insecure-skip-tls-verify (https://github.com/ansible-collections/kubernetes.core/pull/805).
 - k8s_drain - Improve error message for pod disruption budget when draining a node (https://github.com/ansible-collections/kubernetes.core/issues/797).
 

Makefile

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

README.md

@@ -21,9 +21,9 @@ 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 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`).
@@ -32,6 +32,10 @@ A collection may contain metadata that identifies these versions.
 PEP440 is the schema used to describe the versions of Ansible.
 <!--end requires_ansible-->
 
+### Helm Version Compatibility
+
+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
 
 * Collection supports 3.9+
@@ -52,11 +56,16 @@ 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
 
+### 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
 --- | ---
@@ -101,7 +110,7 @@ You can also include it in a `requirements.yml` file and install it via `ansible
 ---
 collections:
   - name: kubernetes.core
-    version: 6.0.0
+    version: 5.4.2
 ```
 
 ### Installing the Kubernetes Python Library
@@ -180,7 +189,6 @@ For documentation on how to use individual modules and other content included in
 
 ## Ansible Turbo Mode Tech Preview
 
-
 The ``kubernetes.core`` collection supports Ansible Turbo mode as a tech preview via the ``cloud.common`` collection. By default, this feature is disabled. To enable Turbo mode for modules, set the environment variable `ENABLE_TURBO_MODE=1` on the managed node. For example:
 
 ```yaml
@@ -219,7 +227,7 @@ You can run the collection's test suites with the commands:
 
 ### Testing with `molecule`
 
-There are also integration tests in the `molecule` directory which are meant to be run against a local Kubernetes cluster, e.g. using [KinD](https://kind.sigs.k8s.io) or [Minikube](https://minikube.sigs.k8s.io). To setup a local cluster using KinD and run Molecule:
+There are also integration tests in the `molecule` directory which are meant to be run against a local Kubernetes cluster, e.g. using [KinD](https://kind.sigs.k8s.io) or [Minikube](https://minikube.sigs.k8s.io). To set up a local cluster using KinD and run Molecule:
 
     kind create cluster
     make test-molecule
@@ -258,7 +266,7 @@ For more information about communication, refer to the [Ansible Communication gu
 For the latest supported versions, refer to the release notes below.
 
 If you encounter issues or have questions, you can submit a support request through the following channels:
- - GitHub Issues: Report bugs, request features, or ask questions by opening an issue in the [GitHub repository]((https://github.com/ansible-collections/kubernetes.core/).
+ - GitHub Issues: Report bugs, request features, or ask questions by opening an issue in the [GitHub repository](https://github.com/ansible-collections/kubernetes.core/).
 
 ## Release Notes
 
@@ -270,9 +278,8 @@ We follow the [Ansible Code of Conduct](https://docs.ansible.com/ansible/devel/c
 
 If you encounter abusive behavior, please refer to the [policy violations](https://docs.ansible.com/ansible/devel/community/code_of_conduct.html#policy-violations) section of the Code for information on how to raise a complaint.
 
-
 ## License
 
 GNU General Public License v3.0 or later
 
-See LICENCE to see the full text.
+See LICENSE to see the full text.

changelogs/changelog.yaml

@@ -977,7 +977,7 @@ releases:
       - kustomize - kustomize plugin fails with deprecation warnings (https://github.com/ansible-collections/kubernetes.core/issues/639).
       - waiter - Fix waiting for daemonset when desired number of pods is 0. (https://github.com/ansible-collections/kubernetes.core/pull/756).
       minor_changes:
-      - Bump version of ansible-lint to minimum 24.7.0 (https://github.com/ansible-collections/kubernetes.core/pull/765).
+      - Bump version of ``ansible-lint`` to minimum 24.7.0 (https://github.com/ansible-collections/kubernetes.core/pull/765).
       - Parameter insecure_registry added to helm_template as equivalent of insecure-skip-tls-verify
         (https://github.com/ansible-collections/kubernetes.core/pull/805).
       - k8s_drain - Improve error message for pod disruption budget when draining
@@ -1029,13 +1029,13 @@ releases:
       - 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).
       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 ``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).
       release_summary: This release includes minor changes, bug fixes and also bumps
-        ansible-lint version to ``25.1.2``.
+        ``ansible-lint`` version to ``25.1.2``.
     fragments:
     - 20250324-k8s_info-templating.yaml
     - 5.3.0.yml
@@ -1044,11 +1044,75 @@ releases:
     - 898-k8s-dont-delete-in-check-mode.yaml
     - 919-update-ansible-lint-version.yaml
     release_date: '2025-05-16'
-  6.0.0:
+  5.4.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).
+      minor_changes:
+      - Module ``helm_registry_auth`` does not support idempotency with ``helm >=
+        3.18.0`` (https://github.com/ansible-collections/kubernetes.core/pull/946).
+      release_summary: This release updates the ``helm_registry_auth`` module to match
+        the behavior of ``helm >= 3.18.0`` which reports a successful logout regardless
+        of the current state (i.e., no idempotency).
     fragments:
-    - 20250121-breaking-changes-6.0.0.yml
-    release_date: '2025-05-19'
+    - 20250411-kubeconfig-no_log-revert.yaml
+    - 20250503-fix-unit-tests.yml
+    - 20250605-fix-helm_registry_auth-integration_test.yaml
+    - 5.4.0.yml
+    release_date: '2025-08-12'
+  5.4.1:
+    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).
+      - 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
+        imports.
+    fragments:
+    - 20250428-k8s-service-hide-fields-first.yaml
+    - 20250731-fix-k8s_cp-initcontainers.yaml
+    - 20250922-remove-ansible-six-imports.yaml
+    - 5.4.1.yml
+    release_date: '2025-10-07'
+  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
+        (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).
+      deprecated_features:
+      - helm - the ``status.values`` return value has been deprecated and will be
+        removed in a release after 2027-01-08. Use ``status.release_values`` instead
+        (https://github.com/ansible-collections/kubernetes.core/pull/1056).
+      - helm_info - the ``status.values`` return value has been deprecated and will
+        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:
+      - 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 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).
+    fragments:
+    - 1033-warnings-deprecations.yaml
+    - 20251002-fix-k8s-actiongroup.yaml
+    - 20251007-selective-kubeconfig-redaction.yaml
+    - 20251115-limit-versions-of-helm.yaml
+    - 20251220-fix-K8S_AUTH_VERIFY_SSL-in-kubectl-connecton-plugion.yaml
+    - 20260107-add-idempodency-for-helm-pull.yaml
+    - 20260108-fix-sanity-failures.yml
+    - 5-4-2.yaml
+    release_date: '2026-02-03'

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_pull_module.rst

@@ -27,7 +27,7 @@ Requirements
 ------------
 The below requirements are needed on the host that executes this module.
 
-- helm >= 3.0 (https://github.com/helm/helm/releases)
+- helm >= 3.0, <4.0.0 (https://github.com/helm/helm/releases)
 
 
 Parameters
@@ -174,6 +174,28 @@ Parameters
                         <div>location to write the chart.</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>force</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.3.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>Force download of the chart even if it already exists in the destination directory.</div>
+                        <div>By default, the module will skip downloading if the chart with the same version already exists for idempotency.</div>
+                        <div>When used with O(untar_chart=true), will remove any existing chart directory before extracting.</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -376,11 +398,28 @@ Examples
         username: myuser
         password: mypassword123
 
+    - name: Download Chart (force re-download even if exists)
+      kubernetes.core.helm_pull:
+        chart_ref: redis
+        repo_url: https://charts.bitnami.com/bitnami
+        chart_version: '17.0.0'
+        destination: /path/to/chart
+        force: yes
+
+    - name: Download and untar chart (force re-extraction even if directory exists)
+      kubernetes.core.helm_pull:
+        chart_ref: redis
+        repo_url: https://charts.bitnami.com/bitnami
+        chart_version: '17.0.0'
+        destination: /path/to/chart
+        untar_chart: yes
+        force: yes
+
 
 
 Return Values
 -------------
-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:
+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:
 
 .. raw:: html
 
@@ -407,6 +446,23 @@ Common return values are documented `here <https://docs.ansible.com/ansible/late
                         <div style="font-size: smaller; color: blue; word-wrap: break-word; word-break: break-all;">helm pull --repo test ...</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="return-"></div>
+                    <b>msg</b>
+                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
+                    <div style="font-size: small">
+                      <span style="color: purple">string</span>
+                    </div>
+                </td>
+                <td>when chart already exists</td>
+                <td>
+                            <div>A message indicating the result of the operation.</div>
+                    <br/>
+                        <div style="font-size: smaller"><b>Sample:</b></div>
+                        <div style="font-size: smaller; color: blue; word-wrap: break-word; word-break: break-all;">Chart redis version 17.0.0 already exists in destination directory</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="1">
                     <div class="ansibleOptionAnchor" id="return-"></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
@@ -170,6 +170,7 @@ Parameters
                         <div>Desired state of the registry.</div>
                         <div>If set to V(present) attempt to log in to the remote registry server using the URL specified in O(host).</div>
                         <div>If set to V(absent) attempt to log out from the remote registry server using the URL specified in O(host).</div>
+                        <div>As helm &gt;= 3.18.0 reports successful logout even if the user is not logged in, this module will report a change regardless of the current state.</div>
                 </td>
             </tr>
             <tr>
@@ -214,7 +215,7 @@ Examples
 
 Return Values
 -------------
-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:
+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:
 
 .. raw:: html
 

docs/kubernetes.core.k8s_cp_module.rst

@@ -512,6 +512,7 @@ Notes
 
 .. note::
    - the tar binary is required on the container when copying from local filesystem to pod.
+   - the (init) container has to be started before you copy files or directories to it.
    - To avoid SSL certificate validation errors when ``validate_certs`` is *True*, the full certificate chain for the API server must be provided via ``ca_cert`` or in the kubeconfig file.
 
 

docs/kubernetes.core.k8s_info_module.rst

@@ -701,6 +701,21 @@ Examples
         wait_sleep: 10
         wait_timeout: 360
 
+    - name: Wait for OpenShift bootstrap to complete
+      kubernetes.core.k8s_info:
+        api_version: v1
+        kind: ConfigMap
+        name: bootstrap
+        namespace: kube-system
+      register: ocp_bootstrap_status
+      until: >
+        ocp_bootstrap_status.resources is defined and
+        (ocp_bootstrap_status.resources | length > 0) and
+        (ocp_bootstrap_status.resources[0].data.status is defined) and
+        (ocp_bootstrap_status.resources[0].data.status == 'complete')
+      retries: 60
+      delay: 15
+
 
 
 Return Values

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.

galaxy.yml

@@ -25,7 +25,7 @@ tags:
   - openshift
   - okd
   - cluster
-version: 6.0.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:
@@ -8,23 +8,27 @@ action_groups:
     - helm_repository
   k8s:
     - k8s
-    - k8s_exec
-    - k8s_info
-    - k8s_log
-    - k8s_scale
-    - k8s_service
+    - k8s_cluster_info
     - k8s_cp
     - k8s_drain
+    - k8s_exec
+    - k8s_info
+    - k8s_json_patch
+    - k8s_log
+    - k8s_rollback
+    - k8s_scale
+    - k8s_service
 
 plugin_routing:
   inventory:
     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

@@ -22,7 +22,6 @@ from ansible.errors import (
 )
 from ansible.module_utils._text import to_bytes, to_native, to_text
 from ansible.module_utils.parsing.convert_bool import boolean
-from ansible.module_utils.six import iteritems, string_types
 from ansible.plugins.action import ActionBase
 
 try:
@@ -100,7 +99,7 @@ class ActionModule(ActionBase):
             "trim_blocks": True,
             "lstrip_blocks": False,
         }
-        if isinstance(template, string_types):
+        if isinstance(template, str):
             # treat this as raw_params
             template_param["path"] = template
         elif isinstance(template, dict):
@@ -120,7 +119,7 @@ class ActionModule(ActionBase):
             ):
                 if s_type in template_args:
                     value = ensure_type(template_args[s_type], "string")
-                    if value is not None and not isinstance(value, string_types):
+                    if value is not None and not isinstance(value, str):
                         raise AnsibleActionFail(
                             "%s is expected to be a string, but got %s instead"
                             % (s_type, type(value))
@@ -196,7 +195,7 @@ class ActionModule(ActionBase):
             )
 
         template_params = []
-        if isinstance(template, string_types) or isinstance(template, dict):
+        if isinstance(template, str) or isinstance(template, dict):
             template_params.append(self.get_template_args(template))
         elif isinstance(template, list):
             for element in template:
@@ -246,7 +245,7 @@ class ActionModule(ActionBase):
                 # add ansible 'template' vars
                 temp_vars = copy.deepcopy(task_vars)
                 overrides = {}
-                for key, value in iteritems(template_item):
+                for key, value in template_item.items():
                     if hasattr(self._templar.environment, key):
                         if value is not None:
                             overrides[key] = value
@@ -303,7 +302,7 @@ class ActionModule(ActionBase):
             )
 
     def get_kubeconfig(self, kubeconfig, remote_transport, new_module_args):
-        if isinstance(kubeconfig, string_types):
+        if isinstance(kubeconfig, str):
             # find the kubeconfig in the expected search path
             if not remote_transport:
                 # kubeconfig is local

plugins/connection/kubectl.py

@@ -265,6 +265,7 @@ import tempfile
 
 from ansible.errors import AnsibleError, AnsibleFileNotFound
 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
 from ansible.plugins.connection import BUFSIZE, ConnectionBase
@@ -324,9 +325,12 @@ class Connection(ConnectionBase):
         # Build command options based on doc string
         doc_yaml = AnsibleLoader(self.documentation).get_single_data()
         for key in doc_yaml.get("options"):
-            if key.endswith("verify_ssl") and self.get_option(key) != "":
-                # Translate verify_ssl to skip_verify_ssl, and output as string
-                skip_verify_ssl = not self.get_option(key)
+            if key == "validate_certs" and self.get_option(key) != "":
+                # Translate validate_certs to --insecure-skip-tls-verify flag
+                # validate_certs=True means verify certs (don't skip verification)
+                # validate_certs=False means don't verify certs (skip verification)
+                validate_certs_value = boolean(self.get_option(key), strict=False)
+                skip_verify_ssl = not validate_certs_value
                 local_cmd.append(
                     "{0}={1}".format(
                         self.connection_options[key], str(skip_verify_ssl).lower()

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/k8s.py

@@ -86,14 +86,48 @@ DOCUMENTATION = """
         description:
         - Provide a username for authenticating with the API. Can also be specified via K8S_AUTH_USERNAME environment
           variable.
+      no_proxy:
+        description:
+        - The comma separated list of hosts/domains/IP/CIDR that shouldn't go through proxy.
+          Can also be specified via K8S_AUTH_NO_PROXY environment variable.
+        - Please note that this module does not pick up typical proxy settings from the environment (e.g. NO_PROXY).
+        - This feature requires kubernetes>=19.15.0.
+          When kubernetes library is less than 19.15.0, it fails even if no_proxy is set correctly.
+        type: str
       password:
         description:
         - Provide a password for authenticating with the API. Can also be specified via K8S_AUTH_PASSWORD environment
           variable.
+      proxy:
+        description:
+        - The URL of an HTTP proxy to use for the connection. Can also be specified via K8S_AUTH_PROXY environment variable.
+        - Please note that this module does not pick up typical proxy settings from the environment (e.g. HTTP_PROXY).
+        type: str
+      proxy_headers:
+        description:
+        - The Header used for the HTTP proxy.
+        - Documentation can be found here
+          U(https://urllib3.readthedocs.io/en/latest/reference/urllib3.util.html?highlight=proxy_headers#urllib3.util.make_headers).
+        type: dict
+        suboptions:
+          proxy_basic_auth:
+            type: str
+            description:
+            - Colon-separated username:password for proxy basic authentication header.
+            - Can also be specified via K8S_AUTH_PROXY_HEADERS_PROXY_BASIC_AUTH environment.
+          basic_auth:
+            type: str
+            description:
+            - Colon-separated username:password for basic authentication header.
+            - Can also be specified via K8S_AUTH_PROXY_HEADERS_BASIC_AUTH environment.
+          user_agent:
+            type: str
+            description:
+            - String representing the user-agent you want, such as foo/1.0.
+            - Can also be specified via K8S_AUTH_PROXY_HEADERS_USER_AGENT environment.
       client_cert:
         description:
-        - Path to a certificate used to authenticate with the API. Can also be specified via K8S_AUTH_CERT_FILE
-          environment
+        - 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:

plugins/module_utils/args_common.py

@@ -1,16 +1,64 @@
 from __future__ import absolute_import, division, print_function
 
-from ansible.module_utils.six import string_types
-
 __metaclass__ = type
 
+import warnings
+
 
 def list_dict_str(value):
-    if isinstance(value, (list, dict, string_types)):
+    if isinstance(value, (list, dict, str)):
         return value
     raise TypeError
 
 
+def extract_sensitive_values_from_kubeconfig(kubeconfig_data):
+    """
+    Extract only sensitive string values from kubeconfig data for no_log_values.
+
+    :arg kubeconfig_data: Dictionary containing kubeconfig data
+    :returns: Set of sensitive string values to be added to no_log_values
+    """
+    values = set()
+    sensitive_fields = {
+        "token",
+        "password",
+        "secret",
+        "client-key-data",
+        "client-certificate-data",
+        "certificate-authority-data",
+        "api_key",
+        "access-token",
+        "refresh-token",
+    }
+
+    # Check API version and warn if not v1
+    if isinstance(kubeconfig_data, dict):
+        api_version = kubeconfig_data.get("apiVersion", "v1")
+        if api_version != "v1":
+            warnings.warn(
+                f"Kubeconfig API version '{api_version}' is not 'v1'. "
+                f"Sensitive field redaction is only guaranteed for API version 'v1'. "
+                f"Some sensitive data may not be properly redacted from the logs.",
+                UserWarning,
+            )
+
+    def _extract_recursive(data, current_path=""):
+        if isinstance(data, dict):
+            for key, value in data.items():
+                path = f"{current_path}.{key}" if current_path else key
+                if key in sensitive_fields:
+                    if isinstance(value, str):
+                        values.add(value)
+                else:
+                    _extract_recursive(value, path)
+        elif isinstance(data, list):
+            for i, item in enumerate(data):
+                _extract_recursive(item, f"{current_path}[{i}]")
+
+    _extract_recursive(kubeconfig_data)
+    return values
+
+
 AUTH_PROXY_HEADERS_SPEC = dict(
     proxy_basic_auth=dict(type="str", no_log=True),
     basic_auth=dict(type="str", no_log=True),
@@ -18,7 +66,7 @@ AUTH_PROXY_HEADERS_SPEC = dict(
 )
 
 AUTH_ARG_SPEC = {
-    "kubeconfig": {"type": "raw", "no_log": True},
+    "kubeconfig": {"type": "raw"},
     "context": {},
     "host": {},
     "api_key": {"no_log": True},

plugins/module_utils/copy.py

@@ -96,7 +96,7 @@ class K8SCopy(metaclass=ABCMeta):
             return error, stdout, stderr
         except Exception as e:
             self.module.fail_json(
-                msg="Error while running/parsing from pod {1}/{2} command='{0}' : {3}".format(
+                msg="Error while running/parsing from pod {0}/{1} command='{2}' : {3}".format(
                     self.namespace, self.name, cmd, to_native(e)
                 )
             )
@@ -278,11 +278,15 @@ class K8SCopyFromPod(K8SCopy):
     def run(self):
         self.files_to_copy = self.list_remote_files()
         if self.files_to_copy == []:
+            # Using warn method instead of passing warnings to exit_json as it is
+            # deprecated in ansible-core>=2.19.0
+            self._module.warn(
+                "No file found from directory '{0}' into remote Pod.".format(
+                    self.remote_path
+                )
+            )
             self.module.exit_json(
                 changed=False,
-                warning="No file found from directory '{0}' into remote Pod.".format(
-                    self.remote_path
-                ),
             )
         self.copy()
 
@@ -435,11 +439,21 @@ def check_pod(svc):
 
     try:
         result = svc.client.get(resource, name=name, namespace=namespace)
-        containers = [
-            c["name"] for c in result.to_dict()["status"]["containerStatuses"]
-        ]
-        if container and container not in containers:
+        containers = dict(
+            {
+                c["name"]: c
+                for cl in ["initContainerStatuses", "containerStatuses"]
+                for c in result.to_dict()["status"].get(cl, [])
+            }
+        )
+        if container and container not in containers.keys():
             module.fail_json(msg="Pod has no container {0}".format(container))
-        return containers
+        if (
+            container
+            and container in containers
+            and not bool(containers[container].get("started", False))
+        ):
+            module.fail_json(msg="Pod container {0} is not started".format(container))
+        return containers.keys()
     except Exception as exc:
         _fail(exc)

plugins/module_utils/helm.py

@@ -15,7 +15,9 @@ import tempfile
 import traceback
 
 from ansible.module_utils.basic import AnsibleModule, missing_required_lib
-from ansible.module_utils.six import string_types
+from ansible_collections.kubernetes.core.plugins.module_utils.args_common import (
+    extract_sensitive_values_from_kubeconfig,
+)
 from ansible_collections.kubernetes.core.plugins.module_utils.version import (
     LooseVersion,
 )
@@ -113,12 +115,19 @@ class AnsibleHelmModule(object):
         kubeconfig_content = None
         kubeconfig = self.params.get("kubeconfig")
         if kubeconfig:
-            if isinstance(kubeconfig, string_types):
+            if isinstance(kubeconfig, str):
                 with open(os.path.expanduser(kubeconfig)) as fd:
                     kubeconfig_content = yaml.safe_load(fd)
             elif isinstance(kubeconfig, dict):
                 kubeconfig_content = kubeconfig
 
+            # Redact sensitive fields from kubeconfig for logging purposes
+            if kubeconfig_content:
+                # Add original sensitive values to no_log_values to prevent them from appearing in logs
+                self._module.no_log_values.update(
+                    extract_sensitive_values_from_kubeconfig(kubeconfig_content)
+                )
+
         if self.params.get("ca_cert"):
             ca_cert = self.params.get("ca_cert")
             if LooseVersion(self.get_helm_version()) < LooseVersion("3.5.0"):
@@ -193,6 +202,24 @@ class AnsibleHelmModule(object):
             return m.group(1)
         return None
 
+    def validate_helm_version(self):
+        """
+        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("3.0.0")) or (
+            LooseVersion(helm_version) >= LooseVersion("4.0.0")
+        ):
+            self.fail_json(
+                msg="Helm version must be >=3.0.0,<4.0.0, current version is {0}".format(
+                    helm_version
+                )
+            )
+
     def get_values(self, release_name, get_all=False):
         """
         Get Values from deployed release

plugins/module_utils/helm_args_common.py

@@ -16,7 +16,6 @@ HELM_AUTH_ARG_SPEC = dict(
         type="raw",
         aliases=["kubeconfig_path"],
         fallback=(env_fallback, ["K8S_AUTH_KUBECONFIG"]),
-        no_log=True,
     ),
     host=dict(type="str", fallback=(env_fallback, ["K8S_AUTH_HOST"])),
     ca_cert=dict(

plugins/module_utils/k8s/client.py

@@ -5,7 +5,6 @@ import hashlib
 import os
 from typing import Any, Dict, List, Optional
 
-from ansible.module_utils.six import iteritems, string_types
 from ansible_collections.kubernetes.core.plugins.module_utils.args_common import (
     AUTH_ARG_MAP,
     AUTH_ARG_SPEC,
@@ -115,7 +114,7 @@ def _load_config(auth: Dict) -> None:
         "persist_config": auth.get("persist_config"),
     }
     if kubeconfig:
-        if isinstance(kubeconfig, string_types):
+        if isinstance(kubeconfig, str):
             kubernetes.config.load_kube_config(config_file=kubeconfig, **optional_arg)
         elif isinstance(kubeconfig, dict):
             kubernetes.config.load_kube_config_from_dict(
@@ -163,7 +162,7 @@ def _create_configuration(auth: Dict):
     except AttributeError:
         configuration = kubernetes.client.Configuration()
 
-    for key, value in iteritems(auth):
+    for key, value in auth.items():
         if key in AUTH_ARG_MAP.keys() and value is not None:
             if key == "api_key":
                 setattr(

plugins/module_utils/k8s/core.py

@@ -3,6 +3,9 @@ from typing import Optional
 
 from ansible.module_utils.basic import AnsibleModule, missing_required_lib
 from ansible.module_utils.common.text.converters import to_text
+from ansible_collections.kubernetes.core.plugins.module_utils.args_common import (
+    extract_sensitive_values_from_kubeconfig,
+)
 from ansible_collections.kubernetes.core.plugins.module_utils.version import (
     LooseVersion,
 )
@@ -33,6 +36,15 @@ class AnsibleK8SModule:
 
         self._module = self.settings["module_class"](**kwargs)
 
+        # Apply kubeconfig redaction for logging purposes
+        if hasattr(self._module, "params") and hasattr(self._module, "no_log_values"):
+            kubeconfig = self._module.params.get("kubeconfig")
+            if kubeconfig and isinstance(kubeconfig, dict):
+                # Add sensitive values to no_log_values to prevent them from appearing in logs
+                self._module.no_log_values.update(
+                    extract_sensitive_values_from_kubeconfig(kubeconfig)
+                )
+
         if self.settings["check_k8s"]:
             self.requires("kubernetes")
             self.has_at_least("kubernetes", "24.2.0", warn=True)

plugins/module_utils/k8s/resource.py

@@ -4,7 +4,6 @@
 import os
 from typing import Dict, Iterable, List, Optional, Union, cast
 
-from ansible.module_utils.six import string_types
 from ansible.module_utils.urls import Request
 
 try:
@@ -78,11 +77,11 @@ def create_definitions(params: Dict) -> List[ResourceDefinition]:
 def from_yaml(definition: Union[str, List, Dict]) -> Iterable[Dict]:
     """Load resource definitions from a yaml definition."""
     definitions: List[Dict] = []
-    if isinstance(definition, string_types):
+    if isinstance(definition, str):
         definitions += yaml.safe_load_all(definition)
     elif isinstance(definition, list):
         for item in definition:
-            if isinstance(item, string_types):
+            if isinstance(item, str):
                 definitions += yaml.safe_load_all(item)
             else:
                 definitions.append(item)

plugins/module_utils/k8s/service.py

@@ -498,8 +498,8 @@ def diff_objects(
     if not diff:
         return True, result
 
-    result["before"] = diff[0]
-    result["after"] = diff[1]
+    result["before"] = hide_fields(diff[0], hidden_fields)
+    result["after"] = hide_fields(diff[1], hidden_fields)
 
     if list(result["after"].keys()) == ["metadata"] and list(
         result["before"].keys()
@@ -512,9 +512,6 @@ def diff_objects(
         ).issubset(ignored_keys):
             return True, result
 
-    result["before"] = hide_fields(result["before"], hidden_fields)
-    result["after"] = hide_fields(result["after"], hidden_fields)
-
     return False, result
 
 

plugins/modules/helm.py

@@ -392,9 +392,18 @@ status:
       returned: always
       description: The Date of last update
     values:
-      type: str
+      type: dict
       returned: always
-      description: Dict of Values used to deploy
+      description:
+        - Dict of Values used to deploy.
+        - This return value has been deprecated and will be removed in a release after
+          2027-01-08. Use RV(status.release_values) instead.
+    release_values:
+      type: dict
+      returned: always
+      description:
+        - Dict of Values used to deploy.
+      version_added: 6.3.0
 stdout:
   type: str
   description: Full `helm` command stdout, in case you want to display it or examine the event log
@@ -474,7 +483,8 @@ def get_release_status(module, release_name, all_status=False):
     if release is None:  # not install
         return None
 
-    release["values"] = module.get_values(release_name)
+    release["release_values"] = module.get_values(release_name)
+    release["values"] = release["release_values"]
 
     return release
 
@@ -832,6 +842,9 @@ def main():
     if not IMP_YAML:
         module.fail_json(msg=missing_required_lib("yaml"), exception=IMP_YAML_ERR)
 
+    # Validate Helm version >=3.0.0,<4.0.0
+    module.validate_helm_version()
+
     changed = False
 
     chart_ref = module.params.get("chart_ref")
@@ -1030,10 +1043,15 @@ def main():
                 changed = True
 
     if module.check_mode:
-        check_status = {"values": {"current": {}, "declared": {}}}
+        check_status = {
+            "values": {"current": {}, "declared": {}},
+            "release_values": {"current": {}, "declared": {}},
+        }
         if release_status:
-            check_status["values"]["current"] = release_status["values"]
+            check_status["values"]["current"] = release_status["release_values"]
             check_status["values"]["declared"] = release_status
+            check_status["release_values"]["current"] = release_status["release_values"]
+            check_status["release_values"]["declared"] = release_status
 
         module.exit_json(
             changed=changed,

plugins/modules/helm_info.py

@@ -115,9 +115,18 @@ status:
       returned: always
       description: The Date of last update
     values:
-      type: str
+      type: dict
       returned: always
-      description: Dict of Values used to deploy
+      description:
+        - Dict of Values used to deploy
+        - This return value has been deprecated and will be removed in a release after
+          2027-01-08. Use RV(status.release_values) instead.
+    release_values:
+      type: dict
+      returned: always
+      description:
+        - Dict of Values used to deploy.
+      version_added: 6.3.0
     hooks:
       type: list
       elements: dict
@@ -202,7 +211,8 @@ def get_release_status(module, release_name, release_state, get_all_values=False
     if release is None:  # not install
         return None
 
-    release["values"] = module.get_values(release_name, get_all_values)
+    release["release_values"] = module.get_values(release_name, get_all_values)
+    release["values"] = release["release_values"]
     release["manifest"] = module.get_manifest(release_name)
     release["notes"] = module.get_notes(release_name)
     release["hooks"] = module.get_hooks(release_name)
@@ -235,6 +245,9 @@ def main():
     if not IMP_YAML:
         module.fail_json(msg=missing_required_lib("yaml"), exception=IMP_YAML_ERR)
 
+    # Validate Helm version >=3.0.0,<4.0.0
+    module.validate_helm_version()
+
     release_name = module.params.get("release_name")
     release_state = module.params.get("release_state")
     get_all_values = module.params.get("get_all_values")

plugins/modules/helm_plugin.py

@@ -161,6 +161,9 @@ def main():
         mutually_exclusive=mutually_exclusive(),
     )
 
+    # Validate Helm version >=3.0.0,<4.0.0
+    module.validate_helm_version()
+
     state = module.params.get("state")
 
     helm_cmd_common = module.get_helm_binary() + " plugin"

plugins/modules/helm_plugin_info.py

@@ -98,6 +98,9 @@ def main():
         supports_check_mode=True,
     )
 
+    # Validate Helm version >=3.0.0,<4.0.0
+    module.validate_helm_version()
+
     plugin_name = module.params.get("plugin_name")
 
     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 (https://github.com/helm/helm/releases)"
+  - "helm >= 3.0, <4.0.0 (https://github.com/helm/helm/releases)"
 
 options:
   chart_ref:
@@ -89,6 +89,14 @@ options:
     - if set to true, will untar the chart after downloading it.
     type: bool
     default: False
+  force:
+    description:
+    - Force download of the chart even if it already exists in the destination directory.
+    - By default, the module will skip downloading if the chart with the same version already exists for idempotency.
+    - When used with O(untar_chart=true), will remove any existing chart directory before extracting.
+    type: bool
+    default: False
+    version_added: 6.3.0
   destination:
     description:
     - location to write the chart.
@@ -145,6 +153,23 @@ EXAMPLES = r"""
     destination: /path/to/chart
     username: myuser
     password: mypassword123
+
+- name: Download Chart (force re-download even if exists)
+  kubernetes.core.helm_pull:
+    chart_ref: redis
+    repo_url: https://charts.bitnami.com/bitnami
+    chart_version: '17.0.0'
+    destination: /path/to/chart
+    force: yes
+
+- name: Download and untar chart (force re-extraction even if directory exists)
+  kubernetes.core.helm_pull:
+    chart_ref: redis
+    repo_url: https://charts.bitnami.com/bitnami
+    chart_version: '17.0.0'
+    destination: /path/to/chart
+    untar_chart: yes
+    force: yes
 """
 
 RETURN = r"""
@@ -163,6 +188,11 @@ command:
   description: Full `helm pull` command built by this module, in case you want to re-run the command outside the module or debug a problem.
   returned: always
   sample: helm pull --repo test ...
+msg:
+  type: str
+  description: A message indicating the result of the operation.
+  returned: when chart already exists
+  sample: Chart redis version 17.0.0 already exists in destination directory
 rc:
   type: int
   description: Helm pull command return code
@@ -170,6 +200,18 @@ rc:
   sample: 1
 """
 
+import os
+import shutil
+import tarfile
+import uuid
+
+try:
+    import yaml
+
+    HAS_YAML = True
+except ImportError:
+    HAS_YAML = False
+
 from ansible_collections.kubernetes.core.plugins.module_utils.helm import (
     AnsibleHelmModule,
 )
@@ -178,6 +220,115 @@ from ansible_collections.kubernetes.core.plugins.module_utils.version import (
 )
 
 
+def extract_chart_name(chart_ref):
+    """
+    Extract chart name from chart reference.
+
+    Args:
+        chart_ref (str): Chart reference (name, URL, or OCI reference)
+
+    Returns:
+        str: Extracted chart name
+    """
+    chart_name = chart_ref.split("/")[-1]
+    # Remove any query parameters or fragments from URL-based refs
+    if "?" in chart_name:
+        chart_name = chart_name.split("?")[0]
+    if "#" in chart_name:
+        chart_name = chart_name.split("#")[0]
+    # Remove .tgz extension if present
+    if chart_name.endswith(".tgz"):
+        chart_name = chart_name[:-4]
+    return chart_name
+
+
+def chart_exists(destination, chart_ref, chart_version, untar_chart):
+    """
+    Check if the chart already exists in the destination directory.
+
+    For untarred charts: check if directory exists with Chart.yaml matching version
+    For tarred charts: check if .tgz file exists and contains matching version
+
+    Args:
+        destination (str): Destination directory path
+        chart_ref (str): Chart reference (name or URL)
+        chart_version (str): Chart version to check for
+        untar_chart (bool): Whether to check for untarred or tarred chart
+
+    Returns:
+        bool: True if chart with matching version exists, False otherwise
+    """
+    # YAML is required for version checking
+    if not HAS_YAML:
+        return False
+
+    # Without version, we can't reliably check
+    if not chart_version:
+        return False
+
+    # Extract chart name from chart_ref using shared helper
+    chart_name = extract_chart_name(chart_ref)
+
+    if untar_chart:
+        # Check for extracted directory
+        chart_dir = os.path.join(destination, chart_name)
+        chart_yaml_path = os.path.join(chart_dir, "Chart.yaml")
+
+        if os.path.isdir(chart_dir) and os.path.isfile(chart_yaml_path):
+            try:
+                with open(chart_yaml_path, "r", encoding="utf-8") as chart_file:
+                    chart_metadata = yaml.safe_load(chart_file)
+                    # Ensure chart_metadata is a dict and has a version that matches
+                    if (
+                        chart_metadata
+                        and isinstance(chart_metadata, dict)
+                        and chart_metadata.get("version") == chart_version
+                        and chart_metadata.get("name") == chart_name
+                    ):
+                        return True
+            except (yaml.YAMLError, IOError, OSError, TypeError):
+                # If we can't read or parse the file, treat as non-existent
+                pass
+    else:
+        # Check for .tgz file
+        chart_file = os.path.join(destination, f"{chart_name}-{chart_version}.tgz")
+
+        if os.path.isfile(chart_file):
+            try:
+                # Verify it's a valid tarball with matching version
+                with tarfile.open(chart_file, "r:gz") as tar:
+                    # Try to extract Chart.yaml to verify version
+                    # Look for Chart.yaml at the expected path: <chart-name>/Chart.yaml
+                    expected_chart_yaml = f"{chart_name}/Chart.yaml"
+                    try:
+                        member = tar.getmember(expected_chart_yaml)
+                        chart_yaml_file = tar.extractfile(member)
+                        if chart_yaml_file:
+                            try:
+                                chart_metadata = yaml.safe_load(chart_yaml_file)
+                                # Ensure chart_metadata is a dict and has a version that matches
+                                if (
+                                    chart_metadata
+                                    and isinstance(chart_metadata, dict)
+                                    and chart_metadata.get("version") == chart_version
+                                    and chart_metadata.get("name") == chart_name
+                                ):
+                                    return True
+                            except (yaml.YAMLError, TypeError):
+                                # If we can't parse the YAML, treat as non-existent
+                                pass
+                            finally:
+                                chart_yaml_file.close()
+                    except KeyError:
+                        # Chart.yaml not found at expected path
+                        pass
+            except (tarfile.TarError, yaml.YAMLError, IOError, OSError, TypeError):
+                # If we can't read or parse the tarball, treat as non-existent
+                pass
+
+    return False
+
+
 def main():
     argspec = dict(
         chart_ref=dict(type="str", required=True),
@@ -196,6 +347,7 @@ def main():
         ),
         chart_devel=dict(type="bool"),
         untar_chart=dict(type="bool", default=False),
+        force=dict(type="bool", default=False),
         destination=dict(type="path", required=True),
         chart_ca_cert=dict(type="path"),
         chart_ssl_cert_file=dict(type="path"),
@@ -212,13 +364,10 @@ def main():
         mutually_exclusive=[("chart_version", "chart_devel")],
     )
 
+    # Validate Helm version >=3.0.0,<4.0.0
+    module.validate_helm_version()
+
     helm_version = module.get_helm_version()
-    if LooseVersion(helm_version) < LooseVersion("3.0.0"):
-        module.fail_json(
-            msg="This module requires helm >= 3.0.0, current version is {0}".format(
-                helm_version
-            )
-        )
 
     helm_pull_opt_versionning = dict(
         skip_tls_certs_check="3.3.0",
@@ -276,8 +425,72 @@ def main():
         module.params.get("chart_ref"),
         " ".join(helm_pull_opts),
     )
+
+    # Check if chart already exists (idempotency)
+    if module.params.get("chart_version") and not module.params.get("force"):
+        chart_exists_locally = chart_exists(
+            module.params.get("destination"),
+            module.params.get("chart_ref"),
+            module.params.get("chart_version"),
+            module.params.get("untar_chart"),
+        )
+
+        if chart_exists_locally:
+            module.exit_json(
+                failed=False,
+                changed=False,
+                msg="Chart {0} version {1} already exists in destination directory".format(
+                    module.params.get("chart_ref"), module.params.get("chart_version")
+                ),
+                command="",
+                stdout="",
+                stderr="",
+                rc=0,
+            )
+
+    # When both untar_chart and force are enabled, we need to remove the existing chart directory
+    # BEFORE running helm pull to prevent helm's "directory already exists" error.
+    # We do this by:
+    # 1. Renaming the existing directory to a temporary name (if it exists)
+    # 2. Running helm pull
+    # 3. On success: remove the temporary directory
+    # 4. On failure: restore the temporary directory and report the error
+    chart_dir_renamed = False
+    chart_dir = None
+    chart_dir_backup = None
+
+    if module.params.get("untar_chart") and module.params.get("force"):
+        chart_name = extract_chart_name(module.params.get("chart_ref"))
+        chart_dir = os.path.join(module.params.get("destination"), chart_name)
+
+        # Check if directory exists and contains a Chart.yaml (to be safe)
+        if os.path.isdir(chart_dir):
+            chart_yaml_path = os.path.join(chart_dir, "Chart.yaml")
+            # Only rename if it looks like a Helm chart directory (have Chart.yaml)
+            if os.path.isfile(chart_yaml_path):
+                if not module.check_mode:
+                    # Rename to temporary backup name using uuid for uniqueness
+                    backup_suffix = uuid.uuid4().hex[:8]
+                    chart_dir_backup = os.path.join(
+                        module.params.get("destination"),
+                        f".{chart_name}_backup_{backup_suffix}",
+                    )
+                    os.rename(chart_dir, chart_dir_backup)
+                    chart_dir_renamed = True
+
     if not module.check_mode:
         rc, out, err = module.run_helm_command(helm_cmd_common, fails_on_error=False)
+
+        # Handle cleanup/restore based on helm command result
+        if chart_dir_renamed:
+            if rc == 0:
+                # Success: remove the backup directory
+                if os.path.isdir(chart_dir_backup):
+                    shutil.rmtree(chart_dir_backup)
+            else:
+                # Failure: restore the backup directory
+                if os.path.isdir(chart_dir_backup) and not os.path.exists(chart_dir):
+                    os.rename(chart_dir_backup, chart_dir)
     else:
         rc, out, err = (0, "", "")
 

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.
@@ -31,6 +31,7 @@ options:
       - Desired state of the registry.
       - If set to V(present) attempt to log in to the remote registry server using the URL specified in O(host).
       - If set to V(absent) attempt to log out from the remote registry server using the URL specified in O(host).
+      - As helm >= 3.18.0 reports successful logout even if the user is not logged in, this module will report a change regardless of the current state.
     required: false
     default: present
     choices: ['present', 'absent']
@@ -129,6 +130,9 @@ failed:
 from ansible_collections.kubernetes.core.plugins.module_utils.helm import (
     AnsibleHelmModule,
 )
+from ansible_collections.kubernetes.core.plugins.module_utils.version import (
+    LooseVersion,
+)
 
 
 def arg_spec():
@@ -190,6 +194,9 @@ def main():
         supports_check_mode=True,
     )
 
+    # Validate Helm version >=3.0.0,<4.0.0
+    module.validate_helm_version()
+
     changed = False
 
     host = module.params.get("host")
@@ -231,6 +238,13 @@ 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(
+            "The helm_registry_auth is not idempotent with helm >= 3.18.0, always report a change."
+        )
+
     module.exit_json(changed=changed, stdout=out, stderr=err, command=helm_cmd)
 
 

plugins/modules/helm_repository.py

@@ -295,6 +295,9 @@ def main():
     if not IMP_YAML:
         module.fail_json(msg=missing_required_lib("yaml"), exception=IMP_YAML_ERR)
 
+    # Validate Helm version >=3.0.0,<4.0.0
+    module.validate_helm_version()
+
     changed = False
 
     repo_name = module.params.get("repo_name")

plugins/modules/helm_template.py

@@ -331,6 +331,9 @@ def main():
     if not IMP_YAML:
         module.fail_json(msg=missing_required_lib("yaml"), exception=IMP_YAML_ERR)
 
+    # Validate Helm version >=3.0.0,<4.0.0
+    module.validate_helm_version()
+
     helm_cmd = module.get_helm_binary()
 
     if update_repo_cache:

plugins/modules/k8s.py

@@ -383,28 +383,24 @@ result:
   contains:
      api_version:
        description: The versioned schema of this representation of an object.
-       returned: success
+       returned: when O(resource_definition) or O(src) contains a single object.
        type: str
      kind:
        description: Represents the REST resource this object represents.
-       returned: success
+       returned: when O(resource_definition) or O(src) contains a single object.
        type: str
      metadata:
        description: Standard object metadata. Includes name, namespace, annotations, labels, etc.
-       returned: success
+       returned: when O(resource_definition) or O(src) contains a single object.
        type: complex
      spec:
        description: Specific attributes of the object. Will vary based on the I(api_version) and I(kind).
-       returned: success
+       returned: when O(resource_definition) or O(src) contains a single object.
        type: complex
      status:
        description: Current status details for the object.
-       returned: success
+       returned: when O(resource_definition) or O(src) contains a single object.
        type: complex
-     items:
-       description: Returned only when multiple yaml documents are passed to src or resource_definition
-       returned: when resource_definition or src contains list of objects
-       type: list
      duration:
        description: elapsed time of task in seconds
        returned: when C(wait) is true
@@ -414,6 +410,46 @@ result:
        description: error while trying to create/delete the object.
        returned: error
        type: complex
+     results:
+       description: An array of created, patched, or otherwise present objects.
+       returned: when O(resource_definition) or O(src) contains a list of objects.
+       type: complex
+       contains:
+         api_version:
+           description: The versioned schema of this representation of an object.
+           returned: when O(resource_definition) or O(src) contains a single object.
+           type: str
+         kind:
+           description: Represents the REST resource this object represents.
+           returned: when O(resource_definition) or O(src) contains a single object.
+           type: str
+         metadata:
+           description: Standard object metadata. Includes name, namespace, annotations, labels, etc.
+           returned: when O(resource_definition) or O(src) contains a single object.
+           type: complex
+         spec:
+           description: Specific attributes of the object. Will vary based on the I(api_version) and I(kind).
+           returned: when O(resource_definition) or O(src) contains a single object.
+           type: complex
+         status:
+           description: Current status details for the object.
+           returned: when O(resource_definition) or O(src) contains a single object.
+           type: complex
+         duration:
+           description: elapsed time of task in seconds
+           returned: when C(wait) is true
+           type: int
+           sample: 48
+         error:
+           description: error while trying to create/delete the object.
+           returned: error
+           type: complex
+method:
+  description:
+  - The method used to deploy the resource.
+  returned: success
+  type: str
+  sample: create
 """
 
 import copy

plugins/modules/k8s_cp.py

@@ -79,6 +79,7 @@ options:
 
 notes:
     - the tar binary is required on the container when copying from local filesystem to pod.
+    - the (init) container has to be started before you copy files or directories to it.
 """
 
 EXAMPLES = r"""

plugins/modules/k8s_drain.py

@@ -441,7 +441,8 @@ class K8sDrainAnsible(object):
                     warnings.append(warn)
             result.append("{0} Pod(s) deleted from node.".format(number_pod))
         if warnings:
-            return dict(result=" ".join(result), warnings=warnings)
+            for warning in warnings:
+                self._module.warn(warning)
         return dict(result=" ".join(result))
 
     def patch_node(self, unschedulable):

plugins/modules/k8s_info.py

@@ -120,6 +120,21 @@ EXAMPLES = r"""
     namespace: default
     wait_sleep: 10
     wait_timeout: 360
+
+- name: Wait for OpenShift bootstrap to complete
+  kubernetes.core.k8s_info:
+    api_version: v1
+    kind: ConfigMap
+    name: bootstrap
+    namespace: kube-system
+  register: ocp_bootstrap_status
+  until: >
+    ocp_bootstrap_status.resources is defined and
+    (ocp_bootstrap_status.resources | length > 0) and
+    (ocp_bootstrap_status.resources[0].data.status is defined) and
+    (ocp_bootstrap_status.resources[0].data.status == 'complete')
+  retries: 60
+  delay: 15
 """
 
 RETURN = r"""

plugins/modules/k8s_rollback.py

@@ -168,7 +168,9 @@ def perform_action(svc, resource):
             module.params["kind"],
             resource["metadata"]["name"],
         )
-        result = {"changed": False, "warnings": [warn]}
+        if warn:
+            module.warn(warn)
+        result = {"changed": False}
         return result
 
     if module.params["kind"] == "Deployment":

plugins/modules/k8s_scale.py

@@ -243,10 +243,12 @@ def execute_module(client, module):
             module.fail_json(msg=error, **return_attributes)
 
     def _continue_or_exit(warn):
+        if warn:
+            module.warn(warn)
         if multiple_scale:
-            return_attributes["results"].append({"warning": warn, "changed": False})
+            return_attributes["results"].append({"changed": False})
         else:
-            module.exit_json(warning=warn, **return_attributes)
+            module.exit_json(**return_attributes)
 
     for existing in existing_items:
         if kind.lower() == "job":

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

@@ -6,3 +6,5 @@
   with_items:
     - "v3.15.4"
     - "v3.16.0"
+    - "v3.17.0"
+    - "v4.0.0"

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

@@ -13,10 +13,15 @@
   include_role:
     name: install_helm
 
-- name: "Ensure we honor the environment variables"
-  include_tasks: test_read_envvars.yml
+- name: Main helm tests with Helm v3
+  when: helm_version != "v4.0.0"
+  block:
 
-- name: Deploy charts
+    - 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"
       loop_control:
         loop_var: test_chart_type
@@ -25,28 +30,31 @@
         - from_repository
         - from_url
 
-- name: test helm upgrade with reuse_values
+    - name: test helm upgrade with reuse_values
       include_tasks: test_helm_reuse_values.yml
 
-- name: test helm upgrade with reset_then_reuse_values
+    - name: test helm upgrade with reset_then_reuse_values
       include_tasks: test_helm_reset_then_reuse_values.yml
 
-- name: test helm dependency update
+    - name: test helm dependency update
       include_tasks: test_up_dep.yml
 
-- name: Test helm uninstall
+    - name: Test helm uninstall
       include_tasks: test_helm_uninstall.yml
 
-- name: Test helm install with chart name containing space
+    - name: Test helm install with chart name containing space
       include_tasks: test_helm_with_space_into_chart_name.yml
 
-# https://github.com/ansible-collections/community.kubernetes/issues/296
-- name: Test Skip CRDS feature in helm chart install
+    # https://github.com/ansible-collections/community.kubernetes/issues/296
+    - name: Test Skip CRDS feature in helm chart install
       include_tasks: test_crds.yml
 
-- name: Test insecure registry flag feature
+    - name: Test insecure registry flag feature
       include_tasks: test_helm_insecure.yml
 
+- name: Test helm version
+  include_tasks: test_helm_version.yml
+
 - name: Clean helm install
   file:
     path: "{{ item }}"

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

@@ -13,3 +13,11 @@
     that:
       - helm_missing_binary is failed
       - "'No such file or directory' in helm_missing_binary.msg"
+  when: ansible_version.full is version('2.20', '<')
+
+- name: Assert that helm is not installed (ansible 2.20+)
+  assert:
+    that:
+      - helm_missing_binary is failed
+      - "'Error executing command' in helm_missing_binary.msg"
+  when: ansible_version.full is version('2.20', '>=')

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

@@ -36,7 +36,7 @@
         that:
           - install is changed
           - '"--reset-then-reuse-values" not in install.command'
-          - release_value["status"]["values"] == chart_release_values
+          - release_value["status"]["release_values"] == chart_release_values
 
     - name: Upgrade chart using reset_then_reuse_values=true
       helm:
@@ -64,7 +64,7 @@
           - '"--reset-then-reuse-values" in upgrade.command'
           - '"--reuse-values " not in upgrade.command'
           - '"--reset-values" not in upgrade.command'
-          - release_value["status"]["values"] == chart_release_values | combine(chart_reset_then_reuse_values, recursive=true)
+          - release_value["status"]["release_values"] == chart_release_values | combine(chart_reset_then_reuse_values, recursive=true)
 
   always:
     - name: Remove helm namespace

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

@@ -36,7 +36,7 @@
         that:
           - install is changed
           - '"--reuse-values=True" not in install.command'
-          - release_value["status"]["values"] == chart_release_values
+          - release_value["status"]["release_values"] == chart_release_values
 
     - name: Upgrade chart using reuse_values=true
       helm:
@@ -62,7 +62,7 @@
           - upgrade is changed
           - '"--reuse-values=True" in upgrade.command'
           - '"--reset-values" not in upgrade.command'
-          - release_value["status"]["values"] == chart_release_values | combine(chart_reuse_values, recursive=true)
+          - release_value["status"]["release_values"] == chart_release_values | combine(chart_reuse_values, recursive=true)
 
   always:
     - name: Remove helm namespace

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

@@ -0,0 +1,47 @@
+---
+- name: Test helm reuse_values
+  vars:
+    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: Initial chart installation
+      helm:
+        binary_path: "{{ helm_binary }}"
+        chart_ref: oci://registry-1.docker.io/bitnamicharts/redis
+        release_name: test-redis
+        release_namespace: "{{ helm_namespace }}"
+        create_namespace: true
+        release_values: "{{ chart_release_values }}"
+      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: Ensure helm installation was failed for v4.0.0
+      assert:
+        that:
+          - install is failed
+          - "'Helm version must be >=3.0.0,<4.0.0' in install.msg"
+      when: helm_version == "v4.0.0"
+
+  always:
+    - name: Remove helm namespace
+      k8s:
+        api_version: v1
+        kind: Namespace
+        name: "{{ helm_namespace }}"
+        state: absent

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

@@ -57,7 +57,7 @@
         that:
           - install_check_mode is changed
           - install_check_mode.status is defined
-          - install_check_mode.status.values is defined
+          - install_check_mode.status.release_values is defined
 
     - name: "Install {{ chart_test }} from {{ source }}"
       helm:
@@ -131,7 +131,7 @@
           - install is changed
           - install.status.status | lower == 'deployed'
           - install.status.chart == chart_test+"-"+chart_test_version
-          - "install.status['values'].revisionHistoryLimit == 0"
+          - "install.status['release_values'].revisionHistoryLimit == 0"
 
     - name: Check idempotency after adding vars
       helm:
@@ -149,7 +149,7 @@
           - install is not changed
           - install.status.status | lower == 'deployed'
           - install.status.chart == chart_test+"-"+chart_test_version
-          - "install.status['values'].revisionHistoryLimit == 0"
+          - "install.status['release_values'].revisionHistoryLimit == 0"
 
     - name: "Remove Vars to {{ chart_test }} from {{ source }}"
       helm:
@@ -166,7 +166,7 @@
           - install is changed
           - install.status.status | lower == 'deployed'
           - install.status.chart == chart_test+"-"+chart_test_version
-          - install.status['values'] == {}
+          - install.status['release_values'] == {}
 
     - name: Check idempotency after removing vars
       helm:
@@ -183,7 +183,7 @@
           - install is not changed
           - install.status.status | lower == 'deployed'
           - install.status.chart == chart_test+"-"+chart_test_version
-          - install.status['values'] == {}
+          - install.status['release_values'] == {}
 
     - name: "Upgrade {{ chart_test }} from {{ source }}"
       helm:
@@ -317,7 +317,7 @@
           - install is changed
           - install.status.status | lower == 'deployed'
           - install.status.chart == chart_test+"-"+chart_test_version
-          - "install.status['values'].revisionHistoryLimit == 0"
+          - "install.status['release_values'].revisionHistoryLimit == 0"
 
     - name: "Install {{ chart_test }} from {{ source }} with values_files (again)"
       helm:
@@ -402,7 +402,7 @@
         namespace: "{{ helm_namespace }}"
         create_namespace: true
         context: does-not-exist
-      ignore_errors: yes
+      ignore_errors: true
       register: result
 
     - name: Assert that release fails with non-existent context

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

@@ -47,7 +47,7 @@
           assert:
             that:
               - _result is failed
-              - _result.msg == "This module requires helm >= 3.0.0, current version is 2.3.0"
+              - _result.msg == "Helm version must be >=3.0.0,<4.0.0, current version is 2.3.0"
 
       vars:
         helm_path: "{{ temp_dir }}/2.3.0/linux-amd64/helm"
@@ -221,6 +221,101 @@
               - _chart.stat.exists
               - _chart.stat.isdir
 
+        # Test idempotency with tarred chart
+        - name: Download chart with version (first time)
+          helm_pull:
+            binary_path: "{{ helm_path }}"
+            chart_ref: "oci://registry-1.docker.io/bitnamicharts/redis"
+            destination: "{{ destination }}"
+            chart_version: "24.1.0"
+          register: _result_first
+
+        - name: Download chart with version (second time - should be idempotent)
+          helm_pull:
+            binary_path: "{{ helm_path }}"
+            chart_ref: "oci://registry-1.docker.io/bitnamicharts/redis"
+            destination: "{{ destination }}"
+            chart_version: "24.1.0"
+          register: _result_second
+
+        - name: Validate idempotency for tarred chart
+          assert:
+            that:
+              - _result_first is changed
+              - _result_second is not changed
+
+        # Test force parameter with tarred chart
+        - name: Download chart with force=true (should always download)
+          helm_pull:
+            binary_path: "{{ helm_path }}"
+            chart_ref: "oci://registry-1.docker.io/bitnamicharts/redis"
+            destination: "{{ destination }}"
+            chart_version: "24.1.0"
+            force: true
+          register: _result_force
+
+        - name: Validate force parameter causes download
+          assert:
+            that:
+              - _result_force is changed
+
+        # Test idempotency with untarred chart in the separate folder
+        - name: Create separate directory for untar test under {{ temp_dir }}
+          ansible.builtin.file:
+            path: "{{ destination }}/untar_test"
+            state: directory
+            mode: '0755'
+
+        - name: Download and untar chart (first time)
+          helm_pull:
+            binary_path: "{{ helm_path }}"
+            chart_ref: "oci://registry-1.docker.io/bitnamicharts/redis"
+            destination: "{{ destination }}/untar_test"
+            chart_version: "24.0.0"
+            untar_chart: true
+          register: _result_untar_first
+
+        - name: Download and untar chart (second time - should be idempotent)
+          helm_pull:
+            binary_path: "{{ helm_path }}"
+            chart_ref: "oci://registry-1.docker.io/bitnamicharts/redis"
+            destination: "{{ destination }}/untar_test"
+            chart_version: "24.0.0"
+            untar_chart: true
+          register: _result_untar_second
+
+        - name: Validate idempotency for untarred chart
+          assert:
+            that:
+              - _result_untar_first is changed
+              - _result_untar_second is not changed
+
+        - name: Download and untar chart with force=true (should remove existing directory and re-extract)
+          helm_pull:
+            binary_path: "{{ helm_path }}"
+            chart_ref: "oci://registry-1.docker.io/bitnamicharts/redis"
+            destination: "{{ destination }}/untar_test"
+            chart_version: "24.0.0"
+            untar_chart: true
+            force: true
+          register: _result_untar_force
+
+        - name: Validate first force extraction works
+          assert:
+            that:
+              - _result_untar_force is changed
+
+        - name: Verify chart directory still exists after force re-extraction
+          stat:
+            path: "{{ destination }}/untar_test/redis"
+          register: _chart_after_force
+
+        - name: Validate chart directory exists
+          assert:
+            that:
+              - _chart_after_force.stat.exists
+              - _chart_after_force.stat.isdir
+
       vars:
         helm_path: "{{ temp_dir }}/3.8.0/linux-amd64/helm"
 

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

@@ -108,6 +108,10 @@
       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 }}
@@ -133,8 +137,7 @@
       # Helm binary prints the message to stderr
       ansible.builtin.assert:
         that:
-          - "'push access denied' in _save_chart.stderr"
-          - "'authorization failed' in _save_chart.stderr"
+          - "'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"
 
@@ -155,7 +158,8 @@
     - name: Assert that the registry is not logged in and auth data is not saved
       ansible.builtin.assert:
         that:
-          - "'401 Unauthorized' in _helm_registry_auth_wrong.stderr"
+          - "'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_set_values/tasks/main.yml

@@ -20,10 +20,10 @@
 - name: Assert that release was created with user-defined variables
   assert:
     that:
-    - '"phase" in user_values.status["values"]'
-    - '"versioned" in user_values.status["values"]'
-    - user_values.status["values"]["phase"] == "integration"
-    - user_values.status["values"]["versioned"] is false
+    - '"phase" in user_values.status["release_values"]'
+    - '"versioned" in user_values.status["release_values"]'
+    - user_values.status["release_values"]["phase"] == "integration"
+    - user_values.status["release_values"]["versioned"] is false
 
 # install chart using set_values and release_values
 - name: Install helm binary (> 3.10.0) requires to use set-json
@@ -55,10 +55,10 @@
 - name: Assert that release was created with user-defined variables
   assert:
     that:
-    - values.status["values"].replicaCount == 3
-    - values.status["values"].master.image.registry == "docker.io"
-    - values.status["values"].master.image.repository == "bitnami/apache"
-    - values.status["values"].master.image.tag == "2.4.54-debian-11-r74"
+    - 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
@@ -96,8 +96,8 @@
   - name: Assert that release was created with user-defined variables
     assert:
       that:
-      - values.status["values"].mode == "distributed"
-      - values.status["values"].disableWebUI is true
+      - values.status["release_values"].mode == "distributed"
+      - values.status["release_values"].disableWebUI is true
 
   always:
   - name: Delete temporary file

tests/integration/targets/inventory_k8s/aliases

@@ -0,0 +1,3 @@
+context/target
+time=42
+k8s

tests/integration/targets/inventory_k8s/playbooks/create_resources.yml

@@ -0,0 +1,46 @@
+---
+- name: Create inventory files
+  hosts: localhost
+  gather_facts: false
+
+  collections:
+    - kubernetes.core
+
+  roles:
+    - role: setup_kubeconfig
+      kubeconfig_operation: 'save'
+
+  tasks:
+    - name: Create inventory files
+      copy:
+        content: "{{ item.content }}"
+        dest: "{{ item.path }}"
+      vars:
+        hostname: "{{ lookup('file', user_credentials_dir + '/host_data.txt') }}"
+        test_cert_file: "{{ user_credentials_dir | realpath + '/cert_file_data.txt' }}"
+        test_key_file: "{{ user_credentials_dir | realpath + '/key_file_data.txt' }}"
+        test_ca_cert: "{{ user_credentials_dir | realpath + '/ssl_ca_cert_data.txt' }}"
+      with_items:
+        - path: "test_inventory_aliases_with_ssl_k8s.yml"
+          content: |
+            ---
+            plugin: kubernetes.core.k8s
+            connections:
+              - namespaces:
+                - inventory
+                host: "{{ hostname }}"
+                cert_file: "{{ test_cert_file }}"
+                key_file: "{{ test_key_file }}"
+                verify_ssl: true
+                ssl_ca_cert: "{{ test_ca_cert }}"
+        - path: "test_inventory_aliases_no_ssl_k8s.yml"
+          content: |
+            ---
+            plugin: kubernetes.core.k8s
+            connections:
+              - namespaces:
+                - inventory
+                host: "{{ hostname }}"
+                cert_file: "{{ test_cert_file }}"
+                key_file: "{{ test_key_file }}"
+                verify_ssl: false

tests/integration/targets/inventory_k8s/playbooks/delete_resources.yml

@@ -0,0 +1,30 @@
+---
+- name: Delete inventory namespace
+  hosts: localhost
+  connection: local
+  gather_facts: true
+
+  roles:
+    - role: setup_kubeconfig
+      kubeconfig_operation: 'revert'
+
+  tasks:
+    - name: Delete temporary files
+      file:
+        state: absent
+        path: "{{ user_credentials_dir ~ '/' ~ item }}"
+      ignore_errors: true
+      with_items:
+        - test_inventory_aliases_with_ssl_k8s.yml
+        - test_inventory_aliases_no_ssl_k8s.yml
+        - ssl_ca_cert_data.txt
+        - key_file_data.txt
+        - cert_file_data.txt
+        - host_data.txt
+
+    - name: Remove inventory namespace
+      k8s:
+        api_version: v1
+        kind: Namespace
+        name: inventory
+        state: absent

tests/integration/targets/inventory_k8s/playbooks/play.yml

@@ -0,0 +1,90 @@
+---
+- name: Converge
+  hosts: localhost
+  connection: local
+
+  collections:
+    - kubernetes.core
+
+  vars_files:
+    - vars/main.yml
+
+  tasks:
+    - name: Delete existing namespace
+      k8s:
+        api_version: v1
+        kind: Namespace
+        name: inventory
+        wait: yes
+        state: absent
+
+    - name: Ensure namespace exists
+      k8s:
+        api_version: v1
+        kind: Namespace
+        name: inventory
+
+    - name: Add a deployment
+      k8s:
+        definition:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            name: inventory
+            namespace: inventory
+          spec:
+            replicas: 1
+            selector:
+              matchLabels:
+                app: "{{ k8s_pod_name }}"
+            template: "{{ k8s_pod_template }}"
+        wait: yes
+        wait_timeout: 400
+      vars:
+        k8s_pod_name: inventory
+        k8s_pod_image: python
+        k8s_pod_command:
+          - python
+          - '-m'
+          - http.server
+        k8s_pod_env:
+          - name: TEST
+            value: test
+
+    - meta: refresh_inventory
+
+- name: Verify inventory and connection plugins
+  hosts: namespace_inventory_pods
+  gather_facts: no
+
+  vars:
+    file_content: |
+      Hello world
+
+  tasks:
+    - name: End play if host not running (TODO should we not add these to the inventory?)
+      meta: end_host
+      when: pod_phase != "Running"
+
+    - debug: var=hostvars
+    - setup:
+
+    - debug: var=ansible_facts
+
+    - name: Assert the TEST environment variable was retrieved
+      assert:
+        that: ansible_facts.env.TEST == 'test'
+
+    - name: Copy a file into the host
+      copy:
+        content: '{{ file_content }}'
+        dest: /tmp/test_file
+
+    - name: Retrieve the file from the host
+      slurp:
+        src: /tmp/test_file
+      register: slurped_file
+
+    - name: Assert the file content matches expectations
+      assert:
+        that: (slurped_file.content|b64decode) == file_content

tests/integration/targets/inventory_k8s/playbooks/test.inventory_k8s.yml

@@ -0,0 +1,2 @@
+---
+plugin: kubernetes.core.k8s

tests/integration/targets/inventory_k8s/playbooks/vars/main.yml

@@ -0,0 +1,38 @@
+---
+k8s_pod_metadata:
+  labels:
+    app: "{{ k8s_pod_name }}"
+
+k8s_pod_spec:
+  serviceAccount: "{{ k8s_pod_service_account }}"
+  containers:
+    - image: "{{ k8s_pod_image }}"
+      imagePullPolicy: Always
+      name: "{{ k8s_pod_name }}"
+      command: "{{ k8s_pod_command }}"
+      readinessProbe:
+        initialDelaySeconds: 15
+        exec:
+          command:
+            - /bin/true
+      resources: "{{ k8s_pod_resources }}"
+      ports: "{{ k8s_pod_ports }}"
+      env: "{{ k8s_pod_env }}"
+
+
+k8s_pod_service_account: default
+
+k8s_pod_resources:
+  limits:
+    cpu: "100m"
+    memory: "100Mi"
+
+k8s_pod_command: []
+
+k8s_pod_ports: []
+
+k8s_pod_env: []
+
+k8s_pod_template:
+  metadata: "{{ k8s_pod_metadata }}"
+  spec: "{{ k8s_pod_spec }}"

tests/integration/targets/inventory_k8s/runme.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+set -eux
+
+export ANSIBLE_ROLES_PATH="../"
+USER_CREDENTIALS_DIR=$(pwd)
+
+ansible-playbook playbooks/delete_resources.yml -e "user_credentials_dir=${USER_CREDENTIALS_DIR}" "$@"
+
+{
+export ANSIBLE_CALLBACKS_ENABLED=profile_tasks
+export ANSIBLE_INVENTORY_ENABLED=kubernetes.core.k8s,yaml
+export ANSIBLE_PYTHON_INTERPRETER=auto_silent
+
+ansible-playbook playbooks/play.yml -i playbooks/test.inventory_k8s.yml "$@" &&
+
+ansible-playbook playbooks/create_resources.yml -e "user_credentials_dir=${USER_CREDENTIALS_DIR}" "$@" &&
+
+ansible-inventory -i playbooks/test_inventory_aliases_with_ssl_k8s.yml --list "$@" &&
+
+ansible-inventory -i playbooks/test_inventory_aliases_no_ssl_k8s.yml --list "$@" &&
+
+unset ANSIBLE_INVENTORY_ENABLED &&
+
+ansible-playbook playbooks/delete_resources.yml -e "user_credentials_dir=${USER_CREDENTIALS_DIR}" "$@"
+
+} || {
+    ansible-playbook playbooks/delete_resources.yml -e "user_credentials_dir=${USER_CREDENTIALS_DIR}" "$@"
+    exit 1
+}

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

@@ -1,42 +1,4 @@
 ---
-k8s_pod_metadata:
-  labels:
-    app: "{{ k8s_pod_name }}"
-
-k8s_pod_spec:
-  serviceAccount: "{{ k8s_pod_service_account }}"
-  containers:
-    - image: "{{ k8s_pod_image }}"
-      imagePullPolicy: Always
-      name: "{{ k8s_pod_name }}"
-      command: "{{ k8s_pod_command }}"
-      readinessProbe:
-        initialDelaySeconds: 15
-        exec:
-          command:
-            - /bin/true
-      resources: "{{ k8s_pod_resources }}"
-      ports: "{{ k8s_pod_ports }}"
-      env: "{{ k8s_pod_env }}"
-
-
-k8s_pod_service_account: default
-
-k8s_pod_resources:
-  limits:
-    cpu: "100m"
-    memory: "100Mi"
-
-k8s_pod_command: []
-
-k8s_pod_ports: []
-
-k8s_pod_env: []
-
-k8s_pod_template:
-  metadata: "{{ k8s_pod_metadata }}"
-  spec: "{{ k8s_pod_spec }}"
-
 test_namespace: "apply"
 
 k8s_wait_timeout: 240

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

@@ -292,36 +292,34 @@
 
     - name: Add a deployment
       k8s:
+        namespace: "{{ test_namespace }}"
+        definition:
           definition:
           apiVersion: apps/v1
           kind: Deployment
           metadata:
             name: apply-deploy
-            namespace: "{{ test_namespace }}"
+            labels:
+              app: apply-deploy
           spec:
             replicas: 1
             selector:
               matchLabels:
-                app: "{{ k8s_pod_name }}"
-            template: "{{ k8s_pod_template }}"
+                app: apply-deploy
+            template:
+              metadata:
+                labels:
+                  app: apply-deploy
+              spec:
+                serviceAccount: apply-deploy
+                containers:
+                  - name: nginx
+                    image: nginx:latest
+                    ports:
+                      - containerPort: 80
         wait: yes
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
         apply: yes
-      vars:
-        k8s_pod_name: apply-deploy
-        k8s_pod_image: gcr.io/kuar-demo/kuard-amd64:v0.10.0-green
-        k8s_pod_service_account: apply-deploy
-        k8s_pod_ports:
-          - containerPort: 8080
-            name: http
-            protocol: TCP
-        k8s_pod_resources:
-          requests:
-            cpu: 100m
-            memory: 100Mi
-          limits:
-            cpu: 100m
-            memory: 100Mi
 
     - name: Update the earlier deployment in check mode
       k8s:
@@ -335,33 +333,29 @@
             replicas: 1
             selector:
               matchLabels:
-                app: "{{ k8s_pod_name }}"
-            template: "{{ k8s_pod_template }}"
+                app: apply-deploy
+            template:
+              metadata:
+                labels:
+                  app: apply-deploy
+              spec:
+                serviceAccount: apply-deploy
+                containers:
+                  - name: nginx-2
+                    image: nginx:latest
+                    ports:
+                      - containerPort: 80
         wait: yes
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
         apply: yes
       check_mode: yes
-      vars:
-        k8s_pod_name: apply-deploy
-        k8s_pod_image: gcr.io/kuar-demo/kuard-amd64:v0.10.0-purple
-        k8s_pod_service_account: apply-deploy
-        k8s_pod_ports:
-          - containerPort: 8080
-            name: http
-            protocol: TCP
-        k8s_pod_resources:
-          requests:
-            cpu: 50m
-          limits:
-            cpu: 50m
-            memory: 50Mi
       register: update_deploy_check_mode
 
     - name: Ensure check mode change took
       assert:
         that:
           - update_deploy_check_mode is changed
-          - "update_deploy_check_mode.result.spec.template.spec.containers[0].image == 'gcr.io/kuar-demo/kuard-amd64:v0.10.0-purple'"
+          - "update_deploy_check_mode.result.spec.template.spec.containers[0].name == 'nginx-2'"
 
     - name: Update the earlier deployment
       k8s:
@@ -375,32 +369,28 @@
             replicas: 1
             selector:
               matchLabels:
-                app: "{{ k8s_pod_name }}"
-            template: "{{ k8s_pod_template }}"
+                app: apply-deploy
+            template:
+              metadata:
+                labels:
+                  app: apply-deploy
+              spec:
+                serviceAccount: apply-deploy
+                containers:
+                  - name: nginx-2
+                    image: nginx:latest
+                    ports:
+                      - containerPort: 80
         wait: yes
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
         apply: yes
-      vars:
-        k8s_pod_name: apply-deploy
-        k8s_pod_image: gcr.io/kuar-demo/kuard-amd64:v0.10.0-purple
-        k8s_pod_service_account: apply-deploy
-        k8s_pod_ports:
-          - containerPort: 8080
-            name: http
-            protocol: TCP
-        k8s_pod_resources:
-          requests:
-            cpu: 50m
-          limits:
-            cpu: 50m
-            memory: 50Mi
       register: update_deploy_for_real
 
     - name: Ensure change took
       assert:
         that:
           - update_deploy_for_real is changed
-          - "update_deploy_for_real.result.spec.template.spec.containers[0].image == 'gcr.io/kuar-demo/kuard-amd64:v0.10.0-purple'"
+          - "update_deploy_for_real.result.spec.template.spec.containers[0].name == 'nginx-2'"
 
     - name: Remove the serviceaccount
       k8s:
@@ -424,27 +414,23 @@
             replicas: 1
             selector:
               matchLabels:
-                app: "{{ k8s_pod_name }}"
-            template: "{{ k8s_pod_template }}"
+                app: apply-deploy
+            template:
+              metadata:
+                labels:
+                  app: apply-deploy
+              spec:
+                serviceAccount: apply-deploy
+                containers:
+                  - name: nginx-3
+                    image: nginx:latest
+                    ports:
+                      - containerPort: 80
         wait: yes
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
         apply: yes
-      vars:
-        k8s_pod_name: apply-deploy
-        k8s_pod_image: gcr.io/kuar-demo/kuard-amd64:v0.10.0-green
-        k8s_pod_service_account: apply-deploy
-        k8s_pod_ports:
-          - containerPort: 8080
-            name: http
-            protocol: TCP
-        k8s_pod_resources:
-          requests:
-            cpu: 50m
-          limits:
-            cpu: 50m
-            memory: 50Mi
+      ignore_errors: true
       register: deploy_after_serviceaccount_removal
-      ignore_errors: yes
 
     - name: Ensure that updating deployment after service account removal failed
       assert:

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

@@ -14,3 +14,9 @@ pod_with_two_container:
 
 pod_without_executable_find:
   name: openjdk-pod
+
+pod_with_initcontainer_and_container:
+  name: pod-copy-2
+  container:
+  - container-20
+  - container-21

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

@@ -18,6 +18,23 @@
         wait: yes
         template: pods_definition.j2
 
+    - name: Create Init Pod
+      k8s:
+        namespace: '{{ copy_namespace }}'
+        template: pods_definition_init.j2
+
+    - kubernetes.core.k8s_info:
+        api_version: v1
+        kind: Pod
+        name: '{{ pod_with_initcontainer_and_container.name }}'
+        namespace: '{{ copy_namespace }}'
+      register: init_pod_status
+      until: >-
+        init_pod_status.resources|length > 0
+        and 'initContainerStatuses' in init_pod_status.resources.0.status
+        and init_pod_status.resources.0.status.initContainerStatuses|length > 0
+        and init_pod_status.resources.0.status.initContainerStatuses.0.started|bool
+
     - include_tasks: test_copy_errors.yml
     - include_tasks: test_check_mode.yml
     - include_tasks: test_copy_file.yml
@@ -25,6 +42,7 @@
     - include_tasks: test_copy_directory.yml
     - include_tasks: test_copy_large_file.yml
     - include_tasks: test_copy_item_with_space_in_its_name.yml
+    - include_tasks: test_init_container_pod.yml
 
   always:
 

tests/integration/targets/k8s_copy/tasks/test_copy_directory.yml

@@ -69,12 +69,14 @@
     ignore_errors: true
     register: _result
 
-  - name: Validate that 'find' executable is missing from Pod
-    assert:
-      that:
-      - _result is failed
-      fail_msg: "Pod contains 'find' executable, therefore we cannot run the next tasks."
+  # - name: Validate that 'find' executable is missing from Pod
+  #   assert:
+  #     that:
+  #     - _result is failed
+  #     fail_msg: "Pod contains 'find' executable, therefore we cannot run the next tasks."
 
+  - name: Copy directory into Pod without 'find' executable
+    block:
     - name: Copy files into container
       k8s_cp:
         namespace: "{{ copy_namespace }}"

tests/integration/targets/k8s_copy/tasks/test_copy_errors.yml

@@ -67,3 +67,21 @@
     that:
       - copy_fake_container is failed
       - copy_fake_container.msg == "Pod has no container this_is_a_fake_container"
+
+# copy file to not started container in pod should fail
+- name: copy file to not started container in pod should fail
+  k8s_cp:
+    namespace: '{{ copy_namespace }}'
+    pod: '{{ pod_with_initcontainer_and_container.name }}'
+    remote_path: /tmp
+    local_path: files/simple_file.txt
+    state: to_pod
+    container: '{{ pod_with_initcontainer_and_container.container[1] }}'
+  ignore_errors: true
+  register: copy_not_started_container
+
+- name: check that error message is as expected
+  assert:
+    that:
+      - copy_not_started_container is failed
+      - copy_not_started_container.msg == "Pod container {{ pod_with_initcontainer_and_container.container[1] }} is not started"

tests/integration/targets/k8s_copy/tasks/test_copy_large_file.yml

@@ -10,9 +10,13 @@
       path: "{{ test_directory }}"
       state: directory
 
-  - name: Create a large text file
-    ansible.builtin.shell:
-      cmd: base64 /dev/random | head -c 150M > {{ test_directory }}/large_text_file.txt
+  - name: Create a text file with specific content
+    ansible.builtin.copy:
+      dest: "{{ test_directory }}/large_text_file.txt"
+      content: |
+        This is a large text file
+        {{ 'Repeat this line 1000 times\n' * 1000 }}
+      mode: '0644'
 
   - name: Create a large binary file
     ansible.builtin.command:

tests/integration/targets/k8s_copy/tasks/test_init_container_pod.yml

@@ -0,0 +1,25 @@
+---
+- set_fact:
+    random_content: "{{ lookup('password', '/dev/null chars=ascii_lowercase,digits,punctuation length=128') }}"
+
+- name: Copy content into init container
+  k8s_cp:
+    namespace: '{{ copy_namespace }}'
+    pod: '{{ pod_with_initcontainer_and_container.name }}'
+    remote_path: /file_from_localhost.txt
+    content: '{{ random_content }}'
+    container: '{{ pod_with_initcontainer_and_container.container[0] }}'
+    state: to_pod
+
+- name: Get the content from copied file
+  kubernetes.core.k8s_exec:
+    namespace: '{{ copy_namespace }}'
+    pod: '{{ pod_with_initcontainer_and_container.name }}'
+    container: '{{ pod_with_initcontainer_and_container.container[0] }}'
+    command: cat /file_from_localhost.txt
+  register: exec_out
+
+- name: check that content is found and the same as generated earlier
+  assert:
+    that:
+      - exec_out.stdout == random_content

tests/integration/targets/k8s_copy/templates/pods_definition.j2

@@ -6,7 +6,7 @@ metadata:
 spec:
   containers:
   - name: '{{ pod_with_one_container.container }}'
-    image: busybox
+    image: busybox:latest
     command:
       - /bin/sh
       - -c
@@ -19,13 +19,13 @@ metadata:
 spec:
   containers:
   - name: '{{ pod_with_two_container.container[0] }}'
-    image: busybox:1.32.0
+    image: busybox:latest
     command:
       - /bin/sh
       - -c
       - while true;do date;sleep 5; done
   - name: '{{ pod_with_two_container.container[1] }}'
-    image: busybox:1.33.0
+    image: busybox:latest
     command:
       - /bin/sh
       - -c
@@ -37,8 +37,8 @@ metadata:
   name: '{{ pod_without_executable_find.name }}'
 spec:
   containers:
-  - name: openjdk17
-    image: openjdk:17
+  - name: openjdk
+    image: openjdk:27-ea
     command:
     - /bin/sh
     - -c

tests/integration/targets/k8s_copy/templates/pods_definition_init.j2

@@ -0,0 +1,20 @@
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: '{{ pod_with_initcontainer_and_container.name }}'
+spec:
+  initContainers:
+  - name: '{{ pod_with_initcontainer_and_container.container[0] }}'
+    image: busybox
+    command:
+      - /bin/sh
+      - -c
+      - while true;do date;sleep 5; done
+  containers:
+  - name: '{{ pod_with_initcontainer_and_container.container[1] }}'
+    image: busybox
+    command:
+      - /bin/sh
+      - -c
+      - while true;do date;sleep 5; done

tests/integration/targets/k8s_delete/files/deployments.yaml

@@ -24,7 +24,7 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: openjdk-d
+  name: busybox-d
   labels:
     context: ansible
 spec:
@@ -38,8 +38,8 @@ spec:
         context: ansible
     spec:
       containers:
-      - name: openjdk
-        image: openjdk:17
+      - name: busybox
+        image: busybox:latest
         command:
         - /bin/sh
         - -c

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

@@ -17,7 +17,7 @@
         wait_timeout: 400
       vars:
         k8s_pod_name: delete-ds
-        k8s_pod_image: gcr.io/kuar-demo/kuard-amd64:1
+        k8s_pod_image: docker.io/nginx:latest
       register: ds
 
     - name: Check that daemonset wait worked

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

@@ -58,7 +58,7 @@
           - "'managedFields' not in hf4.resources[0]['metadata']"
 
 
-    - name: Hiding a changed field should still result in a change
+    - name: Hiding a changed field should not result in a change
       k8s:
         definition: "{{ hide_fields_base_configmap | combine({'data':{'hello':'different'}}) }}"
         hidden_fields:
@@ -67,10 +67,10 @@
       register: hf5
       diff: true
 
-    - name: Ensure that hidden changed field changed
+    - name: Ensure that hidden changed field not changed
       assert:
         that:
-          - hf5.changed
+          - not hf5.changed
 
     - name: Apply works with hidden fields
       k8s:

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

@@ -81,6 +81,7 @@
         replicas: 1
         current_replicas: 3
         wait: true
+        wait_timeout: 60
       register: scale
 
     - name: Read deployment

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

@@ -291,6 +291,301 @@
         that:
           - failed_version | int + 1 == result.resources[0].metadata.annotations['deprecated.daemonset.template.generation'] | int
 
+    - name: Create deployment with specific labels for selector testing
+      k8s:
+        state: present
+        wait: yes
+        wait_timeout: "{{ k8s_wait_timeout }}"
+        definition:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            name: nginx-labeled
+            namespace: "{{ namespace }}"
+            labels:
+              app: nginx
+              test-group: label-selector-test
+          spec:
+            replicas: 2
+            selector:
+              matchLabels:
+                app: nginx-labeled
+            template:
+              metadata:
+                labels:
+                  app: nginx-labeled
+              spec:
+                containers:
+                  - name: nginx
+                    image: nginx:1.17
+                    ports:
+                      - containerPort: 80
+
+    - name: Update deployment to create second revision
+      k8s:
+        state: present
+        wait: yes
+        wait_timeout: 30
+        definition:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            name: nginx-labeled
+            namespace: "{{ namespace }}"
+            labels:
+              app: nginx
+              test-group: label-selector-test
+          spec:
+            replicas: 2
+            selector:
+              matchLabels:
+                app: nginx-labeled
+            template:
+              metadata:
+                labels:
+                  app: nginx-labeled
+              spec:
+                containers:
+                  - name: nginx
+                    image: nginx:1.18
+                    ports:
+                      - containerPort: 80
+
+    - name: Test rollback with label selectors
+      k8s_rollback:
+        api_version: apps/v1
+        kind: Deployment
+        name: nginx-labeled
+        namespace: "{{ namespace }}"
+        label_selectors:
+          - "test-group=label-selector-test"
+      register: result
+
+    - name: Assert label selector rollback worked
+      assert:
+        that:
+          - result is changed
+          - result.rollback_info | length == 1
+          - result.rollback_info[0].method == "patch"
+
+    - name: Create deployment with single revision
+      k8s:
+        state: present
+        wait: yes
+        wait_timeout: 30
+        definition:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            name: single-revision
+            namespace: "{{ namespace }}"
+          spec:
+            replicas: 1
+            selector:
+              matchLabels:
+                app: single-revision
+            template:
+              metadata:
+                labels:
+                  app: single-revision
+              spec:
+                containers:
+                  - name: nginx
+                    image: nginx:1.17
+                    ports:
+                      - containerPort: 80
+
+    - name: Try to rollback deployment with no previous revisions
+      k8s_rollback:
+        api_version: apps/v1
+        kind: Deployment
+        name: single-revision
+        namespace: "{{ namespace }}"
+      register: result
+
+    - name: Debug result
+      debug:
+        var: result
+
+    - name: Assert warning is returned for no rollout history
+      assert:
+        that:
+          - not result.changed
+          - result.warnings is defined
+          - "'No rollout history found' in result.warnings[0]"
+
+    - name: Create a service for unsupported resource test
+      k8s:
+        state: present
+        definition:
+          apiVersion: v1
+          kind: Service
+          metadata:
+            name: test-service
+            namespace: "{{ namespace }}"
+          spec:
+            selector:
+              app: nginx
+            ports:
+              - port: 80
+                targetPort: 80
+
+    - name: Test rollback on unsupported resource type
+      k8s_rollback:
+        api_version: v1
+        kind: Service
+        name: test-service
+        namespace: "{{ namespace }}"
+      register: result
+      ignore_errors: yes
+
+    - name: Assert error message for unsupported resource
+      assert:
+        that:
+          - not result.changed
+          - "'Cannot perform rollback on resource of kind Service' in result.msg"
+
+    - name: Test rollback on non-existent deployment
+      k8s_rollback:
+        api_version: apps/v1
+        kind: Deployment
+        name: non-existent
+        namespace: "{{ namespace }}"
+      register: result
+
+    - name: Assert no resources found
+      assert:
+        that:
+          - not result.changed
+          - result.rollback_info | length == 0
+
+    - name: Create multiple deployments with same label
+      k8s:
+        state: present
+        wait: yes
+        wait_timeout: 30
+        definition:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            name: "multi-{{ item }}"
+            namespace: "{{ namespace }}"
+            labels:
+              group: multi-test
+              app: multi
+          spec:
+            replicas: 1
+            selector:
+              matchLabels:
+                app: "multi-{{ item }}"
+            template:
+              metadata:
+                labels:
+                  app: "multi-{{ item }}"
+              spec:
+                containers:
+                  - name: nginx
+                    image: nginx:1.17
+                    ports:
+                      - containerPort: 80
+      loop: [1, 2, 3]
+
+    - name: Update multiple deployments to create second revisions
+      k8s:
+        state: present
+        wait: yes
+        wait_timeout: 30
+        definition:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            name: "multi-{{ item }}"
+            namespace: "{{ namespace }}"
+            labels:
+              group: multi-test
+              app: multi
+          spec:
+            replicas: 1
+            selector:
+              matchLabels:
+                app: "multi-{{ item }}"
+            template:
+              metadata:
+                labels:
+                  app: "multi-{{ item }}"
+              spec:
+                containers:
+                  - name: nginx
+                    image: nginx:1.18
+                    ports:
+                      - containerPort: 80
+      loop: [1, 2, 3]
+
+    - name: Rollback multiple deployments using label selector
+      k8s_rollback:
+        api_version: apps/v1
+        kind: Deployment
+        name: "multi-{{ item }}"
+        namespace: "{{ namespace }}"
+        label_selectors:
+          - "group=multi-test"
+      register: result
+      loop: [1, 2, 3]
+
+    - name: Assert multiple resources were rolled back
+      assert:
+        that:
+          - result.results | length == 3
+          - result.results | selectattr('changed', 'equalto', true) | list | length == 3
+          - result.results | selectattr('rollback_info', 'defined') | list | length == 3
+          - result.results | map(attribute='rollback_info') | map('first') | map(attribute='method') | select('equalto', 'patch') | list | length == 3
+
+    - name: Validate rollback_info structure for deployment
+      assert:
+        that:
+          - result.results is defined
+          - result.results[0].rollback_info is defined
+          - result.results[0].rollback_info | length > 0
+          - result.results[0].rollback_info[0].method == "patch"
+          - result.results[0].rollback_info[0].body is defined
+          - result.results[0].rollback_info[0].resources is defined
+          - result.results[0].rollback_info[0].resources.metadata is defined
+          - result.results[0].rollback_info[0].resources.spec is defined
+
+    - name: Test rollback with field selectors
+      k8s_rollback:
+        api_version: apps/v1
+        kind: Deployment
+        name: multi-1
+        namespace: "{{ namespace }}"
+        field_selectors:
+          - "metadata.name=multi-1"
+      register: result
+
+    - name: Assert field selector rollback worked
+      assert:
+        that:
+          - result is changed
+          - result.rollback_info | length == 1
+          - result.rollback_info[0].resources.metadata.name == "multi-1"
+
+    - name: Test check mode return values
+      k8s_rollback:
+        api_version: apps/v1
+        kind: Deployment
+        name: multi-2
+        namespace: "{{ namespace }}"
+      register: result
+      check_mode: yes
+
+    - name: Validate check mode returns expected structure
+      assert:
+        that:
+          - result is changed
+          - result.rollback_info is defined
+          - result.rollback_info[0].method == "patch"
+          - result.rollback_info[0].body is defined
+
   always:
     - name: Delete {{ namespace }} namespace
       k8s:

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

@@ -1,42 +1,4 @@
 ---
-k8s_pod_metadata:
-  labels:
-    app: "{{ k8s_pod_name }}"
-
-k8s_pod_spec:
-  serviceAccount: "{{ k8s_pod_service_account }}"
-  containers:
-    - image: "{{ k8s_pod_image }}"
-      imagePullPolicy: Always
-      name: "{{ k8s_pod_name }}"
-      command: "{{ k8s_pod_command }}"
-      readinessProbe:
-        initialDelaySeconds: 15
-        exec:
-          command:
-            - /bin/true
-      resources: "{{ k8s_pod_resources }}"
-      ports: "{{ k8s_pod_ports }}"
-      env: "{{ k8s_pod_env }}"
-
-
-k8s_pod_service_account: default
-
-k8s_pod_resources:
-  limits:
-    cpu: "100m"
-    memory: "100Mi"
-
-k8s_pod_command: []
-
-k8s_pod_ports: []
-
-k8s_pod_env: []
-
-k8s_pod_template:
-  metadata: "{{ k8s_pod_metadata }}"
-  spec: "{{ k8s_pod_spec }}"
-
 test_namespace: "scale"
 
 k8s_wait_timeout: 400

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

@@ -5,28 +5,32 @@
 
     - name: Add a deployment
       k8s:
+        namespace: "{{ scale_namespace }}"
         definition:
           apiVersion: apps/v1
           kind: Deployment
           metadata:
             name: scale-deploy
-            namespace: "{{ scale_namespace }}"
+            labels:
+              app: scale-deploy
           spec:
             replicas: 1
             selector:
               matchLabels:
-                app: "{{ k8s_pod_name }}"
-            template: "{{ k8s_pod_template }}"
-        wait: yes
+                app: scale-deploy
+            template:
+              metadata:
+                labels:
+                  app: scale-deploy
+              spec:
+                containers:
+                  - name: nginx
+                    image: nginx:latest
+                    ports:
+                      - containerPort: 80
+        wait: true
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
-        apply: yes
-      vars:
-        k8s_pod_name: scale-deploy
-        k8s_pod_image: gcr.io/kuar-demo/kuard-amd64:v0.10.0-green
-        k8s_pod_ports:
-          - containerPort: 8080
-            name: http
-            protocol: TCP
+        apply: true
 
     - name: Get pods in scale-deploy
       k8s_info:
@@ -44,7 +48,8 @@
         name: scale-deploy
         namespace: "{{ scale_namespace }}"
         replicas: 0
-        wait: yes
+        wait: true
+        wait_timeout: 60
       register: scale_down
       check_mode: true
 
@@ -75,7 +80,8 @@
         name: scale-deploy
         namespace: "{{ scale_namespace }}"
         replicas: 0
-        wait: yes
+        wait: true
+        wait_timeout: 60
       register: scale_down
       check_mode: true
 
@@ -106,7 +112,7 @@
         name: scale-deploy
         namespace: "{{ scale_namespace }}"
         replicas: 0
-        wait: yes
+        wait: true
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
       register: scale_down
       diff: true
@@ -138,7 +144,8 @@
         name: scale-deploy
         namespace: "{{ scale_namespace }}"
         replicas: 0
-        wait: yes
+        wait: true
+        wait_timeout: 60
       register: scale_down_idempotency
       diff: true
 
@@ -159,18 +166,20 @@
             replicas: 1
             selector:
               matchLabels:
-                app: "{{ k8s_pod_name }}"
-            template: "{{ k8s_pod_template }}"
-        wait: yes
+                app: scale-deploy
+            template:
+              metadata:
+                labels:
+                  app: scale-deploy
+              spec:
+                containers:
+                  - name: nginx
+                    image: nginx:latest
+                    ports:
+                      - containerPort: 80
+        wait: true
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
-        apply: yes
-      vars:
-        k8s_pod_name: scale-deploy
-        k8s_pod_image: gcr.io/kuar-demo/kuard-amd64:v0.10.0-green
-        k8s_pod_ports:
-          - containerPort: 8080
-            name: http
-            protocol: TCP
+        apply: true
       register: reapply_after_scale
 
     - name: Get pods in scale-deploy
@@ -199,7 +208,7 @@
         wait: yes
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
       register: scale_up
-      diff: no
+      diff: false
 
     - name: Get pods in scale-deploy
       k8s_info:
@@ -227,8 +236,9 @@
         namespace: "{{ scale_namespace }}"
         replicas: 2
         wait: yes
+        wait_timeout: 60
       register: scale_up_noop
-      diff: no
+      diff: false
 
     - name: Get pods in scale-deploy
       k8s_info:
@@ -255,7 +265,7 @@
         name: scale-deploy
         namespace: "{{ scale_namespace }}"
         replicas: 1
-        wait: no
+        wait: false
       register: scale_down_no_wait
       diff: true
 
@@ -302,12 +312,12 @@
         resource_version: 0
         label_selectors:
           - app=nginx
+        wait_timeout: 60
       register: scale_out
 
     - assert:
         that:
           - not scale_out.changed
-          - scale_out.results | selectattr('warning', 'defined') | list | length == 2
 
     - name: scale deployment using current replicas (wrong value)
       kubernetes.core.k8s_scale:
@@ -322,7 +332,6 @@
     - assert:
         that:
           - not scale_out.changed
-          - scale_out.results | selectattr('warning', 'defined') | list | length == 2
 
     - name: scale deployment using current replicas (right value)
       kubernetes.core.k8s_scale:

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

@@ -40,7 +40,7 @@
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
       vars:
         k8s_pod_name: wait-ds
-        k8s_pod_image: gcr.io/kuar-demo/kuard-amd64:1
+        k8s_pod_image: docker.io/busybox:latest
         k8s_pod_command:
           - sleep
           - "600"
@@ -71,7 +71,7 @@
         wait_timeout: 180
       vars:
         k8s_pod_name: wait-ds
-        k8s_pod_image: gcr.io/kuar-demo/kuard-amd64:2
+        k8s_pod_image: docker.io/alpine:latest
         k8s_pod_command:
           - sleep
           - "600"
@@ -82,7 +82,7 @@
       assert:
         that:
           - update_ds_check_mode is changed
-          - "update_ds_check_mode.result.spec.template.spec.containers[0].image == 'gcr.io/kuar-demo/kuard-amd64:2'"
+          - "update_ds_check_mode.result.spec.template.spec.containers[0].image == 'docker.io/alpine:latest'"
 
     - name: Update a daemonset
       k8s:
@@ -104,7 +104,7 @@
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
       vars:
         k8s_pod_name: wait-ds
-        k8s_pod_image: gcr.io/kuar-demo/kuard-amd64:3
+        k8s_pod_image: docker.io/busybox:latest
         k8s_pod_command:
           - sleep
           - "600"
@@ -125,7 +125,7 @@
       assert:
         that:
           - ds.result.status.currentNumberScheduled == ds.result.status.desiredNumberScheduled
-          - updated_ds_pods.resources[0].spec.containers[0].image.endswith(":3")
+          - updated_ds_pods.resources[0].spec.containers[0].image == 'docker.io/busybox:latest'
 
     - name: Create daemonset with nodeSelector and not existing label
       k8s:
@@ -145,7 +145,7 @@
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
       vars:
         k8s_pod_name: wait-daemonset-not-existing-label
-        k8s_pod_image: gcr.io/kuar-demo/kuard-amd64:1
+        k8s_pod_image: docker.io/busybox:latest
         k8s_pod_command:
           - sleep
           - "600"
@@ -187,7 +187,7 @@
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
       vars:
         k8s_pod_name: wait-sts
-        k8s_pod_image: gcr.io/kuar-demo/kuard-amd64:1
+        k8s_pod_image: docker.io/busybox:latest
         k8s_pod_command:
           - sleep
           - "600"
@@ -251,7 +251,7 @@
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
       vars:
         k8s_pod_name: wait-sts
-        k8s_pod_image: gcr.io/kuar-demo/kuard-amd64:3
+        k8s_pod_image: docker.io/alpine:latest
         k8s_pod_command:
           - sleep
           - "600"
@@ -272,7 +272,7 @@
       assert:
         that:
           - sts.result.spec.replicas == sts.result.status.readyReplicas
-          - updated_sts_pods.resources[0].spec.containers[0].image.endswith(":3")
+          - updated_sts_pods.resources[0].spec.containers[0].image == 'docker.io/alpine:latest'
 
     - name: Add a crashing pod
       k8s:
@@ -288,11 +288,11 @@
         wait_timeout: 30
       vars:
         k8s_pod_name: wait-crash-pod
-        k8s_pod_image: alpine:3.8
+        k8s_pod_image: busybox:latest
         k8s_pod_command:
           - /bin/false
       register: crash_pod
-      ignore_errors: yes
+      ignore_errors: true
 
     - name: Check that task failed
       assert:
@@ -315,7 +315,7 @@
         k8s_pod_name: wait-no-image-pod
         k8s_pod_image: i_made_this_up:and_this_too
       register: no_image_pod
-      ignore_errors: yes
+      ignore_errors: true
 
     - name: Check that task failed
       assert:
@@ -340,12 +340,11 @@
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
       vars:
         k8s_pod_name: wait-deploy
-        k8s_pod_image: gcr.io/kuar-demo/kuard-amd64:1
+        k8s_pod_image: docker.io/nginx:latest
         k8s_pod_ports:
           - containerPort: 8080
             name: http
             protocol: TCP
-
       register: deploy
 
     - name: Check that deployment wait worked
@@ -371,7 +370,7 @@
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
       vars:
         k8s_pod_name: wait-deploy
-        k8s_pod_image: gcr.io/kuar-demo/kuard-amd64:2
+        k8s_pod_image: docker.io/nginx:stable-alpine
         k8s_pod_ports:
           - containerPort: 8080
             name: http
@@ -394,7 +393,7 @@
         field_selectors:
           - status.phase=Running
       register: updated_deploy_pods
-      until: updated_deploy_pods.resources[0].spec.containers[0].image.endswith(':2')
+      until: updated_deploy_pods.resources[0].spec.containers[0].image == 'docker.io/nginx:stable-alpine'
       retries: 6
       delay: 5
 
@@ -474,11 +473,11 @@
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
       vars:
         k8s_pod_name: wait-crash-deploy
-        k8s_pod_image: alpine:3.8
+        k8s_pod_image: docker.io/nginx:latest
         k8s_pod_command:
           - /bin/false
       register: wait_crash_deploy
-      ignore_errors: yes
+      ignore_errors: true
 
     - name: Check that task failed
       assert:
@@ -495,7 +494,7 @@
         wait: yes
         wait_sleep: 2
         wait_timeout: 5
-      ignore_errors: yes
+      ignore_errors: true
       register: short_wait_remove_pod
 
     - name: Check that task failed
@@ -509,4 +508,4 @@
         kind: Namespace
         name: "{{ wait_namespace }}"
         state: absent
-      ignore_errors: yes
+      ignore_errors: true

tests/sanity/ignore-2.20.txt

@@ -1,12 +1,15 @@
 plugins/module_utils/client/discovery.py import-3.11!skip
 plugins/module_utils/client/discovery.py import-3.12!skip
 plugins/module_utils/client/discovery.py import-3.13!skip
+plugins/module_utils/client/discovery.py import-3.14!skip
 plugins/module_utils/client/resource.py import-3.11!skip
 plugins/module_utils/client/resource.py import-3.12!skip
 plugins/module_utils/client/resource.py import-3.13!skip
+plugins/module_utils/client/resource.py import-3.14!skip
 plugins/module_utils/k8sdynamicclient.py import-3.11!skip
 plugins/module_utils/k8sdynamicclient.py import-3.12!skip
 plugins/module_utils/k8sdynamicclient.py import-3.13!skip
+plugins/module_utils/k8sdynamicclient.py import-3.14!skip
 plugins/module_utils/version.py pylint!skip
 plugins/modules/k8s.py validate-modules:parameter-type-not-in-doc
 plugins/modules/k8s_scale.py validate-modules:parameter-type-not-in-doc

tests/sanity/ignore-2.21.txt

@@ -0,0 +1,36 @@
+plugins/module_utils/client/discovery.py import-3.11!skip
+plugins/module_utils/client/discovery.py import-3.12!skip
+plugins/module_utils/client/discovery.py import-3.13!skip
+plugins/module_utils/client/discovery.py import-3.14!skip
+plugins/module_utils/client/resource.py import-3.11!skip
+plugins/module_utils/client/resource.py import-3.12!skip
+plugins/module_utils/client/resource.py import-3.13!skip
+plugins/module_utils/client/resource.py import-3.14!skip
+plugins/module_utils/k8sdynamicclient.py import-3.11!skip
+plugins/module_utils/k8sdynamicclient.py import-3.12!skip
+plugins/module_utils/k8sdynamicclient.py import-3.13!skip
+plugins/module_utils/k8sdynamicclient.py import-3.14!skip
+plugins/module_utils/version.py pylint!skip
+plugins/modules/k8s.py validate-modules:parameter-type-not-in-doc
+plugins/modules/k8s_scale.py validate-modules:parameter-type-not-in-doc
+plugins/modules/k8s_service.py validate-modules:parameter-type-not-in-doc
+tests/unit/module_utils/fixtures/clusteroperator.yml yamllint!skip
+tests/unit/module_utils/fixtures/definitions.yml yamllint!skip
+tests/unit/module_utils/fixtures/deployments.yml yamllint!skip
+tests/integration/targets/k8s_delete/files/deployments.yaml yamllint!skip
+tests/unit/module_utils/fixtures/pods.yml yamllint!skip
+tests/integration/targets/helm/files/appversionless-chart-v2/templates/configmap.yaml yamllint!skip
+tests/integration/targets/helm/files/appversionless-chart/templates/configmap.yaml yamllint!skip
+tests/integration/targets/helm/files/test-chart-v2/templates/configmap.yaml yamllint!skip
+tests/integration/targets/helm/files/test-chart/templates/configmap.yaml yamllint!skip
+tests/integration/targets/helm_diff/files/test-chart/templates/configmap.yaml yamllint!skip
+tests/integration/targets/k8s_scale/files/deployment.yaml yamllint!skip
+plugins/modules/k8s.py validate-modules:return-syntax-error
+plugins/modules/k8s_scale.py validate-modules:return-syntax-error
+plugins/modules/k8s_service.py validate-modules:return-syntax-error
+plugins/modules/k8s_taint.py validate-modules:return-syntax-error
+tests/integration/targets/helm_diff/files/test-chart-reuse-values/templates/configmap.yaml yamllint!skip
+tests/integration/targets/helm_registry_auth/tasks/main.yaml yamllint!skip
+tests/integration/targets/helm_diff/files/test-chart-deployment-time/templates/configmap.yaml yamllint!skip
+plugins/modules/helm.py validate-modules:bad-return-value-key
+plugins/modules/helm_info.py validate-modules:bad-return-value-key

tests/sanity/ignore-2.22.txt

@@ -0,0 +1,35 @@
+plugins/module_utils/client/discovery.py import-3.11!skip
+plugins/module_utils/client/discovery.py import-3.12!skip
+plugins/module_utils/client/discovery.py import-3.13!skip
+plugins/module_utils/client/discovery.py import-3.14!skip
+plugins/module_utils/client/resource.py import-3.11!skip
+plugins/module_utils/client/resource.py import-3.12!skip
+plugins/module_utils/client/resource.py import-3.13!skip
+plugins/module_utils/client/resource.py import-3.14!skip
+plugins/module_utils/k8sdynamicclient.py import-3.11!skip
+plugins/module_utils/k8sdynamicclient.py import-3.12!skip
+plugins/module_utils/k8sdynamicclient.py import-3.13!skip
+plugins/module_utils/k8sdynamicclient.py import-3.14!skip
+plugins/module_utils/version.py pylint!skip
+plugins/modules/k8s.py validate-modules:parameter-type-not-in-doc
+plugins/modules/k8s_scale.py validate-modules:parameter-type-not-in-doc
+plugins/modules/k8s_service.py validate-modules:parameter-type-not-in-doc
+tests/unit/module_utils/fixtures/clusteroperator.yml yamllint!skip
+tests/unit/module_utils/fixtures/definitions.yml yamllint!skip
+tests/unit/module_utils/fixtures/deployments.yml yamllint!skip
+tests/integration/targets/k8s_delete/files/deployments.yaml yamllint!skip
+tests/unit/module_utils/fixtures/pods.yml yamllint!skip
+tests/integration/targets/helm/files/appversionless-chart-v2/templates/configmap.yaml yamllint!skip
+tests/integration/targets/helm/files/appversionless-chart/templates/configmap.yaml yamllint!skip
+tests/integration/targets/helm/files/test-chart-v2/templates/configmap.yaml yamllint!skip
+tests/integration/targets/helm/files/test-chart/templates/configmap.yaml yamllint!skip
+tests/integration/targets/helm_diff/files/test-chart/templates/configmap.yaml yamllint!skip
+tests/integration/targets/k8s_scale/files/deployment.yaml yamllint!skip
+plugins/modules/k8s.py validate-modules:return-syntax-error
+plugins/modules/k8s_scale.py validate-modules:return-syntax-error
+plugins/modules/k8s_service.py validate-modules:return-syntax-error
+plugins/modules/k8s_taint.py validate-modules:return-syntax-error
+tests/integration/targets/helm_diff/files/test-chart-reuse-values/templates/configmap.yaml yamllint!skip
+tests/integration/targets/helm_diff/files/test-chart-deployment-time/templates/configmap.yaml yamllint!skip
+plugins/modules/helm.py validate-modules:bad-return-value-key
+plugins/modules/helm_info.py validate-modules:bad-return-value-key

tests/unit/conftest.py

@@ -10,7 +10,6 @@ import ansible.module_utils.basic
 import pytest
 from ansible.module_utils._text import to_bytes
 from ansible.module_utils.common._collections_compat import MutableMapping
-from ansible.module_utils.six import string_types
 
 
 @pytest.fixture
@@ -20,7 +19,7 @@ def stdin(mocker, request):
     old_argv = sys.argv
     sys.argv = ["ansible_unittest"]
 
-    if isinstance(request.param, string_types):
+    if isinstance(request.param, str):
         args = request.param
     elif isinstance(request.param, MutableMapping):
         if "ANSIBLE_MODULE_ARGS" not in request.param:

tests/unit/module_utils/test_helm.py

@@ -443,3 +443,46 @@ def test_module_get_helm_set_values_args(set_values, expected):
 
     result = helm_module.get_helm_set_values_args(set_values)
     assert " ".join(expected) == result
+
+
+@pytest.mark.parametrize(
+    "helm_version,should_fail",
+    [
+        ("3.0.0", False),
+        ("3.5.0", False),
+        ("3.10.3", False),
+        ("3.15.0", False),
+        ("3.17.0", False),
+        ("2.9.0", True),
+        ("2.17.0", True),
+        ("4.0.0", True),
+        ("4.1.0", True),
+        ("5.0.0", True),
+    ],
+)
+def test_module_validate_helm_version(_ansible_helm_module, helm_version, should_fail):
+    _ansible_helm_module.get_helm_version = MagicMock()
+    _ansible_helm_module.get_helm_version.return_value = helm_version
+
+    if should_fail:
+        with pytest.raises(SystemExit):
+            _ansible_helm_module.validate_helm_version()
+        _ansible_helm_module.fail_json.assert_called_once()
+        call_args = _ansible_helm_module.fail_json.call_args
+        assert "Helm version must be >=3.0.0,<4.0.0" in call_args[1]["msg"]
+        assert helm_version in call_args[1]["msg"]
+    else:
+        _ansible_helm_module.validate_helm_version()
+        _ansible_helm_module.fail_json.assert_not_called()
+
+
+def test_module_validate_helm_version_none(_ansible_helm_module):
+    _ansible_helm_module.get_helm_version = MagicMock()
+    _ansible_helm_module.get_helm_version.return_value = None
+
+    with pytest.raises(SystemExit):
+        _ansible_helm_module.validate_helm_version()
+
+    _ansible_helm_module.fail_json.assert_called_once_with(
+        msg="Unable to determine Helm version"
+    )

tests/unit/module_utils/test_kubeconfig_redaction.py

@@ -0,0 +1,401 @@
+# Copyright [2025] [Red Hat, Inc.]
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import json
+import warnings
+
+import pytest
+from ansible_collections.kubernetes.core.plugins.module_utils.args_common import (
+    extract_sensitive_values_from_kubeconfig,
+)
+
+
+@pytest.fixture
+def mock_kubeconfig_with_sensitive_data():
+    return {
+        "apiVersion": "v1",
+        "kind": "Config",
+        "clusters": [
+            {
+                "name": "test-cluster",
+                "cluster": {
+                    "server": "https://test-cluster.example.com",
+                    "certificate-authority-data": "LS0tLS1CRUdJTi...fake-cert-data",
+                    "insecure-skip-tls-verify": False,
+                },
+            }
+        ],
+        "contexts": [
+            {
+                "name": "test-context",
+                "context": {
+                    "cluster": "test-cluster",
+                    "user": "test-user",
+                    "namespace": "default",
+                },
+            }
+        ],
+        "current-context": "test-context",
+        "users": [
+            {
+                "name": "test-user",
+                "user": {
+                    "client-certificate-data": "LS0tLS1CRUdJTi...fake-client-cert",
+                    "client-key-data": "LS0tLS1CRUdJTi...fake-client-key",
+                    "token": "eyJhbGciOiJSUzI1NiIs...fake-token",
+                    "password": "fake-password-123",
+                    "username": "testuser",
+                },
+            },
+            {
+                "name": "service-account-user",
+                "user": {
+                    "token": "eyJhbGciOiJSUzI1NiIs...fake-service-token",
+                },
+            },
+        ],
+    }
+
+
+@pytest.fixture
+def mock_kubeconfig_with_nested_sensitive_data():
+    return {
+        "apiVersion": "v1",
+        "kind": "Config",
+        "clusters": [
+            {
+                "name": "cluster-1",
+                "cluster": {
+                    "certificate-authority-data": "fake-ca-data-1",
+                },
+            },
+            {
+                "name": "cluster-2",
+                "cluster": {
+                    "certificate-authority-data": "fake-ca-data-2",
+                },
+            },
+        ],
+        "users": [
+            {
+                "name": "user-1",
+                "user": {
+                    "client-certificate-data": "fake-cert-1",
+                    "client-key-data": "fake-key-1",
+                    "token": "fake-token-1",
+                    "secret": "fake-secret-1",
+                    "api_key": "fake-api-key-1",
+                    "access-token": "fake-access-token-1",
+                    "refresh-token": "fake-refresh-token-1",
+                },
+            },
+        ],
+    }
+
+
+@pytest.fixture
+def mock_kubeconfig_without_sensitive_data():
+    return {
+        "apiVersion": "v1",
+        "kind": "Config",
+        "clusters": [
+            {
+                "name": "test-cluster",
+                "cluster": {
+                    "server": "https://test-cluster.example.com",
+                    "insecure-skip-tls-verify": True,
+                },
+            }
+        ],
+        "users": [
+            {
+                "name": "test-user",
+                "user": {
+                    "username": "testuser",
+                },
+            }
+        ],
+    }
+
+
+@pytest.fixture
+def mock_kubeconfig_v2():
+    """Mock kubeconfig with API version v2 to test warning behavior."""
+    return {
+        "apiVersion": "v2",
+        "kind": "Config",
+        "clusters": [
+            {
+                "name": "test-cluster",
+                "cluster": {
+                    "server": "https://test-cluster.example.com",
+                    "certificate-authority-data": "fake-ca-data-v2",
+                },
+            }
+        ],
+        "users": [
+            {
+                "name": "test-user",
+                "user": {
+                    "token": "fake-token-v2",
+                    "password": "fake-password-v2",
+                },
+            }
+        ],
+    }
+
+
+def test_extract_sensitive_values_basic(mock_kubeconfig_with_sensitive_data):
+    result = extract_sensitive_values_from_kubeconfig(
+        mock_kubeconfig_with_sensitive_data
+    )
+
+    # Should extract all sensitive string values
+    expected_values = {
+        "LS0tLS1CRUdJTi...fake-cert-data",  # certificate-authority-data
+        "LS0tLS1CRUdJTi...fake-client-cert",  # client-certificate-data
+        "LS0tLS1CRUdJTi...fake-client-key",  # client-key-data
+        "eyJhbGciOiJSUzI1NiIs...fake-token",  # token
+        "fake-password-123",  # password
+        "eyJhbGciOiJSUzI1NiIs...fake-service-token",  # second token
+    }
+
+    assert result == expected_values
+
+
+def test_extract_sensitive_values_nested(mock_kubeconfig_with_nested_sensitive_data):
+    result = extract_sensitive_values_from_kubeconfig(
+        mock_kubeconfig_with_nested_sensitive_data
+    )
+
+    # Should extract all sensitive values from multiple clusters and users
+    expected_values = {
+        "fake-ca-data-1",
+        "fake-ca-data-2",
+        "fake-cert-1",
+        "fake-key-1",
+        "fake-token-1",
+        "fake-secret-1",
+        "fake-api-key-1",
+        "fake-access-token-1",
+        "fake-refresh-token-1",
+    }
+
+    assert result == expected_values
+
+
+def test_extract_sensitive_values_no_sensitive_data(
+    mock_kubeconfig_without_sensitive_data,
+):
+    result = extract_sensitive_values_from_kubeconfig(
+        mock_kubeconfig_without_sensitive_data
+    )
+
+    # Should return empty set since there is no sensitive data
+    assert result == set()
+
+
+def test_redaction_placeholder_appears_in_output(mock_kubeconfig_with_sensitive_data):
+    """Test that sensitive values are replaced with VALUE_SPECIFIED_IN_NO_LOG_PARAMETER in output."""
+    sensitive_values = extract_sensitive_values_from_kubeconfig(
+        mock_kubeconfig_with_sensitive_data
+    )
+
+    # Create a mock module output that would contain sensitive data
+    mock_output = {
+        "kubeconfig": mock_kubeconfig_with_sensitive_data,
+        "result": "success",
+        "sensitive_token": "eyJhbGciOiJSUzI1NiIs...fake-token",
+        "sensitive_password": "fake-password-123",
+    }
+
+    # Simulate what Ansible does when no_log_values is set
+    json_str = json.dumps(mock_output)
+    for sensitive_value in sensitive_values:
+        json_str = json_str.replace(
+            f'"{sensitive_value}"', '"VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"'
+        )
+    redacted_output = json.loads(json_str)
+
+    # Verify that sensitive values are replaced with the redaction placeholder
+    assert redacted_output["sensitive_token"] == "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+    assert (
+        redacted_output["sensitive_password"] == "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+    )
+
+    # Verify that non-sensitive data remains unchanged
+    assert redacted_output["result"] == "success"
+    assert redacted_output["kubeconfig"]["users"][0]["user"]["username"] == "testuser"
+
+
+def test_redaction_placeholder_appears_in_nested_output(
+    mock_kubeconfig_with_nested_sensitive_data,
+):
+    # Extract sensitive values
+    sensitive_values = extract_sensitive_values_from_kubeconfig(
+        mock_kubeconfig_with_nested_sensitive_data
+    )
+
+    # Create a mock module output that would contain nested sensitive data
+    mock_output = {
+        "kubeconfig": mock_kubeconfig_with_nested_sensitive_data,
+        "result": "success",
+        "cluster_ca_data": "fake-ca-data-1",
+        "user_cert_data": "fake-cert-1",
+        "user_key_data": "fake-key-1",
+        "user_token": "fake-token-1",
+        "user_secret": "fake-secret-1",
+        "api_key": "fake-api-key-1",
+        "access_token": "fake-access-token-1",
+        "refresh_token": "fake-refresh-token-1",
+    }
+
+    # Simulate what Ansible does when no_log_values is set
+    json_str = json.dumps(mock_output)
+    for sensitive_value in sensitive_values:
+        json_str = json_str.replace(
+            f'"{sensitive_value}"', '"VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"'
+        )
+    redacted_output = json.loads(json_str)
+
+    # Verify that sensitive values are replaced with the redaction placeholder
+    assert redacted_output["cluster_ca_data"] == "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+    assert redacted_output["user_cert_data"] == "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+    assert redacted_output["user_key_data"] == "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+    assert redacted_output["user_token"] == "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+    assert redacted_output["user_secret"] == "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+    assert redacted_output["api_key"] == "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+    assert redacted_output["access_token"] == "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+    assert redacted_output["refresh_token"] == "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+
+    # Verify that non-sensitive data remains unchanged
+    assert redacted_output["result"] == "success"
+    assert redacted_output["kubeconfig"]["apiVersion"] == "v1"
+    assert redacted_output["kubeconfig"]["kind"] == "Config"
+    assert redacted_output["kubeconfig"]["clusters"][0]["name"] == "cluster-1"
+    assert redacted_output["kubeconfig"]["clusters"][1]["name"] == "cluster-2"
+    assert redacted_output["kubeconfig"]["users"][0]["name"] == "user-1"
+
+    # Verify that sensitive values within the nested kubeconfig structure are also redacted
+    assert (
+        redacted_output["kubeconfig"]["clusters"][0]["cluster"][
+            "certificate-authority-data"
+        ]
+        == "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+    )
+    assert (
+        redacted_output["kubeconfig"]["clusters"][1]["cluster"][
+            "certificate-authority-data"
+        ]
+        == "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+    )
+    assert (
+        redacted_output["kubeconfig"]["users"][0]["user"]["client-certificate-data"]
+        == "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+    )
+    assert (
+        redacted_output["kubeconfig"]["users"][0]["user"]["client-key-data"]
+        == "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+    )
+    assert (
+        redacted_output["kubeconfig"]["users"][0]["user"]["token"]
+        == "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+    )
+    assert (
+        redacted_output["kubeconfig"]["users"][0]["user"]["secret"]
+        == "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+    )
+    assert (
+        redacted_output["kubeconfig"]["users"][0]["user"]["api_key"]
+        == "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+    )
+    assert (
+        redacted_output["kubeconfig"]["users"][0]["user"]["access-token"]
+        == "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+    )
+    assert (
+        redacted_output["kubeconfig"]["users"][0]["user"]["refresh-token"]
+        == "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+    )
+
+
+def test_warning_for_non_v1_api_version(mock_kubeconfig_v2):
+    with pytest.warns(UserWarning) as warning_list:
+        result = extract_sensitive_values_from_kubeconfig(mock_kubeconfig_v2)
+
+    # Verify that exactly one warning was raised
+    assert len(warning_list) == 1
+
+    # Verify the warning message content
+    warning = warning_list[0]
+    assert "Kubeconfig API version 'v2' is not 'v1'" in str(warning.message)
+
+    # Verify that the function still works and extracts sensitive values
+    expected_values = {
+        "fake-ca-data-v2",
+        "fake-token-v2",
+        "fake-password-v2",
+    }
+    assert result == expected_values
+
+
+def test_no_warning_for_v1_api_version(mock_kubeconfig_with_sensitive_data):
+    with warnings.catch_warnings(record=True) as warning_list:
+        warnings.simplefilter("always")  # Capture all warnings
+        result = extract_sensitive_values_from_kubeconfig(
+            mock_kubeconfig_with_sensitive_data
+        )
+
+    # Filter for UserWarning specifically (our warning type)
+    user_warnings = [w for w in warning_list if issubclass(w.category, UserWarning)]
+    assert len(user_warnings) == 0
+
+    # Verify that the function still works normally
+    assert len(result) > 0
+
+
+def test_no_warning_for_missing_api_version():
+    """Test that no warning is raised when apiVersion field is missing (defaults to v1)."""
+    kubeconfig_no_version = {
+        "kind": "Config",
+        "clusters": [
+            {
+                "name": "test-cluster",
+                "cluster": {
+                    "server": "https://test-cluster.example.com",
+                    "certificate-authority-data": "fake-ca-data",
+                },
+            }
+        ],
+        "users": [
+            {
+                "name": "test-user",
+                "user": {
+                    "token": "fake-token",
+                },
+            }
+        ],
+    }
+
+    with warnings.catch_warnings(record=True) as warning_list:
+        warnings.simplefilter("always")  # Capture all warnings
+        result = extract_sensitive_values_from_kubeconfig(kubeconfig_no_version)
+
+    # Filter for UserWarning specifically (our warning type)
+    user_warnings = [w for w in warning_list if issubclass(w.category, UserWarning)]
+    assert len(user_warnings) == 0
+
+    # Verify that the function still works normally
+    expected_values = {"fake-ca-data", "fake-token"}
+    assert result == expected_values

tests/unit/modules/test_helm_template_module.py

@@ -43,15 +43,21 @@ class TestDependencyUpdateWithoutChartRepoUrlOption(unittest.TestCase):
     def test_dependency_update_option_not_defined(self):
         set_module_args({"chart_ref": "/tmp/path"})
         with patch.object(basic.AnsibleModule, "run_command") as mock_run_command:
-            mock_run_command.return_value = (
+            # Mock responses: first call is helm version, second is the actual command
+            mock_run_command.side_effect = [
+                (
                     0,
-                "configuration updated",
+                    'version.BuildInfo{Version:"v3.10.0", GitCommit:"", GoVersion:"go1.18"}',
                     "",
-            )  # successful execution
+                ),
+                (0, "configuration updated", ""),
+            ]
             with self.assertRaises(AnsibleExitJson) as result:
                 helm_template.main()
-        mock_run_command.assert_called_once_with(
-            "/usr/bin/helm template /tmp/path", environ_update={}, data=None
+        # Check the last call was the actual helm template command
+        assert (
+            mock_run_command.call_args_list[-1][0][0]
+            == "/usr/bin/helm template /tmp/path"
         )
         assert result.exception.args[0]["command"] == "/usr/bin/helm template /tmp/path"
 
@@ -64,17 +70,21 @@ class TestDependencyUpdateWithoutChartRepoUrlOption(unittest.TestCase):
             }
         )
         with patch.object(basic.AnsibleModule, "run_command") as mock_run_command:
-            mock_run_command.return_value = (
+            # Mock responses: first call is helm version, second is the actual command
+            mock_run_command.side_effect = [
+                (
                     0,
-                "configuration updated",
+                    'version.BuildInfo{Version:"v3.10.0", GitCommit:"", GoVersion:"go1.18"}',
                     "",
-            )  # successful execution
+                ),
+                (0, "configuration updated", ""),
+            ]
             with self.assertRaises(AnsibleExitJson) as result:
                 helm_template.main()
-        mock_run_command.assert_called_once_with(
-            "/usr/bin/helm template test --repo=https://charts.com/test",
-            environ_update={},
-            data=None,
+        # Check the last call was the actual helm template command
+        assert (
+            mock_run_command.call_args_list[-1][0][0]
+            == "/usr/bin/helm template test --repo=https://charts.com/test"
         )
         assert (
             result.exception.args[0]["command"]
@@ -86,17 +96,21 @@ class TestDependencyUpdateWithoutChartRepoUrlOption(unittest.TestCase):
             {"chart_ref": "https://charts/example.tgz", "dependency_update": True}
         )
         with patch.object(basic.AnsibleModule, "run_command") as mock_run_command:
-            mock_run_command.return_value = (
+            # Mock responses: first call is helm version, second is the actual command
+            mock_run_command.side_effect = [
+                (
                     0,
-                "configuration updated",
+                    'version.BuildInfo{Version:"v3.10.0", GitCommit:"", GoVersion:"go1.18"}',
                     "",
-            )  # successful execution
+                ),
+                (0, "configuration updated", ""),
+            ]
             with self.assertRaises(AnsibleExitJson) as result:
                 helm_template.main()
-        mock_run_command.assert_called_once_with(
-            "/usr/bin/helm template https://charts/example.tgz --dependency-update",
-            environ_update={},
-            data=None,
+        # Check the last call was the actual helm template command
+        assert (
+            mock_run_command.call_args_list[-1][0][0]
+            == "/usr/bin/helm template https://charts/example.tgz --dependency-update"
         )
         assert (
             result.exception.args[0]["command"]

tests/unit/modules/test_module_helm.py

@@ -7,7 +7,7 @@ from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
 import unittest
-from unittest.mock import MagicMock, call, patch
+from unittest.mock import MagicMock, patch
 
 from ansible.module_utils import basic
 from ansible_collections.kubernetes.core.plugins.modules import helm
@@ -77,18 +77,22 @@ class TestDependencyUpdateWithoutChartRepoUrlOption(unittest.TestCase):
         helm.fetch_chart_info = MagicMock(return_value=self.chart_info_without_dep)
         helm.run_dep_update = MagicMock()
         with patch.object(basic.AnsibleModule, "run_command") as mock_run_command:
-            mock_run_command.return_value = (
+            # Mock responses: first call is helm version, second is the actual command
+            mock_run_command.side_effect = [
+                (
                     0,
-                "configuration updated",
+                    'version.BuildInfo{Version:"v3.10.0", GitCommit:"", GoVersion:"go1.18"}',
                     "",
-            )  # successful execution
+                ),
+                (0, "configuration updated", ""),
+            ]
             with self.assertRaises(AnsibleExitJson) as result:
                 helm.main()
         helm.run_dep_update.assert_not_called()
-        mock_run_command.assert_called_once_with(
-            "/usr/bin/helm upgrade -i --reset-values test '/tmp/path'",
-            environ_update={"HELM_NAMESPACE": "test"},
-            data=None,
+        # Check the last call (actual helm command, after version check)
+        assert (
+            mock_run_command.call_args_list[-1][0][0]
+            == "/usr/bin/helm upgrade -i --reset-values test '/tmp/path'"
         )
         assert (
             result.exception.args[0]["command"]
@@ -108,18 +112,22 @@ class TestDependencyUpdateWithoutChartRepoUrlOption(unittest.TestCase):
         helm.fetch_chart_info = MagicMock(return_value=self.chart_info_without_dep)
         helm.run_dep_update = MagicMock()
         with patch.object(basic.AnsibleModule, "run_command") as mock_run_command:
-            mock_run_command.return_value = (
+            # Mock responses: first call is helm version, second is the actual command
+            mock_run_command.side_effect = [
+                (
                     0,
-                "configuration updated",
+                    'version.BuildInfo{Version:"v3.10.0", GitCommit:"", GoVersion:"go1.18"}',
                     "",
-            )  # successful execution
+                ),
+                (0, "configuration updated", ""),
+            ]
             with self.assertRaises(AnsibleExitJson) as result:
                 helm.main()
         helm.run_dep_update.assert_not_called()
-        mock_run_command.assert_called_once_with(
-            "/usr/bin/helm upgrade -i --reset-values test '/tmp/path'",
-            environ_update={"HELM_NAMESPACE": "test"},
-            data=None,
+        # Check the last call (actual helm command, after version check)
+        assert (
+            mock_run_command.call_args_list[-1][0][0]
+            == "/usr/bin/helm upgrade -i --reset-values test '/tmp/path'"
         )
         assert (
             result.exception.args[0]["command"]
@@ -139,19 +147,23 @@ class TestDependencyUpdateWithoutChartRepoUrlOption(unittest.TestCase):
         helm.fetch_chart_info = MagicMock(return_value=self.chart_info_with_dep)
 
         with patch.object(basic.AnsibleModule, "run_command") as mock_run_command:
-            mock_run_command.return_value = 0, "configuration updated", ""
+            # Mock responses: first call is helm version, second is the actual command
+            mock_run_command.side_effect = [
+                (
+                    0,
+                    'version.BuildInfo{Version:"v3.10.0", GitCommit:"", GoVersion:"go1.18"}',
+                    "",
+                ),
+                (0, "configuration updated", ""),
+            ]
             with patch.object(basic.AnsibleModule, "warn") as mock_warn:
                 with self.assertRaises(AnsibleExitJson) as result:
                     helm.main()
         mock_warn.assert_not_called()
-        mock_run_command.assert_has_calls(
-            [
-                call(
-                    "/usr/bin/helm upgrade -i --reset-values test '/tmp/path'",
-                    environ_update={"HELM_NAMESPACE": "test"},
-                    data=None,
-                )
-            ]
+        # Check calls include the actual helm command (after version check)
+        assert any(
+            "/usr/bin/helm upgrade -i --reset-values test '/tmp/path'" in str(call)
+            for call in mock_run_command.call_args_list
         )
         assert (
             result.exception.args[0]["command"]
@@ -170,23 +182,23 @@ class TestDependencyUpdateWithoutChartRepoUrlOption(unittest.TestCase):
         helm.get_release_status = MagicMock(return_value=None)
         helm.fetch_chart_info = MagicMock(return_value=self.chart_info_without_dep)
         with patch.object(basic.AnsibleModule, "run_command") as mock_run_command:
-            mock_run_command.return_value = (
+            # Mock responses: first call is helm version, second is the actual command
+            mock_run_command.side_effect = [
+                (
                     0,
-                "configuration updated",
+                    'version.BuildInfo{Version:"v3.10.0", GitCommit:"", GoVersion:"go1.18"}',
                     "",
-            )  # successful execution
+                ),
+                (0, "configuration updated", ""),
+            ]
             with patch.object(basic.AnsibleModule, "warn") as mock_warn:
                 with self.assertRaises(AnsibleExitJson) as result:
                     helm.main()
         mock_warn.assert_called_once()
-        mock_run_command.assert_has_calls(
-            [
-                call(
-                    "/usr/bin/helm upgrade -i --reset-values test '/tmp/path'",
-                    environ_update={"HELM_NAMESPACE": "test"},
-                    data=None,
-                )
-            ]
+        # Check calls include the actual helm command (after version check)
+        assert any(
+            "/usr/bin/helm upgrade -i --reset-values test '/tmp/path'" in str(call)
+            for call in mock_run_command.call_args_list
         )
         assert (
             result.exception.args[0]["command"]
@@ -245,17 +257,21 @@ class TestDependencyUpdateWithChartRepoUrlOption(unittest.TestCase):
         helm.get_release_status = MagicMock(return_value=None)
         helm.fetch_chart_info = MagicMock(return_value=self.chart_info_without_dep)
         with patch.object(basic.AnsibleModule, "run_command") as mock_run_command:
-            mock_run_command.return_value = (
+            # Mock responses: first call is helm version, second is the actual command
+            mock_run_command.side_effect = [
+                (
                     0,
-                "configuration updated",
+                    'version.BuildInfo{Version:"v3.10.0", GitCommit:"", GoVersion:"go1.18"}',
                     "",
-            )  # successful execution
+                ),
+                (0, "configuration updated", ""),
+            ]
             with self.assertRaises(AnsibleExitJson) as result:
                 helm.main()
-        mock_run_command.assert_called_once_with(
-            "/usr/bin/helm --repo=http://repo.example/charts upgrade -i --reset-values test 'chart1'",
-            environ_update={"HELM_NAMESPACE": "test"},
-            data=None,
+        # Check the last call (actual helm command, after version check)
+        assert (
+            mock_run_command.call_args_list[-1][0][0]
+            == "/usr/bin/helm --repo=http://repo.example/charts upgrade -i --reset-values test 'chart1'"
         )
         assert (
             result.exception.args[0]["command"]
@@ -275,17 +291,21 @@ class TestDependencyUpdateWithChartRepoUrlOption(unittest.TestCase):
         helm.get_release_status = MagicMock(return_value=None)
         helm.fetch_chart_info = MagicMock(return_value=self.chart_info_without_dep)
         with patch.object(basic.AnsibleModule, "run_command") as mock_run_command:
-            mock_run_command.return_value = (
+            # Mock responses: first call is helm version, second is the actual command
+            mock_run_command.side_effect = [
+                (
                     0,
-                "configuration updated",
+                    'version.BuildInfo{Version:"v3.10.0", GitCommit:"", GoVersion:"go1.18"}',
                     "",
-            )  # successful execution
+                ),
+                (0, "configuration updated", ""),
+            ]
             with self.assertRaises(AnsibleExitJson) as result:
                 helm.main()
-        mock_run_command.assert_called_once_with(
-            "/usr/bin/helm --repo=http://repo.example/charts upgrade -i --reset-values test 'chart1'",
-            environ_update={"HELM_NAMESPACE": "test"},
-            data=None,
+        # Check the last call (actual helm command, after version check)
+        assert (
+            mock_run_command.call_args_list[-1][0][0]
+            == "/usr/bin/helm --repo=http://repo.example/charts upgrade -i --reset-values test 'chart1'"
         )
         assert (
             result.exception.args[0]["command"]
@@ -305,11 +325,15 @@ class TestDependencyUpdateWithChartRepoUrlOption(unittest.TestCase):
         helm.get_release_status = MagicMock(return_value=None)
         helm.fetch_chart_info = MagicMock(return_value=self.chart_info_with_dep)
         with patch.object(basic.AnsibleModule, "run_command") as mock_run_command:
-            mock_run_command.return_value = (
+            # Mock responses: first call is helm version, second is the actual command
+            mock_run_command.side_effect = [
+                (
                     0,
-                "configuration updated",
+                    'version.BuildInfo{Version:"v3.10.0", GitCommit:"", GoVersion:"go1.18"}',
                     "",
-            )  # successful execution
+                ),
+                (0, "configuration updated", ""),
+            ]
             with self.assertRaises(AnsibleFailJson) as result:
                 helm.main()
         # mock_run_command.assert_called_once_with('/usr/bin/helm --repo=http://repo.example/charts upgrade -i --reset-values test chart1',
@@ -334,17 +358,21 @@ class TestDependencyUpdateWithChartRepoUrlOption(unittest.TestCase):
         helm.get_release_status = MagicMock(return_value=None)
         helm.fetch_chart_info = MagicMock(return_value=self.chart_info_without_dep)
         with patch.object(basic.AnsibleModule, "run_command") as mock_run_command:
-            mock_run_command.return_value = (
+            # Mock responses: first call is helm version, second is the actual command
+            mock_run_command.side_effect = [
+                (
                     0,
-                "configuration updated",
+                    'version.BuildInfo{Version:"v3.10.0", GitCommit:"", GoVersion:"go1.18"}',
                     "",
-            )  # successful execution
+                ),
+                (0, "configuration updated", ""),
+            ]
             with self.assertRaises(AnsibleExitJson) as result:
                 helm.main()
-        mock_run_command.assert_called_once_with(
-            "/usr/bin/helm --repo=http://repo.example/charts install --dependency-update --replace test 'chart1'",
-            environ_update={"HELM_NAMESPACE": "test"},
-            data=None,
+        # Check the last call (actual helm command, after version check)
+        assert (
+            mock_run_command.call_args_list[-1][0][0]
+            == "/usr/bin/helm --repo=http://repo.example/charts install --dependency-update --replace test 'chart1'"
         )
         assert (
             result.exception.args[0]["command"]
@@ -402,17 +430,21 @@ class TestDependencyUpdateWithChartRefIsUrl(unittest.TestCase):
         helm.get_release_status = MagicMock(return_value=None)
         helm.fetch_chart_info = MagicMock(return_value=self.chart_info_without_dep)
         with patch.object(basic.AnsibleModule, "run_command") as mock_run_command:
-            mock_run_command.return_value = (
+            # Mock responses: first call is helm version, second is the actual command
+            mock_run_command.side_effect = [
+                (
                     0,
-                "configuration updated",
+                    'version.BuildInfo{Version:"v3.10.0", GitCommit:"", GoVersion:"go1.18"}',
                     "",
-            )  # successful execution
+                ),
+                (0, "configuration updated", ""),
+            ]
             with self.assertRaises(AnsibleExitJson) as result:
                 helm.main()
-        mock_run_command.assert_called_once_with(
-            "/usr/bin/helm upgrade -i --reset-values test 'http://repo.example/charts/application.tgz'",
-            environ_update={"HELM_NAMESPACE": "test"},
-            data=None,
+        # Check the last call (actual helm command, after version check)
+        assert (
+            mock_run_command.call_args_list[-1][0][0]
+            == "/usr/bin/helm upgrade -i --reset-values test 'http://repo.example/charts/application.tgz'"
         )
         assert (
             result.exception.args[0]["command"]
@@ -431,17 +463,21 @@ class TestDependencyUpdateWithChartRefIsUrl(unittest.TestCase):
         helm.get_release_status = MagicMock(return_value=None)
         helm.fetch_chart_info = MagicMock(return_value=self.chart_info_without_dep)
         with patch.object(basic.AnsibleModule, "run_command") as mock_run_command:
-            mock_run_command.return_value = (
+            # Mock responses: first call is helm version, second is the actual command
+            mock_run_command.side_effect = [
+                (
                     0,
-                "configuration updated",
+                    'version.BuildInfo{Version:"v3.10.0", GitCommit:"", GoVersion:"go1.18"}',
                     "",
-            )  # successful execution
+                ),
+                (0, "configuration updated", ""),
+            ]
             with self.assertRaises(AnsibleExitJson) as result:
                 helm.main()
-        mock_run_command.assert_called_once_with(
-            "/usr/bin/helm upgrade -i --reset-values test 'http://repo.example/charts/application.tgz'",
-            environ_update={"HELM_NAMESPACE": "test"},
-            data=None,
+        # Check the last call (actual helm command, after version check)
+        assert (
+            mock_run_command.call_args_list[-1][0][0]
+            == "/usr/bin/helm upgrade -i --reset-values test 'http://repo.example/charts/application.tgz'"
         )
         assert (
             result.exception.args[0]["command"]
@@ -460,11 +496,15 @@ class TestDependencyUpdateWithChartRefIsUrl(unittest.TestCase):
         helm.get_release_status = MagicMock(return_value=None)
         helm.fetch_chart_info = MagicMock(return_value=self.chart_info_with_dep)
         with patch.object(basic.AnsibleModule, "run_command") as mock_run_command:
-            mock_run_command.return_value = (
+            # Mock responses: first call is helm version, second is the actual command
+            mock_run_command.side_effect = [
+                (
                     0,
-                "configuration updated",
+                    'version.BuildInfo{Version:"v3.10.0", GitCommit:"", GoVersion:"go1.18"}',
                     "",
-            )  # successful execution
+                ),
+                (0, "configuration updated", ""),
+            ]
             with self.assertRaises(AnsibleFailJson) as result:
                 helm.main()
         # mock_run_command.assert_called_once_with('/usr/bin/helm --repo=http://repo.example/charts upgrade -i --reset-values test chart1',
@@ -488,17 +528,21 @@ class TestDependencyUpdateWithChartRefIsUrl(unittest.TestCase):
         helm.get_release_status = MagicMock(return_value=None)
         helm.fetch_chart_info = MagicMock(return_value=self.chart_info_without_dep)
         with patch.object(basic.AnsibleModule, "run_command") as mock_run_command:
-            mock_run_command.return_value = (
+            # Mock responses: first call is helm version, second is the actual command
+            mock_run_command.side_effect = [
+                (
                     0,
-                "configuration updated",
+                    'version.BuildInfo{Version:"v3.10.0", GitCommit:"", GoVersion:"go1.18"}',
                     "",
-            )  # successful execution
+                ),
+                (0, "configuration updated", ""),
+            ]
             with self.assertRaises(AnsibleExitJson) as result:
                 helm.main()
-        mock_run_command.assert_called_once_with(
-            "/usr/bin/helm install --dependency-update --replace test 'http://repo.example/charts/application.tgz'",
-            environ_update={"HELM_NAMESPACE": "test"},
-            data=None,
+        # Check the last call (actual helm command, after version check)
+        assert (
+            mock_run_command.call_args_list[-1][0][0]
+            == "/usr/bin/helm install --dependency-update --replace test 'http://repo.example/charts/application.tgz'"
         )
         assert (
             result.exception.args[0]["command"]