Prepare release 3.2.0 (#746)

SUMMARY
Prepare version 3.2.0
ISSUE TYPE

New Version Pull Request

ADDITIONAL INFORMATION
The current version of a major Ansible (Ansible 10) includes a collection version 3.1.0, meaning that the minor version (i.e. Ansible 10.1) will pick versions from the stable-3 branch. Hence, a recent documentation update will not be in Ansible and Ansible documentation site/kubernetes.core collection chapter until a new minor version released from stable-3 branch.
This PR also includes changes in README.md and Makefile that were missed in 3.1.0

Reviewed-by: Mike Graves <mgraves@redhat.com>

.ansible-lint

@@ -2,8 +2,5 @@
 profile: production
 
 exclude_paths:
-  - .ansible/
-  - .github/
   - tests/integration
-  - tests/unit
   - tests/sanity

.ansible-lint-ignore

@@ -1,6 +1,2 @@
-# https://docs.ansible.com/ansible-lint/docs/rules/
 # no-changed-when is not requried for examples
 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/stale.yml

@@ -0,0 +1,60 @@
+---
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale
+# label is closed. Set to false to disable. If disabled, issues still need to be
+# closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale.
+# Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set
+# to `[]` to disable
+exemptLabels:
+  - security
+  - planned
+  - priority/critical
+  - lifecycle/frozen
+  - verified
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: true
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: lifecycle/stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    PRs go stale after 90 days of inactivity.
+    If there is no further activity, the PR will be closed in another 30 days.
+
+  unmarkComment: >-
+    This pull request is no longer stale.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity.
+
+issues:
+  markComment: |-
+    Issues go stale after 90 days of inactivity.
+    If there is no further activity, the issue will be closed in another 30 days.
+
+  unmarkComment: >-
+    This issue is no longer stale.
+
+  closeComment: >-
+    This issue has been closed due to inactivity.

.github/workflows/integration-tests-kubevirt.yaml

@@ -0,0 +1,127 @@
+name: Integration tests Kubevirt
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+    branches:
+      - main
+      - stable-*
+
+jobs:
+  splitter:
+    continue-on-error: true
+    env:
+      kubernetes: "./kubernetes"
+      kubevirt: "./kubevirt"
+      py_version: 3.9
+    runs-on: ubuntu-latest
+    outputs:
+      test_targets: ${{ steps.splitter.outputs.kubevirt_targets }}
+    steps:
+      - name: Checkout kubernetes.core repository
+        uses: actions/checkout@v3
+        with:
+          path: ${{ env.kubernetes }}
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Checkout the kubevirt.core collection
+        uses: actions/checkout@v3
+        with:
+          repository: kubevirt/kubevirt.core
+          path: ${{ env.kubevirt }}
+
+      - name: "Set up Python ${{ env.py_version }}"
+        uses: actions/setup-python@v4
+        with:
+          python-version: "${{ env.py_version }}"
+
+      - name: List targets from kubevirt.core collection
+        id: splitter
+        run: python ${{ env.kubernetes }}/tools/kubevirt_list_targets.py ${{ env.kubevirt }}
+        shell: bash
+
+  integration:
+    if: ${{ needs.splitter.outputs.test_targets != '' }}
+    name: "integration-kubevirt-${{ matrix.test-target }}"
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    needs:
+      - splitter
+    env:
+      kubernetes: "./kubernetes"
+      kubevirt: "./kubevirt"
+      ansible_version: milestone
+      python_version: 3.12
+    strategy:
+      fail-fast: false
+      matrix:
+        test-target: ${{ fromJson(needs.splitter.outputs.test_targets) }}
+    steps:
+      - name: Checkout kubernetes.core repository
+        uses: actions/checkout@v4
+        with:
+          path: ${{ env.kubernetes }}
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Checkout kubevirt.core repository
+        uses: actions/checkout@v4
+        with:
+          repository: kubevirt/kubevirt.core
+          path: ${{ env.kubevirt }}
+          ref: main
+
+      # Install ansible
+      - name: Install ansible-core (${{ env.ansible_version }})
+        run: >-
+          python3 -m pip install
+          https://github.com/ansible/ansible/archive/${{ env.ansible_version }}.tar.gz
+          --disable-pip-version-check
+        shell: bash
+
+      - name: Build and install kubevirt.core collection
+        id: install-kubevirt
+        uses: ansible-network/github_actions/.github/actions/build_install_collection@main
+        with:
+          install_python_dependencies: true
+          source_path: ${{ env.kubevirt }}
+
+      - name: Build and install kubernetes.core collection
+        id: install-kubernetes
+        uses: ansible-network/github_actions/.github/actions/build_install_collection@main
+        with:
+          install_python_dependencies: true
+          source_path: ${{ env.kubernetes }}
+
+      - name: Install kind / kubectl
+        uses: helm/kind-action@v1.9.0
+        with:
+          version: v0.22.0
+          install_only: true
+
+      - name: Deploy kubevirt
+        run: >-
+          ${{ env.kubevirt }}/hack/e2e-setup.sh \
+            -v \
+            --configure-inotify-limits \
+            --configure-secondary-network \
+            --deploy-kubevirt \
+            --deploy-kubevirt-cdi \
+            --deploy-kubevirt-common-instancetypes \
+            --deploy-cnao \
+            --create-cluster \
+            --create-nad
+        env:
+          KIND: kind
+          KUBECTL: kubectl
+
+      - name: Run integration tests
+        uses: ansible-network/github_actions/.github/actions/ansible_test_integration@main
+        with:
+          collection_path: ${{ steps.install-kubevirt.outputs.collection_path }}
+          python_version: ${{ env.python_version }}
+          ansible_version: ${{ env.ansible_version }}
+          ansible_test_targets: ${{ matrix.test-target }}
+        env:
+          ANSIBLE_COLLECTIONS_PATHS: /home/runner/collections

.github/workflows/integration-tests.yaml

@@ -50,7 +50,6 @@ jobs:
       source: "./source"
       cloud_common: "./cloudcommon"
       ansible_posix: "./ansible_posix"
-      community_general: "./community_general"
     strategy:
       fail-fast: false
       matrix:
@@ -62,7 +61,7 @@ jobs:
           - 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 }}"
+    name: "integration-py${{ matrix.python-version }}-${{ matrix.ansible-version }}-${{ matrix.workflow-id }}"
     steps:
       - name: Read target
         id: read-targets
@@ -119,13 +118,6 @@ jobs:
           path: ${{ env.ansible_posix }}
           ref: main
 
-      - name: checkout ansible-collections/community.general
-        uses: ansible-network/github_actions/.github/actions/checkout_dependency@main
-        with:
-          repository: ansible-collections/community.general
-          path: ${{ env.community_general }}
-          ref: main
-
       - name: install cloud.common collection
         uses: ansible-network/github_actions/.github/actions/build_install_collection@main
         with:
@@ -138,12 +130,6 @@ jobs:
           install_python_dependencies: true
           source_path: ${{ env.ansible_posix }}
 
-      - name: install community.general collection
-        uses: ansible-network/github_actions/.github/actions/build_install_collection@main
-        with:
-          install_python_dependencies: false
-          source_path: ${{ env.community_general }}
-
       - name: create kubernetes cluster
         uses: helm/kind-action@v1.8.0
         with:

.github/workflows/linters.yaml

@@ -19,7 +19,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: run-ansible-lint
+
-        uses: ansible/ansible-lint@main
+      - name: Run ansible-lint
-        with:
+        uses: ansible/ansible-lint@v24.2.3
-          gh_action_ref: "v25.5.0"

.gitignore

@@ -13,7 +13,6 @@ changelogs/.plugin-cache.yaml
 tests/output
 tests/integration/cloud-config-*
 .cache
-.ansible
 
 # Helm charts
 tests/integration/*-chart-*.tgz

.yamllint

@@ -5,25 +5,16 @@ rules:
   braces:
     max-spaces-inside: 1
     level: error
-
   brackets:
     max-spaces-inside: 1
     level: error
-  comments:
-    min-spaces-from-content: 1
-  comments-indentation: false
   document-start: disable
   line-length: disable
   truthy: disable
   indentation:
     spaces: 2
     indent-sequences: consistent
-  octal-values:
-    forbid-implicit-octal: true
-    forbid-explicit-octal: true
 ignore: |
   .cache
   .tox
-  .ansible
   tests/output
-  plugins/connection/kubectl.py

CHANGELOG.rst

@@ -4,184 +4,18 @@ Kubernetes Collection Release Notes
 
 .. contents:: Topics
 
-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
-======
-
-Release Summary
----------------
-
-This release includes minor changes, bug fixes and also bumps ``ansible-lint`` version to ``25.1.2``.
-
-Minor Changes
--------------
-
-- 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).
-
-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).
-
-v5.2.0
-======
-
-Release Summary
----------------
-
-This release adds more functionality to the hidden_fields option and support for waiting on ClusterOperators to reach a ready state.
-
-Minor Changes
--------------
-
-- k8s - Extend hidden_fields to allow the expression of more complex field types to be hidden (https://github.com/ansible-collections/kubernetes.core/pull/872)
-- k8s_info - Extend hidden_fields to allow the expression of more complex field types to be hidden (https://github.com/ansible-collections/kubernetes.core/pull/872)
-- waiter.py - add ClusterOperator support. The module can now check OpenShift cluster health by verifying ClusterOperator status requiring 'Available: True', 'Degraded: False', and 'Progressing: False' for success. (https://github.com/ansible-collections/kubernetes.core/issues/869)
-
-v5.1.0
-======
-
-Release Summary
----------------
-
-This release came with new module ``helm_registry_auth``, improvements to the error messages in the k8s_drain module, new parameter ``insecure_registry`` for ``helm_template`` module and several bug fixes.
-
-Minor Changes
--------------
-
-- 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).
-
-Bugfixes
---------
-
-- helm - Helm version checks did not support RC versions. They now accept any version tags. (https://github.com/ansible-collections/kubernetes.core/pull/745).
-- helm_pull - Apply no_log=True to pass_credentials to silence false positive warning. (https://github.com/ansible-collections/kubernetes.core/pull/796).
-- k8s_drain - Fix k8s_drain does not wait for single pod (https://github.com/ansible-collections/kubernetes.core/issues/769).
-- k8s_drain - Fix k8s_drain runs into a timeout when evicting a pod which is part of a stateful set  (https://github.com/ansible-collections/kubernetes.core/issues/792).
-- kubeconfig option should not appear in module invocation log (https://github.com/ansible-collections/kubernetes.core/issues/782).
-- 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).
-
-New Modules
------------
-
-- helm_registry_auth - Helm registry authentication module
-
-v5.0.0
-======
-
-Release Summary
----------------
-
-This major release drops support for ``ansible-core<2.15``.
-
-Minor Changes
--------------
-
-- connection/kubectl.py - Added an example of using the kubectl connection plugin to the documentation (https://github.com/ansible-collections/kubernetes.core/pull/741).
-- inventory/k8s.py - Defer removal of k8s inventory plugin to version 6.0.0 (https://github.com/ansible-collections/kubernetes.core/pull/734).
-
-Breaking Changes / Porting Guide
---------------------------------
-
-- Remove support for ``ansible-core<2.15`` (https://github.com/ansible-collections/kubernetes.core/pull/737).
-
-v4.0.0
-======
-
-Release Summary
----------------
-
-This major release brings several bug fixes. We have also removed support for ``ansible-core<2.15`` and deprecated functions and class from ``module_utils/common.py``.
-
-Minor Changes
--------------
-
-- inventory/k8s.py - Defer removal of k8s inventory plugin to version 5.0 (https://github.com/ansible-collections/kubernetes.core/pull/723).
-- k8s - The module and K8sService were changed so warnings returned by the K8S API are now displayed to the user.
-
-Removed Features (previously deprecated)
-----------------------------------------
-
-- k8s - Support for ``merge_type=json`` has been removed in version 4.0.0. Please use ``kubernetes.core.k8s_json_patch`` instead (https://github.com/ansible-collections/kubernetes.core/pull/722).
-- k8s_exec - the previously deprecated ``result.return_code`` return value has been removed, consider using ``result.rc`` instead (https://github.com/ansible-collections/kubernetes.core/pull/726).
-- module_utils/common.py - the previously deprecated ``K8sAnsibleMixin`` class has been removed (https://github.com/ansible-collections/kubernetes.core/pull/726).
-- module_utils/common.py - the previously deprecated ``configuration_digest()`` function has been removed (https://github.com/ansible-collections/kubernetes.core/pull/726).
-- module_utils/common.py - the previously deprecated ``get_api_client()`` function has been removed (https://github.com/ansible-collections/kubernetes.core/pull/726).
-- module_utils/common.py - the previously deprecated ``unique_string()`` function has been removed (https://github.com/ansible-collections/kubernetes.core/pull/726).
-
-Bugfixes
---------
-
-- Resolve Collections util resource discovery fails when complex subresources present (https://github.com/ansible-collections/kubernetes.core/pull/676).
-- align `helmdiff_check()` function commandline rendering with the `deploy()` function (https://github.com/ansible-collections/kubernetes.core/pull/670).
-- avoid unsafe conditions in integration tests (https://github.com/ansible-collections/kubernetes.core/pull/665).
-- helm - use ``reuse-values`` when running ``helm diff`` command (https://github.com/ansible-collections/kubernetes.core/issues/680).
-- integrations test helm_kubeconfig - set helm version to v3.10.3 to avoid incompatability with new bitnami charts (https://github.com/ansible-collections/kubernetes.core/pull/670).
-
-v3.3.1
-======
-
-Release Summary
----------------
-
-This release fixes the CI issues with the ``linters`` workflow.
-
-v3.3.0
-======
-
-Release Summary
----------------
-
-This release comes with improvements to the error messages in the k8s_drain module and several bug fixes.
-
-Minor Changes
--------------
-
-- k8s_drain - Improve error message for pod disruption budget when draining a node (https://github.com/ansible-collections/kubernetes.core/issues/797).
-
-Bugfixes
---------
-
-- helm - Helm version checks did not support RC versions. They now accept any version tags. (https://github.com/ansible-collections/kubernetes.core/pull/745).
-- helm_pull - Apply no_log=True to pass_credentials to silence false positive warning. (https://github.com/ansible-collections/kubernetes.core/pull/796).
-- k8s_drain - Fix k8s_drain does not wait for single pod (https://github.com/ansible-collections/kubernetes.core/issues/769).
-- k8s_drain - Fix k8s_drain runs into a timeout when evicting a pod which is part of a stateful set  (https://github.com/ansible-collections/kubernetes.core/issues/792).
-- kubeconfig option should not appear in module invocation log (https://github.com/ansible-collections/kubernetes.core/issues/782).
-- 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).
-
 v3.2.0
 ======
 
 Release Summary
 ---------------
-
 This release comes with documentation updates.
 
 Minor Changes
 -------------
 
-- connection/kubectl.py - Added an example of using the kubectl connection plugin to the documentation (https://github.com/ansible-collections/kubernetes.core/pull/741).
-- inventory/k8s.py - Defer removal of k8s inventory plugin to version 5.0 (https://github.com/ansible-collections/kubernetes.core/pull/723).
 - inventory/k8s.py - Defer removal of k8s inventory plugin to version 6.0.0 (https://github.com/ansible-collections/kubernetes.core/pull/734).
+- connection/kubectl.py - Added an example of using the kubectl connection plugin to the documentation (https://github.com/ansible-collections/kubernetes.core/pull/741).
 
 v3.1.0
 ======

CONTRIBUTING.md

@@ -48,7 +48,7 @@ Where modules have multiple parameters we recommend running through the 4-step m
 
 For general information on running the integration tests see the
 [Integration Tests page of the Module Development Guide](https://docs.ansible.com/ansible/devel/dev_guide/testing_integration.html#testing-integration),
-especially the section on configuration for cloud tests.
+especially the section on configuration for cloud tests. For questions about writing tests the Ansible Kubernetes community can be found on Libera.Chat IRC as detailed below.
 
 ### Updating documentation
 
@@ -70,3 +70,11 @@ Review the changes and create a pull request using updated files.
 The `kubernetes.core` collection follows the Ansible project's
 [Code of Conduct](https://docs.ansible.com/ansible/devel/community/code_of_conduct.html).
 Please read and familiarize yourself with this document.
+
+### IRC
+Our IRC channels may require you to register your nickname. If you receive an error when you connect, see
+[Libera.Chat's Nickname Registration guide](https://libera.chat/guides/registration) for instructions.
+
+The `#ansible-kubernetes` channel on [libera.chat](https://libera.chat/) IRC is the main and official place to discuss use and development of the `kubernetes.core` collection.
+
+For more information about Ansible's Kubernetes integration, browse the resources in the [Kubernetes Working Group](https://github.com/ansible/community/wiki/Kubernetes) Community wiki page.

Makefile

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

README.md

@@ -1,29 +1,15 @@
 # Kubernetes Collection for Ansible
 
+[![CI](https://github.com/ansible-collections/kubernetes.core/workflows/CI/badge.svg?event=push)](https://github.com/ansible-collections/kubernetes.core/actions) [![Codecov](https://img.shields.io/codecov/c/github/ansible-collections/kubernetes.core)](https://codecov.io/gh/ansible-collections/kubernetes.core)
+
 This repository hosts the `kubernetes.core` (formerly known as `community.kubernetes`) Ansible Collection.
 
-## Description
-
 The collection includes a variety of Ansible content to help automate the management of applications in Kubernetes and OpenShift clusters, as well as the provisioning and maintenance of clusters themselves.
 
-## Communication
-
-* Join the Ansible forum:
-  * [Get Help](https://forum.ansible.com/c/help/6): get help or help others.
-  * [Posts tagged with 'kubernetes'](https://forum.ansible.com/tag/kubernetes): subscribe to participate in collection-related conversations.
-  * [Social Spaces](https://forum.ansible.com/c/chat/4): gather and interact with fellow enthusiasts.
-  * [News & Announcements](https://forum.ansible.com/c/news/5): track project-wide announcements including social events.
-
-* The Ansible [Bullhorn newsletter](https://docs.ansible.com/ansible/devel/community/communication.html#the-bullhorn): used to announce releases and important changes.
-
-For more information about communication, see the [Ansible communication guide](https://docs.ansible.com/ansible/devel/community/communication.html).
-
-## Requirements
-
 <!--start requires_ansible-->
-## Ansible Version Compatibility
+## Ansible version compatibility
 
-This collection has been tested against following Ansible versions: **>=2.15.0**.
+This collection has been tested against following Ansible versions: **>=2.14.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,37 +18,37 @@ A collection may contain metadata that identifies these versions.
 PEP440 is the schema used to describe the versions of Ansible.
 <!--end requires_ansible-->
 
-### Python Support
+## Python Support
 
 * Collection supports 3.9+
 
 Note: Python2 is deprecated from [1st January 2020](https://www.python.org/doc/sunset-python-2/). Please switch to Python3.
 
-### Kubernetes Version Support
+## Kubernetes Version Support
 
 This collection supports Kubernetes versions >= 1.24.
 
-### Included Content
+## Included content
 
 Click on the name of a plugin or module to view that content's documentation:
 
 <!--start collection content-->
-### Connection Plugins
+### Connection plugins
 Name | Description
 --- | ---
 [kubernetes.core.kubectl](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.kubectl_connection.rst)|Execute tasks in pods running on Kubernetes.
 
-### K8s filter Plugins
+### K8s filter plugins
 Name | Description
 --- | ---
 kubernetes.core.k8s_config_resource_name|Generate resource name for the given resource of type ConfigMap, Secret
 
-### Inventory Plugins
+### Inventory plugins
 Name | Description
 --- | ---
 [kubernetes.core.k8s](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.k8s_inventory.rst)|Kubernetes (K8s) inventory source
 
-### Lookup Plugins
+### Lookup plugins
 Name | Description
 --- | ---
 [kubernetes.core.k8s](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.k8s_lookup.rst)|Query the K8s API
@@ -76,7 +62,6 @@ Name | Description
 [kubernetes.core.helm_plugin](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.helm_plugin_module.rst)|Manage Helm plugins
 [kubernetes.core.helm_plugin_info](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.helm_plugin_info_module.rst)|Gather information about Helm plugins
 [kubernetes.core.helm_pull](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.helm_pull_module.rst)|download a chart from a repository and (optionally) unpack it in local directory.
-[kubernetes.core.helm_registry_auth](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.helm_registry_auth_module.rst)|Helm registry authentication module
 [kubernetes.core.helm_repository](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.helm_repository_module.rst)|Manage Helm repositories.
 [kubernetes.core.helm_template](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.helm_template_module.rst)|Render chart templates
 [kubernetes.core.k8s](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.k8s_module.rst)|Manage Kubernetes (K8s) objects
@@ -94,7 +79,9 @@ Name | Description
 
 <!--end collection content-->
 
-## Installation
+## Installation and Usage
+
+### Installing the Collection from Ansible Galaxy
 
 Before using the Kubernetes collection, you need to install it with the Ansible Galaxy CLI:
 
@@ -106,7 +93,7 @@ You can also include it in a `requirements.yml` file and install it via `ansible
 ---
 collections:
   - name: kubernetes.core
-    version: 5.4.0
+    version: 3.2.0
 ```
 
 ### Installing the Kubernetes Python Library
@@ -115,7 +102,7 @@ Content in this collection requires the [Kubernetes Python client](https://pypi.
 
     pip3 install kubernetes
 
-## Use Cases
+### Using modules from the Kubernetes Collection in your playbooks
 
 It's preferable to use content in this collection using their Fully Qualified Collection Namespace (FQCN), for example `kubernetes.core.k8s_info`:
 
@@ -183,7 +170,7 @@ If upgrading older playbooks which were built prior to Ansible 2.10 and this col
 
 For documentation on how to use individual modules and other content included in this collection, please see the links in the 'Included content' section earlier in this README.
 
-## Ansible Turbo Mode Tech Preview
+## 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:
@@ -202,16 +189,12 @@ defined in the playbook using `environment` keyword as above, you must set it us
 
 Please read more about Ansible Turbo mode - [here](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/ansible_turbo_mode.rst).
 
-## Contributing to this Collection
+## Testing and Development
 
 If you want to develop new content for this collection or improve what's already here, the easiest way to work on the collection is to clone it into one of the configured [`COLLECTIONS_PATHS`](https://docs.ansible.com/ansible/latest/reference_appendices/config.html#collections-paths), and work on it there.
 
 See [Contributing to kubernetes.core](CONTRIBUTING.md).
 
-## Testing
-
-[![Linters](https://img.shields.io/github/actions/workflow/status/ansible-collections/kubernetes.core/linters.yaml?label=linters)](https://github.com/ansible-collections/kubernetes.core/actions/workflows/linters.yaml) [![Integration tests](https://img.shields.io/github/actions/workflow/status/ansible-collections/kubernetes.core/integration-tests.yaml?label=integration%20tests)](https://github.com/ansible-collections/kubernetes.core/actions/workflows/integration-tests.yaml) [![Sanity tests](https://img.shields.io/github/actions/workflow/status/ansible-collections/kubernetes.core/sanity-tests.yaml?label=sanity%20tests)](https://github.com/ansible-collections/kubernetes.core/actions/workflows/sanity-tests.yaml) [![Unit tests](https://img.shields.io/github/actions/workflow/status/ansible-collections/kubernetes.core/unit-tests.yaml?label=unit%20tests)](https://github.com/ansible-collections/kubernetes.core/actions/workflows/unit-tests.yaml) [![Codecov](https://img.shields.io/codecov/c/github/ansible-collections/kubernetes.core)](https://app.codecov.io/gh/ansible-collections/kubernetes.core)
-
 ### Testing with `ansible-test`
 
 The `tests` directory contains configuration for running sanity and integration tests using [`ansible-test`](https://docs.ansible.com/ansible/latest/dev_guide/testing_integration.html).
@@ -248,33 +231,9 @@ After the version is published, verify it exists on the [Kubernetes Collection G
 
 The process for uploading a supported release to Automation Hub is documented separately.
 
-## Support
+## More Information
-
-<!--List available communication channels. In addition to channels specific to your collection, we also recommend to use the following ones.-->
-
-> **Note:** The `stable-4` branch, which handles all `4.x.y` releases of this collection, is no longer supported. This means that no backports nor releases will be performed on the `stable-4` branch.
-
-We announce releases and important changes through Ansible's [The Bullhorn newsletter](https://github.com/ansible/community/wiki/News#the-bullhorn). Be sure you are [subscribed](https://eepurl.com/gZmiEP).
-
-We take part in the global quarterly [Ansible Contributor Summit](https://github.com/ansible/community/wiki/Contributor-Summit) virtually or in-person. Track [The Bullhorn newsletter](https://eepurl.com/gZmiEP) and join us.
-
-For more information about communication, refer to the [Ansible Communication guide](https://docs.ansible.com/ansible/devel/community/communication.html).
-
-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/).
-
-## Release Notes
-
-See the [raw generated changelog](https://github.com/ansible-collections/kubernetes.core/blob/main/CHANGELOG.rst).
-
-## Code of Conduct
-
-We follow the [Ansible Code of Conduct](https://docs.ansible.com/ansible/devel/community/code_of_conduct.html) in all our interactions within this project.
-
-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.
 
+For more information about Ansible's Kubernetes integration, join the `#ansible-kubernetes` channel on [libera.chat](https://libera.chat/) IRC, and browse the resources in the [Kubernetes Working Group](https://github.com/ansible/community/wiki/Kubernetes) Community wiki page.
 
 ## License
 

changelogs/changelog.yaml

@@ -857,202 +857,11 @@ releases:
   3.2.0:
     changes:
       minor_changes:
-      - connection/kubectl.py - Added an example of using the kubectl connection plugin
+      - inventory/k8s.py - Defer removal of k8s inventory plugin to version 6.0.0 (https://github.com/ansible-collections/kubernetes.core/pull/734).
-        to the documentation (https://github.com/ansible-collections/kubernetes.core/pull/741).
+      - connection/kubectl.py - Added an example of using the kubectl connection plugin to the documentation (https://github.com/ansible-collections/kubernetes.core/pull/741).
-      - inventory/k8s.py - Defer removal of k8s inventory plugin to version 5.0 (https://github.com/ansible-collections/kubernetes.core/pull/723).
-      - inventory/k8s.py - Defer removal of k8s inventory plugin to version 6.0.0
-        (https://github.com/ansible-collections/kubernetes.core/pull/734).
       release_summary: This release comes with documentation updates.
     fragments:
     - 20240530-defer-removal-and-ansible-core-support-update.yaml
     - 20240601-doc-example-of-using-kubectl.yaml
     - 3.2.0.yml
-    - inventory-update_removal_date.yml
     release_date: '2024-06-14'
-  3.3.0:
-    changes:
-      bugfixes:
-      - helm - Helm version checks did not support RC versions. They now accept any
-        version tags. (https://github.com/ansible-collections/kubernetes.core/pull/745).
-      - helm_pull - Apply no_log=True to pass_credentials to silence false positive
-        warning. (https://github.com/ansible-collections/kubernetes.core/pull/796).
-      - k8s_drain - Fix k8s_drain does not wait for single pod (https://github.com/ansible-collections/kubernetes.core/issues/769).
-      - k8s_drain - Fix k8s_drain runs into a timeout when evicting a pod which is
-        part of a stateful set  (https://github.com/ansible-collections/kubernetes.core/issues/792).
-      - kubeconfig option should not appear in module invocation log (https://github.com/ansible-collections/kubernetes.core/issues/782).
-      - 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:
-      - k8s_drain - Improve error message for pod disruption budget when draining
-        a node (https://github.com/ansible-collections/kubernetes.core/issues/797).
-      release_summary: This release comes with improvements to the error messages
-        in the k8s_drain module and several bug fixes.
-    fragments:
-    - 20240530-ansible-core-support-update.yaml
-    - 20240611-helm-rc-version.yaml
-    - 20240620-fix-kustomize-plugin-fails-with-deprecation-warnings.yml
-    - 20241102-fix-ci-post-2.18-issue.yaml
-    - 20241213-kubeconfig-set-no_log-true.yaml
-    - 756-fix-daemonset-waiting.yaml
-    - 770-fix-k8s-drain-doesnt-wait-for-single-pod.yaml
-    - 793-fix-k8s-drain-runs-into-timeout.yaml
-    - 796-false-positive-helmull.yaml
-    - 798-drain-pdb-error-message.yaml
-    - readme_template_update.yml
-    release_date: '2025-01-20'
-  3.3.1:
-    changes:
-      release_summary: This release fixes the CI issues with the ``linters`` workflow.
-    fragments:
-    - release_summary.yml
-    release_date: '2025-03-26'
-  4.0.0:
-    changes:
-      bugfixes:
-      - Resolve Collections util resource discovery fails when complex subresources
-        present (https://github.com/ansible-collections/kubernetes.core/pull/676).
-      - align `helmdiff_check()` function commandline rendering with the `deploy()`
-        function (https://github.com/ansible-collections/kubernetes.core/pull/670).
-      - avoid unsafe conditions in integration tests (https://github.com/ansible-collections/kubernetes.core/pull/665).
-      - helm - use ``reuse-values`` when running ``helm diff`` command (https://github.com/ansible-collections/kubernetes.core/issues/680).
-      - integrations test helm_kubeconfig - set helm version to v3.10.3 to avoid incompatability
-        with new bitnami charts (https://github.com/ansible-collections/kubernetes.core/pull/670).
-      minor_changes:
-      - inventory/k8s.py - Defer removal of k8s inventory plugin to version 5.0 (https://github.com/ansible-collections/kubernetes.core/pull/723).
-      - k8s - The module and K8sService were changed so warnings returned by the K8S
-        API are now displayed to the user.
-      release_summary: This major release brings several bug fixes. We have also removed
-        support for ``ansible-core<2.15`` and deprecated functions and class from
-        ``module_utils/common.py``.
-      removed_features:
-      - k8s - Support for ``merge_type=json`` has been removed in version 4.0.0. Please
-        use ``kubernetes.core.k8s_json_patch`` instead (https://github.com/ansible-collections/kubernetes.core/pull/722).
-      - k8s_exec - the previously deprecated ``result.return_code`` return value has
-        been removed, consider using ``result.rc`` instead (https://github.com/ansible-collections/kubernetes.core/pull/726).
-      - module_utils/common.py - the previously deprecated ``K8sAnsibleMixin`` class
-        has been removed (https://github.com/ansible-collections/kubernetes.core/pull/726).
-      - module_utils/common.py - the previously deprecated ``configuration_digest()``
-        function has been removed (https://github.com/ansible-collections/kubernetes.core/pull/726).
-      - module_utils/common.py - the previously deprecated ``get_api_client()`` function
-        has been removed (https://github.com/ansible-collections/kubernetes.core/pull/726).
-      - module_utils/common.py - the previously deprecated ``unique_string()`` function
-        has been removed (https://github.com/ansible-collections/kubernetes.core/pull/726).
-    fragments:
-    - 20231206-fix-unsafe-condition-in-integration.yml
-    - 20240117-fix-helm-diff-cmd-line-rendering.yml
-    - 20240222-Collections-util-resource-discovery-fails-when-complex-subresources-present.yml
-    - 20240228-fix-helm-diff-with-reuse-values.yml
-    - 20240423-k8s-display-warnings-to-users.yml
-    - 4.0.0.yaml
-    - inventory-update_removal_date.yml
-    - k8s-merge_type-removed.yml
-    - module_utils-common-remove-deprecated-functions-and-class.yaml
-    release_date: '2024-05-24'
-  5.0.0:
-    changes:
-      breaking_changes:
-      - Remove support for ``ansible-core<2.15`` (https://github.com/ansible-collections/kubernetes.core/pull/737).
-      minor_changes:
-      - connection/kubectl.py - Added an example of using the kubectl connection plugin
-        to the documentation (https://github.com/ansible-collections/kubernetes.core/pull/741).
-      - inventory/k8s.py - Defer removal of k8s inventory plugin to version 6.0.0
-        (https://github.com/ansible-collections/kubernetes.core/pull/734).
-      release_summary: This major release drops support for ``ansible-core<2.15``.
-    fragments:
-    - 20240530-ansible-core-support-update.yaml
-    - 20240530-defer-removal-and-ansible-core-support-update.yaml
-    - 5.0.0.yml
-    release_date: '2024-05-31'
-  5.1.0:
-    changes:
-      bugfixes:
-      - helm - Helm version checks did not support RC versions. They now accept any
-        version tags. (https://github.com/ansible-collections/kubernetes.core/pull/745).
-      - helm_pull - Apply no_log=True to pass_credentials to silence false positive
-        warning. (https://github.com/ansible-collections/kubernetes.core/pull/796).
-      - k8s_drain - Fix k8s_drain does not wait for single pod (https://github.com/ansible-collections/kubernetes.core/issues/769).
-      - k8s_drain - Fix k8s_drain runs into a timeout when evicting a pod which is
-        part of a stateful set  (https://github.com/ansible-collections/kubernetes.core/issues/792).
-      - kubeconfig option should not appear in module invocation log (https://github.com/ansible-collections/kubernetes.core/issues/782).
-      - 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).
-      - 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).
-      release_summary: This release came with new module ``helm_registry_auth``, improvements
-        to the error messages in the k8s_drain module, new parameter ``insecure_registry``
-        for ``helm_template`` module and several bug fixes.
-    fragments:
-    - 0-readme.yml
-    - 20240601-doc-example-of-using-kubectl.yaml
-    - 20240611-helm-rc-version.yaml
-    - 20240620-fix-kustomize-plugin-fails-with-deprecation-warnings.yml
-    - 20241102-fix-ci-post-2.18-issue.yaml
-    - 20241103-completly-remove-obsolate-communication-channel.yaml
-    - 20241207-add-insecure-skip-tls-verify-to-helm-template.yaml
-    - 20241213-kubeconfig-set-no_log-true.yaml
-    - 756-fix-daemonset-waiting.yaml
-    - 765-bump-ansible-lint-version.yml
-    - 770-fix-k8s-drain-doesnt-wait-for-single-pod.yaml
-    - 793-fix-k8s-drain-runs-into-timeout.yaml
-    - 796-false-positive-helmull.yaml
-    - 798-drain-pdb-error-message.yaml
-    - readme_template_update.yml
-    modules:
-    - description: Helm registry authentication module
-      name: helm_registry_auth
-      namespace: ''
-    release_date: '2025-01-20'
-  5.2.0:
-    changes:
-      minor_changes:
-      - k8s - Extend hidden_fields to allow the expression of more complex field types
-        to be hidden (https://github.com/ansible-collections/kubernetes.core/pull/872)
-      - k8s_info - Extend hidden_fields to allow the expression of more complex field
-        types to be hidden (https://github.com/ansible-collections/kubernetes.core/pull/872)
-      - 'waiter.py - add ClusterOperator support. The module can now check OpenShift
-        cluster health by verifying ClusterOperator status requiring ''Available:
-        True'', ''Degraded: False'', and ''Progressing: False'' for success. (https://github.com/ansible-collections/kubernetes.core/issues/869)'
-      release_summary: This release adds more functionality to the hidden_fields option
-        and support for waiting on ClusterOperators to reach a ready state.
-    fragments:
-    - 5.2.0.yml
-    - 643-extend-hidden-fields.yaml
-    - 879-clusteroperator-waiter.py.yaml
-    release_date: '2025-03-27'
-  5.3.0:
-    changes:
-      bugfixes:
-      - module_utils/k8s/service - fix issue when trying to delete resource using
-        `delete_options` and `check_mode=true` (https://github.com/ansible-collections/kubernetes.core/issues/892).
-      minor_changes:
-      - 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).
-      release_summary: This release includes minor changes, bug fixes and also bumps
-        ``ansible-lint`` version to ``25.1.2``.
-    fragments:
-    - 20250324-k8s_info-templating.yaml
-    - 5.3.0.yml
-    - 694-add-insecure-skip-tls-verify.yml
-    - 800-helm-add-reset_then_reuse_values-support.yml
-    - 898-k8s-dont-delete-in-check-mode.yaml
-    - 919-update-ansible-lint-version.yaml
-    release_date: '2025-05-16'
-  5.4.0:
-    changes:
-      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:
-    - 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'

changelogs/fragments/20240530-ansible-core-support-update.yaml

@@ -0,0 +1,3 @@
+---
+minor_changes:
+  - inventory/k8s.py - Defer removal of k8s inventory plugin to version 6.0.0 (https://github.com/ansible-collections/kubernetes.core/pull/734).

changelogs/fragments/inventory-update_removal_date.yml

@@ -0,0 +1,2 @@
+minor_changes:
+  - inventory/k8s.py - Defer removal of k8s inventory plugin to version 5.0 (https://github.com/ansible-collections/kubernetes.core/pull/723).

docs/kubernetes.core.helm_module.rst

@@ -289,29 +289,6 @@ Parameters
                         <div>Provide a URL for accessing the API. Can also be specified via <code>K8S_AUTH_HOST</code> environment variable.</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>insecure_skip_tls_verify</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">boolean</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 5.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>Skip tls certificate checks for the chart download.</div>
-                        <div>Do not confuse with the <code>validate_certs</code> option.</div>
-                        <div>This option is only available for helm &gt;= 3.16.0.</div>
-                        <div style="font-size: small; color: darkgreen"><br/>aliases: skip_tls_certs_check</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -458,28 +435,6 @@ Parameters
                         <div>mutually exclusive with with <code>history_max</code>.</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>reset_then_reuse_values</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.0.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>When upgrading package, reset the values to the ones built into the chart, apply the last release&#x27;s values and merge in any overrides from parameters O(release_values), O(values_files) or O(set_values).</div>
-                        <div>If O(reset_values) or O(reuse_values) is set to V(True), this is ignored.</div>
-                        <div>This feature requires helm diff &gt;= 3.9.12.</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -488,7 +443,7 @@ Parameters
                     <div style="font-size: small">
                         <span style="color: purple">boolean</span>
                     </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 3.0.0</div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.5.0</div>
                 </td>
                 <td>
                         <ul style="margin: 0; padding: 0"><b>Choices:</b>
@@ -508,7 +463,7 @@ Parameters
                     <div style="font-size: small">
                         <span style="color: purple">boolean</span>
                     </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 3.0.0</div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.5.0</div>
                 </td>
                 <td>
                         <ul style="margin: 0; padding: 0"><b>Choices:</b>

docs/kubernetes.core.helm_pull_module.rst

@@ -279,8 +279,7 @@ Parameters
                 </td>
                 <td>
                         <div>Whether or not to check tls certificate for the chart download.</div>
-                        <div>Requires helm &gt;= 3.3.0. Alias <code>insecure_skip_tls_verify</code> added in 5.3.0.</div>
+                        <div>Requires helm &gt;= 3.3.0.</div>
-                        <div style="font-size: small; color: darkgreen"><br/>aliases: insecure_skip_tls_verify</div>
                 </td>
             </tr>
             <tr>

docs/kubernetes.core.helm_registry_auth_module.rst

@@ -1,333 +0,0 @@
-.. _kubernetes.core.helm_registry_auth_module:
-
-
-**********************************
-kubernetes.core.helm_registry_auth
-**********************************
-
-**Helm registry authentication module**
-
-
-Version added: 5.1.0
-
-.. contents::
-   :local:
-   :depth: 1
-
-
-Synopsis
---------
-- Helm registry authentication module allows you to login ``helm registry login`` and logout ``helm registry logout`` from a Helm registry.
-
-
-
-Requirements
-------------
-The below requirements are needed on the host that executes this module.
-
-- helm (https://github.com/helm/helm/releases) => 3.8.0
-
-
-Parameters
-----------
-
-.. raw:: html
-
-    <table  border=0 cellpadding=0 class="documentation-table">
-        <tr>
-            <th colspan="1">Parameter</th>
-            <th>Choices/<font color="blue">Defaults</font></th>
-            <th width="100%">Comments</th>
-        </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>binary_path</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">path</span>
-                    </div>
-                </td>
-                <td>
-                </td>
-                <td>
-                        <div>The path of a helm binary to use.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>ca_file</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">path</span>
-                    </div>
-                </td>
-                <td>
-                </td>
-                <td>
-                        <div>Path to the CA certificate SSL file for verify registry server certificate.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>cert_file</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">path</span>
-                    </div>
-                </td>
-                <td>
-                </td>
-                <td>
-                        <div>Path to the client certificate SSL file for identify registry client using this certificate file.</div>
-                </td>
-            </tr>
-            <tr>
-                <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">string</span>
-                         / <span style="color: red">required</span>
-                    </div>
-                </td>
-                <td>
-                </td>
-                <td>
-                        <div>Provide a URL for accessing the registry.</div>
-                        <div style="font-size: small; color: darkgreen"><br/>aliases: registry_url</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>insecure</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><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
-                                    <li>yes</li>
-                        </ul>
-                </td>
-                <td>
-                        <div>Allow connections to SSL sites without certs.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>key_file</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">path</span>
-                    </div>
-                </td>
-                <td>
-                </td>
-                <td>
-                        <div>Path to the client key SSL file for identify registry client using this key file.</div>
-                </td>
-            </tr>
-            <tr>
-                <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">string</span>
-                    </div>
-                </td>
-                <td>
-                </td>
-                <td>
-                        <div>Password for the registry.</div>
-                        <div style="font-size: small; color: darkgreen"><br/>aliases: repo_password</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>state</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">string</span>
-                    </div>
-                </td>
-                <td>
-                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
-                                    <li><div style="color: blue"><b>present</b>&nbsp;&larr;</div></li>
-                                    <li>absent</li>
-                        </ul>
-                </td>
-                <td>
-                        <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>
-                <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">string</span>
-                    </div>
-                </td>
-                <td>
-                </td>
-                <td>
-                        <div>Username for the registry.</div>
-                        <div style="font-size: small; color: darkgreen"><br/>aliases: repo_username</div>
-                </td>
-            </tr>
-    </table>
-    <br/>
-
-
-
-
-Examples
---------
-
-.. code-block:: yaml
-
-    - name: Login to remote registry
-      kubernetes.core.helm_registry_auth:
-        username: admin
-        password: "sample_password"
-        host: localhost:5000
-
-    - name: Logout from remote registry
-      kubernetes.core.helm_registry_auth:
-        state: absent
-        host: localhost:5000
-
-
-
-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:
-
-.. raw:: html
-
-    <table border=0 cellpadding=0 class="documentation-table">
-        <tr>
-            <th colspan="1">Key</th>
-            <th>Returned</th>
-            <th width="100%">Description</th>
-        </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>command</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>always</td>
-                <td>
-                            <div>Full <code>helm</code> command executed</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;">/usr/local/bin/helm registry login oci-registry.domain.example --username=admin --password-stdin --insecure</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>failed</b>
-                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
-                    <div style="font-size: small">
-                      <span style="color: purple">boolean</span>
-                    </div>
-                </td>
-                <td>always</td>
-                <td>
-                            <div>Indicate if the <code>helm</code> command failed</div>
-                    <br/>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>stderr</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>always</td>
-                <td>
-                            <div>Full <code>helm</code> command stderr, in case you want to display it or examine the event log. Please be note that helm binnary may print messages to stderr even if the command is successful.</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;">Login Succeeded\n</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>stderr_lines</b>
-                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
-                    <div style="font-size: small">
-                      <span style="color: purple">list</span>
-                    </div>
-                </td>
-                <td>always</td>
-                <td>
-                            <div>Full <code>helm</code> command stderr, in case you want to display it or examine the event log</div>
-                    <br/>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>stdout</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>always</td>
-                <td>
-                            <div>Full <code>helm</code> command stdout, in case you want to display it or examine the event log</div>
-                    <br/>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>stout_lines</b>
-                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
-                    <div style="font-size: small">
-                      <span style="color: purple">list</span>
-                    </div>
-                </td>
-                <td>always</td>
-                <td>
-                            <div>Full <code>helm</code> command stdout, in case you want to display it or examine the event log</div>
-                    <br/>
-                </td>
-            </tr>
-    </table>
-    <br/><br/>
-
-
-Status
-------
-
-
-Authors
-~~~~~~~
-
-- Yuriy Novostavskiy (@yurnov)

docs/kubernetes.core.helm_repository_module.rst

@@ -143,27 +143,6 @@ Parameters
                         <div>Provide a URL for accessing the API. Can also be specified via <code>K8S_AUTH_HOST</code> environment variable.</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>insecure_skip_tls_verify</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">boolean</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 5.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>Skip tls certificate checks for the repository url.</div>
-                        <div style="font-size: small; color: darkgreen"><br/>aliases: skip_tls_certs_check</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>

docs/kubernetes.core.helm_template_module.rst

@@ -158,26 +158,6 @@ Parameters
                         <div>Include custom resource descriptions in rendered templates.</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>insecure_registry</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 5.1.0</div>
-                </td>
-                <td>
-                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
-                                    <li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
-                                    <li>yes</li>
-                        </ul>
-                </td>
-                <td>
-                        <div>Skip TLS certificate checks for the chart download</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>

docs/kubernetes.core.k8s_drain_module.rst

@@ -423,7 +423,7 @@ Parameters
                         <span style="color: purple">list</span>
                          / <span style="color: purple">elements=string</span>
                     </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 3.0.0</div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.5.0</div>
                 </td>
                 <td>
                 </td>
@@ -595,8 +595,7 @@ Examples
       kubernetes.core.k8s_drain:
         state: drain
         name: foo
-        delete_options:
+        force: yes
-          force: yes
 
     - name: Drain node "foo", but abort if there are pods not managed by a ReplicationController, Job, or DaemonSet, and use a grace period of 15 minutes.
       kubernetes.core.k8s_drain:

docs/kubernetes.core.k8s_info_module.rst

@@ -168,13 +168,14 @@ Parameters
                         <span style="color: purple">list</span>
                          / <span style="color: purple">elements=string</span>
                     </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 3.0.0</div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.5.0</div>
                 </td>
                 <td>
                 </td>
                 <td>
                         <div>Hide fields matching any of the field definitions in the result</div>
-                        <div>An example might be <code>hidden_fields=[metadata.managedFields]</code> or V(hidden_fields=[spec.containers[0].env[3].value]) or V(hidden_fields=[metadata.annotations[kubectl.kubernetes.io/last-applied-configuration]])</div>
+                        <div>An example might be <code>hidden_fields=[metadata.managedFields]</code></div>
+                        <div>Only field definitions that don&#x27;t reference list items are supported (so V(spec.containers[0]) would not work)</div>
                 </td>
             </tr>
             <tr>

docs/kubernetes.core.k8s_module.rst

@@ -121,7 +121,7 @@ Parameters
                 <td>
                         <div><code>apply</code> compares the desired resource definition with the previously supplied resource definition, ignoring properties that are automatically generated</div>
                         <div><code>apply</code> works better with Services than &#x27;force=yes&#x27;</div>
-                        <div>Mutually exclusive with <code>merge_type</code>.</div>
+                        <div>mutually exclusive with <code>merge_type</code></div>
                 </td>
             </tr>
             <tr>
@@ -216,7 +216,7 @@ Parameters
                     <div style="font-size: small">
                         <span style="color: purple">boolean</span>
                     </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 3.0.0</div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.5.0</div>
                 </td>
                 <td>
                         <ul style="margin: 0; padding: 0"><b>Choices:</b>
@@ -389,13 +389,14 @@ Parameters
                         <span style="color: purple">list</span>
                          / <span style="color: purple">elements=string</span>
                     </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 3.0.0</div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.5.0</div>
                 </td>
                 <td>
                 </td>
                 <td>
                         <div>Hide fields matching this option in the result</div>
-                        <div>An example might be <code>hidden_fields=[metadata.managedFields]</code> or V(hidden_fields=[spec.containers[0].env[3].value]) or V(hidden_fields=[metadata.annotations[kubectl.kubernetes.io/last-applied-configuration]])</div>
+                        <div>An example might be <code>hidden_fields=[metadata.managedFields]</code></div>
+                        <div>Only field definitions that don&#x27;t reference list items are supported (so V(spec.containers[0]) would not work)</div>
                 </td>
             </tr>
             <tr>
@@ -512,17 +513,18 @@ Parameters
                 </td>
                 <td>
                         <ul style="margin: 0; padding: 0"><b>Choices:</b>
+                                    <li>json</li>
                                     <li>merge</li>
                                     <li>strategic-merge</li>
                         </ul>
                 </td>
                 <td>
                         <div>Whether to override the default patch merge approach with a specific type. By default, the strategic merge will typically be used.</div>
-                        <div>For example, Custom Resource Definitions typically aren&#x27;t updatable by the usual strategic merge. You may want to use <code>merge</code> if you see &quot;strategic merge patch format is not supported&quot;.</div>
+                        <div>For example, Custom Resource Definitions typically aren&#x27;t updatable by the usual strategic merge. You may want to use <code>merge</code> if you see &quot;strategic merge patch format is not supported&quot;</div>
                         <div>See <a href='https://kubernetes.io/docs/tasks/run-application/update-api-object-kubectl-patch/#use-a-json-merge-patch-to-update-a-deployment'>https://kubernetes.io/docs/tasks/run-application/update-api-object-kubectl-patch/#use-a-json-merge-patch-to-update-a-deployment</a></div>
                         <div>If more than one <code>merge_type</code> is given, the merge_types will be tried in order. This defaults to <code>[&#x27;strategic-merge&#x27;, &#x27;merge&#x27;]</code>, which is ideal for using the same parameters on resource kinds that combine Custom Resources and built-in resources.</div>
-                        <div>Mutually exclusive with <code>apply</code>.</div>
+                        <div>mutually exclusive with <code>apply</code></div>
-                        <div><em>merge_type=json</em> has been removed in version 4.0.0. Please use <span class='module'>kubernetes.core.k8s_json_patch</span> instead.</div>
+                        <div><em>merge_type=json</em> is deprecated and will be removed in version 4.0.0. Please use <span class='module'>kubernetes.core.k8s_json_patch</span> instead.</div>
                 </td>
             </tr>
             <tr>

galaxy.yml

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

meta/runtime.yml

@@ -1,5 +1,5 @@
 ---
-requires_ansible: '>=2.15.0'
+requires_ansible: '>=2.14.0'
 
 action_groups:
   helm:

plugins/action/k8s_info.py

@@ -25,18 +25,30 @@ 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:
-    from ansible.template import trust_as_template
-except ImportError:
-    trust_as_template = None
 
+class RemoveOmit(object):
+    def __init__(self, buffer, omit_value):
+        try:
+            import yaml
+        except ImportError:
+            raise AnsibleError("Failed to import the required Python library (PyYAML).")
+        self.data = yaml.safe_load_all(buffer)
+        self.omit = omit_value
 
-def _from_yaml_to_definition(buffer):
+    def remove_omit(self, data):
-    try:
+        if isinstance(data, dict):
-        import yaml
+            result = dict()
-    except ImportError:
+            for key, value in iteritems(data):
-        raise AnsibleError("Failed to import the required Python library (PyYAML).")
+                if value == self.omit:
-    return list(yaml.safe_load_all(buffer))
+                    continue
+                result[key] = self.remove_omit(value)
+            return result
+        if isinstance(data, list):
+            return [self.remove_omit(v) for v in data if v != self.omit]
+        return data
+
+    def output(self):
+        return [self.remove_omit(d) for d in self.data]
 
 
 ENV_KUBECONFIG_PATH_SEPARATOR = ";" if platform.system() == "Windows" else ":"
@@ -195,6 +207,7 @@ class ActionModule(ActionBase):
                 "'template' is only a supported parameter for the 'k8s' module."
             )
 
+        omit_value = task_vars.get("omit")
         template_params = []
         if isinstance(template, string_types) or isinstance(template, dict):
             template_params.append(self.get_template_args(template))
@@ -217,18 +230,17 @@ class ActionModule(ActionBase):
         old_vars = self._templar.available_variables
 
         default_environment = {}
-        if trust_as_template is None:
+        for key in (
-            for key in (
+            "newline_sequence",
-                "newline_sequence",
+            "variable_start_string",
-                "variable_start_string",
+            "variable_end_string",
-                "variable_end_string",
+            "block_start_string",
-                "block_start_string",
+            "block_end_string",
-                "block_end_string",
+            "trim_blocks",
-                "trim_blocks",
+            "lstrip_blocks",
-                "lstrip_blocks",
+        ):
-            ):
+            if hasattr(self._templar.environment, key):
-                if hasattr(self._templar.environment, key):
+                default_environment[key] = getattr(self._templar.environment, key)
-                    default_environment[key] = getattr(self._templar.environment, key)
         for template_item in template_params:
             # We need to convert unescaped sequences to proper escaped sequences for Jinja2
             newline_sequence = template_item["newline_sequence"]
@@ -245,35 +257,26 @@ class ActionModule(ActionBase):
             with self.get_template_data(template_item["path"]) as template_data:
                 # add ansible 'template' vars
                 temp_vars = copy.deepcopy(task_vars)
-                overrides = {}
                 for key, value in iteritems(template_item):
                     if hasattr(self._templar.environment, key):
                         if value is not None:
-                            overrides[key] = value
+                            setattr(self._templar.environment, key, value)
-                            if trust_as_template is None:
+                        else:
-                                setattr(self._templar.environment, key, value)
-                        elif trust_as_template is None:
                             setattr(
                                 self._templar.environment,
                                 key,
                                 default_environment.get(key),
                             )
                 self._templar.available_variables = temp_vars
-                if trust_as_template:
+                result = self._templar.do_template(
-                    template_data = trust_as_template(template_data)
+                    template_data,
-                    result = self._templar.template(
+                    preserve_trailing_newlines=True,
-                        template_data,
+                    escape_backslashes=False,
-                        preserve_trailing_newlines=True,
+                )
-                        escape_backslashes=False,
+                if omit_value is not None:
-                        overrides=overrides,
+                    result_template.extend(RemoveOmit(result, omit_value).output())
-                    )
                 else:
-                    result = self._templar.do_template(
+                    result_template.append(result)
-                        template_data,
-                        preserve_trailing_newlines=True,
-                        escape_backslashes=False,
-                    )
-                result_template.extend(_from_yaml_to_definition(result))
         self._templar.available_variables = old_vars
         resource_definition = self._task.args.get("definition", None)
         if not resource_definition:

plugins/inventory/k8s.py

@@ -125,19 +125,19 @@ import json
 
 from ansible.errors import AnsibleError
 from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable, Constructable
-
+from ansible_collections.kubernetes.core.plugins.module_utils.common import (
-try:
+    HAS_K8S_MODULE_HELPER,
-    from kubernetes.dynamic.exceptions import DynamicApiError
+    k8s_import_exception,
-
+)
-    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,
 )
 
+try:
+    from kubernetes.dynamic.exceptions import DynamicApiError
+except ImportError:
+    pass
+
 
 def format_dynamic_api_exc(exc):
     if exc.body:

plugins/lookup/kustomize.py

@@ -94,8 +94,7 @@ def get_binary_from_path(name, opt_dirs=None):
 
 def run_command(command):
     cmd = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    stdout, stderr = cmd.communicate()
+    return cmd.communicate()
-    return cmd.returncode, stdout, stderr
 
 
 class LookupModule(LookupBase):
@@ -141,18 +140,9 @@ class LookupModule(LookupBase):
         if enable_helm:
             command += ["--enable-helm"]
 
-        (ret, out, err) = run_command(command)
+        (out, err) = run_command(command)
-        if ret != 0:
+        if err:
-            if err:
+            raise AnsibleLookupError(
-                raise AnsibleLookupError(
+                "kustomize command failed with: {0}".format(err.decode("utf-8"))
-                    "kustomize command failed. exit code: {0}, error: {1}".format(
+            )
-                        ret, err.decode("utf-8")
-                    )
-                )
-            else:
-                raise AnsibleLookupError(
-                    "kustomize command failed with unknown error. exit code: {0}".format(
-                        ret
-                    )
-                )
         return [out.decode("utf-8")]

plugins/module_utils/apply.py

@@ -149,7 +149,6 @@ def k8s_apply(resource, definition, **kwargs):
             force_conflicts=kwargs.get("force_conflicts"),
             field_manager=kwargs.get("field_manager"),
             dry_run=kwargs.get("dry_run"),
-            serialize=kwargs.get("serialize"),
         )
     if not existing:
         return resource.create(
@@ -159,7 +158,6 @@ def k8s_apply(resource, definition, **kwargs):
         return resource.get(
             name=definition["metadata"]["name"],
             namespace=definition["metadata"].get("namespace"),
-            **kwargs
         )
     return resource.patch(
         body=desired,

plugins/module_utils/args_common.py

@@ -18,7 +18,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/helm.py

@@ -77,6 +77,7 @@ def write_temp_kubeconfig(server, validate_certs=True, ca_cert=None, kubeconfig=
 
 
 class AnsibleHelmModule(object):
+
     """
     An Ansible module class for Kubernetes.core helm modules
     """
@@ -159,13 +160,11 @@ class AnsibleHelmModule(object):
             self.helm_env = self._prepare_helm_environment()
         return self.helm_env
 
-    def run_helm_command(self, command, fails_on_error=True, data=None):
+    def run_helm_command(self, command, fails_on_error=True):
         if not HAS_YAML:
             self.fail_json(msg=missing_required_lib("PyYAML"), exception=YAML_IMP_ERR)
 
-        rc, out, err = self.run_command(
+        rc, out, err = self.run_command(command, environ_update=self.env_update)
-            command, environ_update=self.env_update, data=data
-        )
         if fails_on_error and rc != 0:
             self.fail_json(
                 msg="Failure when executing Helm command. Exited {0}.\nstdout: {1}\nstderr: {2}".format(
@@ -185,10 +184,10 @@ class AnsibleHelmModule(object):
     def get_helm_version(self):
         command = self.get_helm_binary() + " version"
         rc, out, err = self.run_command(command)
-        m = re.match(r'version.BuildInfo{Version:"v(.*?)",', out)
+        m = re.match(r'version.BuildInfo{Version:"v([0-9\.]*)",', out)
         if m:
             return m.group(1)
-        m = re.match(r'Client: &version.Version{SemVer:"v(.*?)", ', out)
+        m = re.match(r'Client: &version.Version{SemVer:"v([0-9\.]*)", ', out)
         if m:
             return m.group(1)
         return None

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

@@ -139,7 +139,6 @@ def perform_action(svc, definition: Dict, params: Dict) -> Dict:
 
     result = {"changed": False, "result": {}}
     instance = {}
-    warnings = []
 
     resource = svc.find_resource(kind, api_version, fail=True)
     definition["kind"] = resource.kind
@@ -173,7 +172,7 @@ def perform_action(svc, definition: Dict, params: Dict) -> Dict:
                 return result
 
         if params.get("apply"):
-            instance, warnings = svc.apply(resource, definition, existing)
+            instance = svc.apply(resource, definition, existing)
             result["method"] = "apply"
         elif not existing:
             if state == "patched":
@@ -184,19 +183,16 @@ def perform_action(svc, definition: Dict, params: Dict) -> Dict:
                     )
                 )
                 return result
-            instance, warnings = svc.create(resource, definition)
+            instance = svc.create(resource, definition)
             result["method"] = "create"
             result["changed"] = True
         elif params.get("force", False):
-            instance, warnings = svc.replace(resource, definition, existing)
+            instance = svc.replace(resource, definition, existing)
             result["method"] = "replace"
         else:
-            instance, warnings = svc.update(resource, definition, existing)
+            instance = svc.update(resource, definition, existing)
             result["method"] = "update"
 
-    if warnings:
-        result["warnings"] = warnings
-
     # If needed, wait and/or create diff
     success = True
 

plugins/module_utils/k8s/service.py

@@ -2,9 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 import copy
-from json import loads
+from typing import Any, Dict, List, Optional, Tuple
-from re import compile
-from typing import Any, Dict, List, Optional, Tuple, Union
 
 from ansible.module_utils.common.dict_transformations import dict_merge
 from ansible_collections.kubernetes.core.plugins.module_utils.hashes import (
@@ -144,12 +142,18 @@ class K8sService:
         name: str,
         namespace: str,
         merge_type: str = None,
-    ) -> Tuple[Dict, List[str]]:
+    ) -> Dict:
+        if merge_type == "json":
+            self.module.deprecate(
+                msg="json as a merge_type value is deprecated. Please use the k8s_json_patch module instead.",
+                version="4.0.0",
+                collection_name="kubernetes.core",
+            )
         try:
-            params = dict(name=name, namespace=namespace, serialize=False)
+            params = dict(name=name, namespace=namespace)
             if merge_type:
                 params["content_type"] = "application/{0}-patch+json".format(merge_type)
-            return decode_response(self.client.patch(resource, definition, **params))
+            return self.client.patch(resource, definition, **params).to_dict()
         except Exception as e:
             reason = e.body if hasattr(e, "body") else e
             msg = "Failed to patch object: {0}".format(reason)
@@ -326,124 +330,123 @@ class K8sService:
             result["resources"].append(hide_fields(res, hidden_fields))
         return result
 
-    def create(self, resource: Resource, definition: Dict) -> Tuple[Dict, List[str]]:
+    def create(self, resource: Resource, definition: Dict) -> Dict:
         namespace = definition["metadata"].get("namespace")
         name = definition["metadata"].get("name")
 
         if self._client_side_dry_run:
-            return _encode_stringdata(definition), []
+            k8s_obj = _encode_stringdata(definition)
-
+        else:
-        try:
+            try:
-            return decode_response(
+                k8s_obj = self.client.create(
-                self.client.create(
+                    resource, definition, namespace=namespace
-                    resource, definition, namespace=namespace, serialize=False
+                ).to_dict()
+            except ConflictError:
+                # Some resources, like ProjectRequests, can't be created multiple times,
+                # because the resources that they create don't match their kind
+                # In this case we'll mark it as unchanged and warn the user
+                self.module.warn(
+                    "{0} was not found, but creating it returned a 409 Conflict error. This can happen \
+                            if the resource you are creating does not directly create a resource of the same kind.".format(
+                        name
+                    )
                 )
-            )
+                return dict()
-        except ConflictError:
+            except Exception as e:
-            # Some resources, like ProjectRequests, can't be created multiple times,
+                reason = e.body if hasattr(e, "body") else e
-            # because the resources that they create don't match their kind
+                msg = "Failed to create object: {0}".format(reason)
-            # In this case we'll mark it as unchanged and warn the user
+                raise CoreException(msg) from e
-            self.module.warn(
+        return k8s_obj
-                "{0} was not found, but creating it returned a 409 Conflict error. This can happen \
-                        if the resource you are creating does not directly create a resource of the same kind.".format(
-                    name
-                )
-            )
-            return dict(), []
-        except Exception as e:
-            reason = e.body if hasattr(e, "body") else e
-            msg = "Failed to create object: {0}".format(reason)
-            raise CoreException(msg) from e
 
     def apply(
         self,
         resource: Resource,
         definition: Dict,
         existing: Optional[ResourceInstance] = None,
-    ) -> Tuple[Dict, List[str]]:
+    ) -> Dict:
         namespace = definition["metadata"].get("namespace")
 
         server_side_apply = self.module.params.get("server_side_apply")
         if server_side_apply:
             requires("kubernetes", "19.15.0", reason="to use server side apply")
-
         if self._client_side_dry_run:
             ignored, patch = apply_object(resource, _encode_stringdata(definition))
             if existing:
-                return dict_merge(existing.to_dict(), patch), []
+                k8s_obj = dict_merge(existing.to_dict(), patch)
             else:
-                return patch, []
+                k8s_obj = patch
-
+        else:
-        try:
+            try:
-            params = {}
+                params = {}
-            if server_side_apply:
+                if server_side_apply:
-                params["server_side"] = True
+                    params["server_side"] = True
-                params.update(server_side_apply)
+                    params.update(server_side_apply)
-            return decode_response(
+                k8s_obj = self.client.apply(
-                self.client.apply(
+                    resource, definition, namespace=namespace, **params
-                    resource, definition, namespace=namespace, serialize=False, **params
+                ).to_dict()
-                )
+            except Exception as e:
-            )
+                reason = e.body if hasattr(e, "body") else e
-        except Exception as e:
+                msg = "Failed to apply object: {0}".format(reason)
-            reason = e.body if hasattr(e, "body") else e
+                raise CoreException(msg) from e
-            msg = "Failed to apply object: {0}".format(reason)
+        return k8s_obj
-            raise CoreException(msg) from e
 
     def replace(
         self,
         resource: Resource,
         definition: Dict,
         existing: ResourceInstance,
-    ) -> Tuple[Dict, List[str]]:
+    ) -> Dict:
         append_hash = self.module.params.get("append_hash", False)
         name = definition["metadata"].get("name")
         namespace = definition["metadata"].get("namespace")
 
         if self._client_side_dry_run:
-            return _encode_stringdata(definition), []
+            k8s_obj = _encode_stringdata(definition)
-
+        else:
-        try:
+            try:
-            return decode_response(
+                k8s_obj = self.client.replace(
-                self.client.replace(
                     resource,
                     definition,
                     name=name,
                     namespace=namespace,
                     append_hash=append_hash,
-                    serialize=False,
+                ).to_dict()
-                )
+            except Exception as e:
-            )
+                reason = e.body if hasattr(e, "body") else e
-        except Exception as e:
+                msg = "Failed to replace object: {0}".format(reason)
-            reason = e.body if hasattr(e, "body") else e
+                raise CoreException(msg) from e
-            msg = "Failed to replace object: {0}".format(reason)
+        return k8s_obj
-            raise CoreException(msg) from e
 
     def update(
         self, resource: Resource, definition: Dict, existing: ResourceInstance
-    ) -> Tuple[Dict, List[str]]:
+    ) -> Dict:
         name = definition["metadata"].get("name")
         namespace = definition["metadata"].get("namespace")
 
         if self._client_side_dry_run:
-            return dict_merge(existing.to_dict(), _encode_stringdata(definition)), []
+            k8s_obj = dict_merge(existing.to_dict(), _encode_stringdata(definition))
-
+        else:
-        exception = None
+            exception = None
-        for merge_type in self.module.params.get("merge_type") or [
+            for merge_type in self.module.params.get("merge_type") or [
-            "strategic-merge",
+                "strategic-merge",
-            "merge",
+                "merge",
-        ]:
+            ]:
-            try:
+                try:
-                return self.patch_resource(
+                    k8s_obj = self.patch_resource(
-                    resource,
+                        resource,
-                    definition,
+                        definition,
-                    name,
+                        name,
-                    namespace,
+                        namespace,
-                    merge_type=merge_type,
+                        merge_type=merge_type,
-                )
+                    )
-            except CoreException as e:
+                    exception = None
-                exception = e
+                except CoreException as e:
-                continue
+                    exception = e
-        raise exception
+                    continue
+                break
+            if exception:
+                raise exception
+        return k8s_obj
 
     def delete(
         self,
@@ -473,7 +476,7 @@ class K8sService:
         if label_selectors:
             params["label_selector"] = ",".join(label_selectors)
 
-        if delete_options and not self.module.check_mode:
+        if delete_options:
             body = {
                 "apiVersion": "v1",
                 "kind": "DeleteOptions",
@@ -501,214 +504,42 @@ def diff_objects(
     result["before"] = diff[0]
     result["after"] = diff[1]
 
-    if list(result["after"].keys()) == ["metadata"] and list(
+    if list(result["after"].keys()) != ["metadata"] or list(
         result["before"].keys()
-    ) == ["metadata"]:
+    ) != ["metadata"]:
-        # If only metadata.generation and metadata.resourceVersion changed, ignore it
+        return False, result
-        ignored_keys = set(["generation", "resourceVersion"])
 
-        if set(result["after"]["metadata"].keys()).issubset(ignored_keys) and set(
+    # If only metadata.generation and metadata.resourceVersion changed, ignore it
-            result["before"]["metadata"].keys()
+    ignored_keys = set(["generation", "resourceVersion"])
-        ).issubset(ignored_keys):
+
-            return True, result
+    if not set(result["after"]["metadata"].keys()).issubset(ignored_keys):
+        return False, result
+    if not set(result["before"]["metadata"].keys()).issubset(ignored_keys):
+        return False, result
 
     result["before"] = hide_fields(result["before"], hidden_fields)
     result["after"] = hide_fields(result["after"], hidden_fields)
 
-    return False, result
+    return True, result
 
 
-def hide_field_tree(hidden_field: str) -> List[str]:
+def hide_fields(definition: dict, hidden_fields: Optional[list]) -> dict:
-    result = []
-    key, rest = hide_field_split2(hidden_field)
-    result.append(key)
-    while rest:
-        key, rest = hide_field_split2(rest)
-        result.append(key)
-
-    return result
-
-
-def build_hidden_field_tree(hidden_fields: List[str]) -> Dict[str, Any]:
-    """Group hidden field targeting the same json key
-    Example:
-        Input: ['env[3]', 'env[0]']
-        Output: {'env': [0, 3]}
-    """
-    output = {}
-    for hidden_field in hidden_fields:
-        current = output
-        tree = hide_field_tree(hidden_field)
-        for idx, key in enumerate(tree):
-            if current.get(key, "") is None:
-                break
-            if idx == (len(tree) - 1):
-                current[key] = None
-            elif key not in current:
-                current[key] = {}
-            current = current[key]
-    return output
-
-
-# hide_field should be able to cope with simple or more complicated
-# field definitions
-# e.g. status or metadata.managedFields or
-# spec.template.spec.containers[0].env[3].value or
-# metadata.annotations[kubectl.kubernetes.io/last-applied-configuration]
-def hide_field(
-    definition: Union[Dict[str, Any], List[Any]], hidden_field: Dict[str, Any]
-) -> Dict[str, Any]:
-    def dict_contains_key(obj: Dict[str, Any], key: str) -> bool:
-        return key in obj
-
-    def list_contains_key(obj: List[Any], key: str) -> bool:
-        return int(key) < len(obj)
-
-    hidden_keys = list(hidden_field.keys())
-    field_contains_key = dict_contains_key
-    field_get_key = str
-    if isinstance(definition, list):
-        # Sort with reverse=true so that when we delete an item from the list, the order is not changed
-        hidden_keys = sorted(
-            [k for k in hidden_field.keys() if k.isdecimal()], reverse=True
-        )
-        field_contains_key = list_contains_key
-        field_get_key = int
-
-    for key in hidden_keys:
-        if field_contains_key(definition, key):
-            value = hidden_field.get(key)
-            convert_key = field_get_key(key)
-            if value is None:
-                del definition[convert_key]
-            else:
-                definition[convert_key] = hide_field(definition[convert_key], value)
-                if (
-                    definition[convert_key] == dict()
-                    or definition[convert_key] == list()
-                ):
-                    del definition[convert_key]
-
-    return definition
-
-
-def hide_fields(
-    definition: Dict[str, Any], hidden_fields: Optional[List[str]]
-) -> Dict[str, Any]:
     if not hidden_fields:
         return definition
     result = copy.deepcopy(definition)
-    hidden_field_tree = build_hidden_field_tree(hidden_fields)
+    for hidden_field in hidden_fields:
-    return hide_field(result, hidden_field_tree)
+        result = hide_field(result, hidden_field)
+    return result
 
 
-def decode_response(resp) -> Tuple[Dict, List[str]]:
+# hide_field is not hugely sophisticated and designed to cope
-    """
+# with e.g. status or metadata.managedFields rather than e.g.
-    This function decodes unserialized responses from the Kubernetes python
+# spec.template.spec.containers[0].env[3].value
-    client and decodes the RFC2616 14.46 warnings found in the response
+def hide_field(definition: dict, hidden_field: str) -> dict:
-    headers.
-    """
-    obj = ResourceInstance(None, loads(resp.data.decode("utf8"))).to_dict()
-    warnings = []
-    if (
-        resp.headers is not None
-        and "warning" in resp.headers
-        and resp.headers["warning"] is not None
-    ):
-        warnings = resp.headers["warning"].split(", ")
-    return obj, decode_warnings(warnings)
-
-
-def decode_warnings(warnings: str) -> List[str]:
-    """
-    This function decodes RFC2616 14.46 warnings in a simplified way, where
-    only the warn-texts are returned in a list.
-    """
-    p = compile('\\d{3} .+ (".+")')
-
-    decoded = []
-    for warning in warnings:
-        m = p.match(warning)
-        if m:
-            try:
-                parsed, unused = parse_quoted_string(m.group(1))
-                decoded.append(parsed)
-            except ValueError:
-                continue
-
-    return decoded
-
-
-def parse_quoted_string(quoted_string: str) -> Tuple[str, str]:
-    """
-    This function was adapted from:
-    https://github.com/kubernetes/apimachinery/blob/bb8822152cabfb4f34dbc26270f874ce53db50de/pkg/util/net/http.go#L609
-    """
-    if len(quoted_string) == 0:
-        raise ValueError("invalid quoted string: 0-length")
-
-    if quoted_string[0] != '"':
-        raise ValueError("invalid quoted string: missing initial quote")
-
-    quoted_string = quoted_string[1:]
-    remainder = ""
-    escaping = False
-    closed_quote = False
-    result = []
-
-    for i, b in enumerate(quoted_string):
-        if b == '"':
-            if escaping:
-                result.append(b)
-                escaping = False
-            else:
-                closed_quote = True
-                remainder_start = i + 1
-                remainder = quoted_string[remainder_start:].strip()
-                break
-        elif b == "\\":
-            if escaping:
-                result.append(b)
-                escaping = False
-            else:
-                escaping = True
-        else:
-            result.append(b)
-            escaping = False
-
-    if not closed_quote:
-        raise ValueError("invalid quoted string: missing closing quote")
-
-    return "".join(result), remainder
-
-
-# hide_field_split2 returns the first key in hidden_field and the rest of the hidden_field
-# We expect the first key to either be in brackets, to be terminated by the start of a left
-# bracket, or to be terminated by a dot.
-
-# examples would be:
-# field.another.next -> (field, another.next)
-# field[key].value -> (field, [key].value)
-# [key].value -> (key, value)
-# [one][two] -> (one, [two])
-
-
-def hide_field_split2(hidden_field: str) -> Tuple[str, str]:
-    lbracket = hidden_field.find("[")
-    rbracket = hidden_field.find("]")
-    dot = hidden_field.find(".")
-
-    if lbracket == 0:
-        # skip past right bracket and any following dot
-        rest = hidden_field[rbracket + 1 :]  # noqa: E203
-        if rest and rest[0] == ".":
-            rest = rest[1:]
-        return (hidden_field[lbracket + 1 : rbracket], rest)  # noqa: E203
-
-    if lbracket != -1 and (dot == -1 or lbracket < dot):
-        return (hidden_field[:lbracket], hidden_field[lbracket:])
-
     split = hidden_field.split(".", 1)
-    if len(split) == 1:
+    if split[0] in definition:
-        return split[0], ""
+        if len(split) == 2:
-    return split
+            definition[split[0]] = hide_field(definition[split[0]], split[1])
+        else:
+            del definition[split[0]]
+    return definition

plugins/module_utils/k8s/waiter.py

@@ -51,7 +51,7 @@ def daemonset_ready(daemonset: ResourceInstance) -> bool:
     return bool(
         daemonset.status
         and daemonset.status.desiredNumberScheduled is not None
-        and (daemonset.status.updatedNumberScheduled or 0)
+        and daemonset.status.updatedNumberScheduled
         == daemonset.status.desiredNumberScheduled
         and daemonset.status.numberReady == daemonset.status.desiredNumberScheduled
         and daemonset.status.observedGeneration == daemonset.metadata.generation
@@ -117,34 +117,11 @@ def exists(resource: Optional[ResourceInstance]) -> bool:
     return bool(resource) and not empty_list(resource)
 
 
-def cluster_operator_ready(resource: ResourceInstance) -> bool:
-    """
-    Predicate to check if a single ClusterOperator is healthy.
-    Returns True if:
-      - "Available" is True
-      - "Degraded" is False
-      - "Progressing" is False
-    """
-    if not resource:
-        return False
-
-    # Extract conditions from the resource's status
-    conditions = resource.get("status", {}).get("conditions", [])
-
-    status = {x.get("type", ""): x.get("status") for x in conditions}
-    return (
-        (status.get("Degraded") == "False")
-        and (status.get("Progressing") == "False")
-        and (status.get("Available") == "True")
-    )
-
-
 RESOURCE_PREDICATES = {
     "DaemonSet": daemonset_ready,
     "Deployment": deployment_ready,
     "Pod": pod_ready,
     "StatefulSet": statefulset_ready,
-    "ClusterOperator": cluster_operator_ready,
 }
 
 

plugins/modules/helm.py

@@ -137,24 +137,14 @@ options:
       - If I(reset_values) is set to C(True), this is ignored.
     type: bool
     required: false
-    version_added: 3.0.0
+    version_added: 2.5.0
   reset_values:
     description:
       - When upgrading package, reset the values to the ones built into the chart.
     type: bool
     required: false
     default: True
-    version_added: 3.0.0
+    version_added: 2.5.0
-  reset_then_reuse_values:
-    description:
-      - When upgrading package, reset the values to the ones built into the chart, apply the last release's values and merge in any overrides from
-        parameters O(release_values), O(values_files) or O(set_values).
-      - If O(reset_values) or O(reuse_values) is set to V(True), this is ignored.
-      - This feature requires helm diff >= 3.9.12.
-    type: bool
-    required: false
-    default: False
-    version_added: 6.0.0
 
 #Helm options
   disable_hook:
@@ -228,15 +218,6 @@ options:
       - mutually exclusive with with C(replace).
     type: int
     version_added: 2.2.0
-  insecure_skip_tls_verify:
-    description:
-      - Skip tls certificate checks for the chart download.
-      - Do not confuse with the C(validate_certs) option.
-      - This option is only available for helm >= 3.16.0.
-    type: bool
-    default: False
-    aliases: [ skip_tls_certs_check ]
-    version_added: 5.3.0
 extends_documentation_fragment:
   - kubernetes.core.helm_common_options
 """
@@ -495,15 +476,12 @@ def run_dep_update(module, chart_ref):
     rc, out, err = module.run_helm_command(dep_update)
 
 
-def fetch_chart_info(module, command, chart_ref, insecure_skip_tls_verify=False):
+def fetch_chart_info(module, command, chart_ref):
     """
     Get chart info
     """
     inspect_command = command + f" show chart '{chart_ref}'"
 
-    if insecure_skip_tls_verify:
-        inspect_command += " --insecure-skip-tls-verify"
-
     rc, out, err = module.run_helm_command(inspect_command)
 
     return yaml.safe_load(out)
@@ -531,8 +509,6 @@ def deploy(
     set_value_args=None,
     reuse_values=None,
     reset_values=True,
-    reset_then_reuse_values=False,
-    insecure_skip_tls_verify=False,
 ):
     """
     Install/upgrade/rollback release chart
@@ -550,17 +526,6 @@ def deploy(
     if reuse_values is not None:
         deploy_command += " --reuse-values=" + str(reuse_values)
 
-    if reset_then_reuse_values:
-        helm_version = module.get_helm_version()
-        if LooseVersion(helm_version) < LooseVersion("3.14.0"):
-            module.fail_json(
-                msg="reset_then_reuse_values requires helm >= 3.14.0, current version is {0}".format(
-                    helm_version
-                )
-            )
-        else:
-            deploy_command += " --reset-then-reuse-values"
-
     if wait:
         deploy_command += " --wait"
         if wait_timeout is not None:
@@ -584,17 +549,6 @@ def deploy(
     if create_namespace:
         deploy_command += " --create-namespace"
 
-    if insecure_skip_tls_verify:
-        helm_version = module.get_helm_version()
-        if LooseVersion(helm_version) < LooseVersion("3.16.0"):
-            module.fail_json(
-                msg="insecure_skip_tls_verify requires helm >= 3.16.0, current version is {0}".format(
-                    helm_version
-                )
-            )
-        else:
-            deploy_command += " --insecure-skip-tls-verify"
-
     if values_files:
         for value_file in values_files:
             deploy_command += " --values=" + value_file
@@ -688,8 +642,6 @@ def helmdiff_check(
     set_value_args=None,
     reuse_values=None,
     reset_values=True,
-    reset_then_reuse_values=False,
-    insecure_skip_tls_verify=False,
 ):
     """
     Use helm diff to determine if a release would change by upgrading a chart.
@@ -724,27 +676,6 @@ def helmdiff_check(
     if reuse_values:
         cmd += " --reuse-values"
 
-    if reset_then_reuse_values:
-        helm_diff_version = get_plugin_version("diff")
-        helm_version = module.get_helm_version()
-        fail_msg = ""
-        if LooseVersion(helm_diff_version) < LooseVersion("3.9.12"):
-            fail_msg = "reset_then_reuse_values requires helm diff >= 3.9.12, current version is {0}\n".format(
-                helm_diff_version
-            )
-        if LooseVersion(helm_version) < LooseVersion("3.14.0"):
-            fail_msg += "reset_then_reuse_values requires helm >= 3.14.0, current version is {0}\n".format(
-                helm_version
-            )
-
-        if fail_msg:
-            module.fail_json(msg=fail_msg)
-        else:
-            cmd += " --reset-then-reuse-values"
-
-    if insecure_skip_tls_verify:
-        cmd += " --insecure-skip-tls-verify"
-
     rc, out, err = module.run_helm_command(cmd)
     return (len(out.strip()) > 0, out.strip())
 
@@ -804,10 +735,6 @@ def argument_spec():
             set_values=dict(type="list", elements="dict"),
             reuse_values=dict(type="bool"),
             reset_values=dict(type="bool", default=True),
-            reset_then_reuse_values=dict(type="bool", default=False),
-            insecure_skip_tls_verify=dict(
-                type="bool", default=False, aliases=["skip_tls_certs_check"]
-            ),
         )
     )
     return arg_spec
@@ -860,8 +787,6 @@ def main():
     set_values = module.params.get("set_values")
     reuse_values = module.params.get("reuse_values")
     reset_values = module.params.get("reset_values")
-    reset_then_reuse_values = module.params.get("reset_then_reuse_values")
-    insecure_skip_tls_verify = module.params.get("insecure_skip_tls_verify")
 
     if update_repo_cache:
         run_repo_update(module)
@@ -899,9 +824,7 @@ def main():
             helm_cmd += " --repo=" + chart_repo_url
 
         # Fetch chart info to have real version and real name for chart_ref from archive, folder or url
-        chart_info = fetch_chart_info(
+        chart_info = fetch_chart_info(module, helm_cmd, chart_ref)
-            module, helm_cmd, chart_ref, insecure_skip_tls_verify
-        )
 
         if dependency_update:
             if chart_info.get("dependencies"):
@@ -960,8 +883,6 @@ def main():
                 set_value_args=set_value_args,
                 reuse_values=reuse_values,
                 reset_values=reset_values,
-                reset_then_reuse_values=reset_then_reuse_values,
-                insecure_skip_tls_verify=insecure_skip_tls_verify,
             )
             changed = True
 
@@ -987,8 +908,6 @@ def main():
                     set_value_args,
                     reuse_values=reuse_values,
                     reset_values=reset_values,
-                    reset_then_reuse_values=reset_then_reuse_values,
-                    insecure_skip_tls_verify=insecure_skip_tls_verify,
                 )
                 if would_change and module._diff:
                     opt_result["diff"] = {"prepared": prepared}
@@ -1024,8 +943,6 @@ def main():
                     set_value_args=set_value_args,
                     reuse_values=reuse_values,
                     reset_values=reset_values,
-                    reset_then_reuse_values=reset_then_reuse_values,
-                    insecure_skip_tls_verify=insecure_skip_tls_verify,
                 )
                 changed = True
 

plugins/modules/helm_pull.py

@@ -75,10 +75,9 @@ options:
   skip_tls_certs_check:
     description:
     - Whether or not to check tls certificate for the chart download.
-    - Requires helm >= 3.3.0. Alias C(insecure_skip_tls_verify) added in 5.3.0.
+    - Requires helm >= 3.3.0.
     type: bool
     default: False
-    aliases: [ insecure_skip_tls_verify ]
   chart_devel:
     description:
     - Use development versions, too. Equivalent to version '>0.0.0-0'.
@@ -190,10 +189,8 @@ def main():
         repo_password=dict(
             type="str", no_log=True, aliases=["password", "chart_repo_password"]
         ),
-        pass_credentials=dict(type="bool", default=False, no_log=False),
+        pass_credentials=dict(type="bool", default=False),
-        skip_tls_certs_check=dict(
+        skip_tls_certs_check=dict(type="bool", default=False),
-            type="bool", default=False, aliases=["insecure_skip_tls_verify"]
-        ),
         chart_devel=dict(type="bool"),
         untar_chart=dict(type="bool", default=False),
         destination=dict(type="path", required=True),

plugins/modules/helm_registry_auth.py

@@ -1,249 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# Copyright: © Ericsson AB 2024
-# 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 = r"""
----
-module: helm_registry_auth
-
-short_description: Helm registry authentication module
-
-version_added: 5.1.0
-
-author:
-  - Yuriy Novostavskiy (@yurnov)
-
-requirements:
-  - "helm (https://github.com/helm/helm/releases) => 3.8.0"
-
-description:
-  -  Helm registry authentication module allows you to login C(helm registry login) and logout C(helm registry logout) from a Helm registry.
-
-options:
-  state:
-    description:
-      - 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']
-    type: str
-  host:
-    description:
-      - Provide a URL for accessing the registry.
-    required: true
-    aliases: [ registry_url ]
-    type: str
-  insecure:
-    description:
-      - Allow connections to SSL sites without certs.
-    required: false
-    default: false
-    type: bool
-  username:
-    description:
-      - Username for the registry.
-    required: false
-    type: str
-    aliases: [ repo_username ]
-  password:
-    description:
-      - Password for the registry.
-    required: false
-    type: str
-    aliases: [ repo_password ]
-  key_file:
-    description:
-      - Path to the client key SSL file for identify registry client using this key file.
-    required: false
-    type: path
-  cert_file:
-    description:
-      - Path to the client certificate SSL file for identify registry client using this certificate file.
-    required: false
-    type: path
-  ca_file:
-    description:
-      - Path to the CA certificate SSL file for verify registry server certificate.
-    required: false
-    type: path
-  binary_path:
-    description:
-      - The path of a helm binary to use.
-    required: false
-    type: path
-"""
-
-EXAMPLES = r"""
-- name: Login to remote registry
-  kubernetes.core.helm_registry_auth:
-    username: admin
-    password: "sample_password"
-    host: localhost:5000
-
-- name: Logout from remote registry
-  kubernetes.core.helm_registry_auth:
-    state: absent
-    host: localhost:5000
-"""
-
-RETURN = r"""
-stdout:
-  type: str
-  description: Full C(helm) command stdout, in case you want to display it or examine the event log
-  returned: always
-stout_lines:
-  type: list
-  description: Full C(helm) command stdout, in case you want to display it or examine the event log
-  returned: always
-stderr:
-  type: str
-  description: >-
-    Full C(helm) command stderr, in case you want to display it or examine the event log.
-    Please be note that helm binnary may print messages to stderr even if the command is successful.
-  returned: always
-  sample: 'Login Succeeded\n'
-stderr_lines:
-  type: list
-  description: Full C(helm) command stderr, in case you want to display it or examine the event log
-  returned: always
-command:
-  type: str
-  description: Full C(helm) command executed
-  returned: always
-  sample: '/usr/local/bin/helm registry login oci-registry.domain.example --username=admin --password-stdin --insecure'
-failed:
-  type: bool
-  description: Indicate if the C(helm) command failed
-  returned: always
-  sample: false
-"""
-
-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():
-    return dict(
-        binary_path=dict(type="path", required=False),
-        host=dict(type="str", aliases=["registry_url"], required=True),
-        state=dict(default="present", choices=["present", "absent"], required=False),
-        insecure=dict(type="bool", default=False, required=False),
-        username=dict(type="str", aliases=["repo_username"], required=False),
-        password=dict(
-            type="str", aliases=["repo_password"], no_log=True, required=False
-        ),
-        key_file=dict(type="path", required=False),
-        cert_file=dict(type="path", required=False),
-        ca_file=dict(type="path", required=False),
-    )
-
-
-def login(
-    command,
-    host,
-    insecure,
-    username,
-    password,
-    key_file,
-    cert_file,
-    ca_file,
-):
-    login_command = command + " registry login " + host
-
-    if username is not None and password is not None:
-        login_command += " --username=" + username + " --password-stdin"
-
-    if insecure:
-        login_command += " --insecure"
-
-    if key_file is not None:
-        login_command += " --key-file=" + key_file
-
-    if cert_file is not None:
-        login_command += " --cert-file=" + cert_file
-
-    if ca_file is not None:
-        login_command += " --ca-file=" + ca_file
-
-    return login_command
-
-
-def logout(command, host):
-    return command + " registry logout " + host
-
-
-def main():
-    global module
-
-    module = AnsibleHelmModule(
-        argument_spec=arg_spec(),
-        required_together=[["username", "password"]],
-        supports_check_mode=True,
-    )
-
-    changed = False
-
-    host = module.params.get("host")
-    state = module.params.get("state")
-    insecure = module.params.get("insecure")
-    username = module.params.get("username")
-    password = module.params.get("password")
-    key_file = module.params.get("key_file")
-    cert_file = module.params.get("cert_file")
-    ca_file = module.params.get("ca_file")
-
-    helm_cmd = module.get_helm_binary()
-
-    if state == "absent":
-        helm_cmd = logout(helm_cmd, host)
-        changed = True
-    elif state == "present":
-        helm_cmd = login(
-            helm_cmd, host, insecure, username, password, key_file, cert_file, ca_file
-        )
-        changed = True
-
-    if module.check_mode:
-        module.exit_json(changed=changed, command=helm_cmd)
-
-    rc, out, err = module.run_helm_command(
-        helm_cmd, data=password, fails_on_error=False
-    )
-
-    if rc != 0:
-        if state == "absent" and "Error: not logged in" in err:
-            changed = False
-        else:
-            module.fail_json(
-                msg="Failure when executing Helm command. Exited {0}.\nstdout: {1}\nstderr: {2}".format(
-                    rc, out, err
-                ),
-                stderr=err,
-                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)
-
-
-if __name__ == "__main__":
-    main()

plugins/modules/helm_repository.py

@@ -119,13 +119,6 @@ options:
     aliases: [ force ]
     default: False
     version_added: 2.4.0
-  insecure_skip_tls_verify:
-    description:
-      - Skip tls certificate checks for the repository url.
-    type: bool
-    default: False
-    aliases: [ skip_tls_certs_check ]
-    version_added: "5.3.0"
 """
 
 EXAMPLES = r"""
@@ -233,7 +226,6 @@ def install_repository(
     repository_password,
     pass_credentials,
     force_update,
-    insecure_skip_tls_verify,
 ):
     install_command = command + " repo add " + repository_name + " " + repository_url
 
@@ -247,9 +239,6 @@ def install_repository(
     if force_update:
         install_command += " --force-update"
 
-    if insecure_skip_tls_verify:
-        install_command += " --insecure-skip-tls-verify"
-
     return install_command
 
 
@@ -273,9 +262,6 @@ def argument_spec():
             ),
             pass_credentials=dict(type="bool", default=False, no_log=True),
             force_update=dict(type="bool", default=False, aliases=["force"]),
-            insecure_skip_tls_verify=dict(
-                type="bool", default=False, aliases=["skip_tls_certs_check"]
-            ),
         )
     )
     return arg_spec
@@ -304,7 +290,6 @@ def main():
     repo_state = module.params.get("repo_state")
     pass_credentials = module.params.get("pass_credentials")
     force_update = module.params.get("force_update")
-    insecure_skip_tls_verify = module.params.get("insecure_skip_tls_verify")
 
     helm_cmd = module.get_helm_binary()
 
@@ -323,7 +308,6 @@ def main():
                 repo_password,
                 pass_credentials,
                 force_update,
-                insecure_skip_tls_verify,
             )
             changed = True
         elif repository_status["url"] != repo_url:

plugins/modules/helm_template.py

@@ -72,13 +72,6 @@ options:
       - If the directory already exists, it will be overwritten.
     required: false
     type: path
-  insecure_registry:
-    description:
-      - Skip TLS certificate checks for the chart download
-    required: false
-    type: bool
-    default: false
-    version_added: 5.1.0
   release_name:
     description:
       - Release name to use in rendered templates.
@@ -228,7 +221,6 @@ def template(
     dependency_update=None,
     disable_hook=None,
     output_dir=None,
-    insecure_registry=None,
     show_only=None,
     release_name=None,
     release_namespace=None,
@@ -259,9 +251,6 @@ def template(
     if output_dir:
         cmd += " --output-dir=" + output_dir
 
-    if insecure_registry:
-        cmd += " --insecure-skip-tls-verify"
-
     if show_only:
         for template in show_only:
             cmd += " -s " + template
@@ -300,7 +289,6 @@ def main():
             include_crds=dict(type="bool", default=False),
             release_name=dict(type="str", aliases=["name"]),
             output_dir=dict(type="path"),
-            insecure_registry=dict(type="bool", default=False),
             release_namespace=dict(type="str"),
             release_values=dict(type="dict", default={}, aliases=["values"]),
             show_only=dict(type="list", default=[], elements="str"),
@@ -320,7 +308,6 @@ def main():
     include_crds = module.params.get("include_crds")
     release_name = module.params.get("release_name")
     output_dir = module.params.get("output_dir")
-    insecure_registry = module.params.get("insecure_registry")
     show_only = module.params.get("show_only")
     release_namespace = module.params.get("release_namespace")
     release_values = module.params.get("release_values")
@@ -350,7 +337,6 @@ def main():
         disable_hook=disable_hook,
         release_name=release_name,
         output_dir=output_dir,
-        insecure_registry=insecure_registry,
         release_namespace=release_namespace,
         release_values=release_values,
         show_only=show_only,

plugins/modules/k8s.py

@@ -57,14 +57,15 @@ options:
     - Whether to override the default patch merge approach with a specific type. By default, the strategic
       merge will typically be used.
     - For example, Custom Resource Definitions typically aren't updatable by the usual strategic merge. You may
-      want to use C(merge) if you see "strategic merge patch format is not supported".
+      want to use C(merge) if you see "strategic merge patch format is not supported"
     - See U(https://kubernetes.io/docs/tasks/run-application/update-api-object-kubectl-patch/#use-a-json-merge-patch-to-update-a-deployment)
     - If more than one C(merge_type) is given, the merge_types will be tried in order. This defaults to
       C(['strategic-merge', 'merge']), which is ideal for using the same parameters on resource kinds that
       combine Custom Resources and built-in resources.
-    - Mutually exclusive with C(apply).
+    - mutually exclusive with C(apply)
-    - I(merge_type=json) has been removed in version 4.0.0. Please use M(kubernetes.core.k8s_json_patch) instead.
+    - I(merge_type=json) is deprecated and will be removed in version 4.0.0. Please use M(kubernetes.core.k8s_json_patch) instead.
     choices:
+    - json
     - merge
     - strategic-merge
     type: list
@@ -100,7 +101,7 @@ options:
     - C(apply) compares the desired resource definition with the previously supplied resource definition,
       ignoring properties that are automatically generated
     - C(apply) works better with Services than 'force=yes'
-    - Mutually exclusive with C(merge_type).
+    - mutually exclusive with C(merge_type)
     default: False
     type: bool
   template:
@@ -181,18 +182,17 @@ options:
     - This parameter can be used with C(label_selectors) to restrict the resources to be deleted.
     type: bool
     default: false
-    version_added: 3.0.0
+    version_added: 2.5.0
     aliases:
     - all
   hidden_fields:
     description:
       - Hide fields matching this option in the result
       - An example might be C(hidden_fields=[metadata.managedFields])
-        or V(hidden_fields=[spec.containers[0].env[3].value])
+      - Only field definitions that don't reference list items are supported (so V(spec.containers[0]) would not work)
-        or V(hidden_fields=[metadata.annotations[kubectl.kubernetes.io/last-applied-configuration]])
     type: list
     elements: str
-    version_added: 3.0.0
+    version_added: 2.5.0
 
 requirements:
   - "python >= 3.9"
@@ -460,7 +460,7 @@ def argspec():
     argument_spec.update(copy.deepcopy(AUTH_ARG_SPEC))
     argument_spec.update(copy.deepcopy(WAIT_ARG_SPEC))
     argument_spec["merge_type"] = dict(
-        type="list", elements="str", choices=["merge", "strategic-merge"]
+        type="list", elements="str", choices=["json", "merge", "strategic-merge"]
     )
     argument_spec["validate"] = dict(type="dict", default=None, options=validate_spec())
     argument_spec["append_hash"] = dict(type="bool", default=False)

plugins/modules/k8s_drain.py

@@ -47,7 +47,7 @@ options:
       - This option has effect only when C(state) is set to I(drain).
     type: list
     elements: str
-    version_added: 3.0.0
+    version_added: 2.5.0
     aliases:
     - label_selectors
   delete_options:
@@ -106,8 +106,7 @@ EXAMPLES = r"""
   kubernetes.core.k8s_drain:
     state: drain
     name: foo
-    delete_options:
+    force: yes
-      force: yes
 
 - name: Drain node "foo", but abort if there are pods not managed by a ReplicationController, Job, or DaemonSet, and use a grace period of 15 minutes.
   kubernetes.core.k8s_drain:
@@ -144,7 +143,6 @@ result:
 """
 
 import copy
-import json
 import time
 import traceback
 from datetime import datetime
@@ -189,17 +187,6 @@ except ImportError:
         HAS_EVICTION_API = False
 
 
-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)
-
-
 def filter_pods(pods, force, ignore_daemonset, delete_emptydir_data):
     k8s_kind_mirror = "kubernetes.io/config.mirror"
     daemonSet, unmanaged, mirror, localStorage, to_delete = [], [], [], [], []
@@ -304,19 +291,16 @@ class K8sDrainAnsible(object):
             return (datetime.now() - start).seconds
 
         response = None
-        pod = None
+        pod = pods.pop()
         while (_elapsed_time() < wait_timeout or wait_timeout == 0) and pods:
             if not pod:
-                pod = pods[-1]
+                pod = pods.pop()
             try:
                 response = self._api_instance.read_namespaced_pod(
                     namespace=pod[0], name=pod[1]
                 )
-                if not response or response.spec.node_name != self._module.params.get(
+                if not response:
-                    "name"
-                ):
                     pod = None
-                    del pods[-1]
                 time.sleep(wait_sleep)
             except ApiException as exc:
                 if exc.reason != "Not Found":
@@ -324,7 +308,6 @@ class K8sDrainAnsible(object):
                         msg="Exception raised: {0}".format(exc.reason)
                     )
                 pod = None
-                del pods[-1]
             except Exception as e:
                 self._module.fail_json(msg="Exception raised: {0}".format(to_native(e)))
         if not pods:
@@ -351,7 +334,7 @@ class K8sDrainAnsible(object):
                 if exc.reason != "Not Found":
                     self._module.fail_json(
                         msg="Failed to delete pod {0}/{1} due to: {2}".format(
-                            namespace, name, to_native(format_dynamic_api_exc(exc))
+                            namespace, name, exc.reason
                         )
                     )
             except Exception as exc:

plugins/modules/k8s_exec.py

@@ -135,7 +135,7 @@ from ansible.module_utils._text import to_native
 from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import (
     AnsibleModule,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.args_common import (
+from ansible_collections.kubernetes.core.plugins.module_utils.common import (
     AUTH_ARG_SPEC,
 )
 from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
@@ -219,6 +219,12 @@ def execute_module(module, client):
     else:
         rc = int(err["details"]["causes"][0]["message"])
 
+    module.deprecate(
+        "The 'return_code' return key is being renamed to 'rc'. "
+        "Both keys are being returned for now to allow users to migrate their automation.",
+        version="4.0.0",
+        collection_name="kubernetes.core",
+    )
     module.exit_json(
         # Some command might change environment, but ultimately failing at end
         changed=True,

plugins/modules/k8s_info.py

@@ -48,11 +48,10 @@ options:
     description:
       - Hide fields matching any of the field definitions in the result
       - An example might be C(hidden_fields=[metadata.managedFields])
-        or V(hidden_fields=[spec.containers[0].env[3].value])
+      - Only field definitions that don't reference list items are supported (so V(spec.containers[0]) would not work)
-        or V(hidden_fields=[metadata.annotations[kubectl.kubernetes.io/last-applied-configuration]])
     type: list
     elements: str
-    version_added: 3.0.0
+    version_added: 2.5.0
 
 extends_documentation_fragment:
   - kubernetes.core.k8s_auth_options

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

@@ -3,7 +3,6 @@ helm_default_archive_name: "helm-{{ helm_version }}-{{ ansible_system | lower }}
 helm_binary: "/tmp/helm/{{ ansible_system | lower }}-amd64/helm"
 
 chart_test: "ingress-nginx"
-chart_test_oci: "oci://registry-1.docker.io/bitnamicharts/redis"
 chart_test_local_path: "nginx-ingress"
 chart_test_version: 4.2.4
 chart_test_version_local_path: 1.32.0
@@ -27,5 +26,3 @@ test_namespace:
   - "helm-from-url"
   - "helm-reuse-values"
   - "helm-chart-with-space-into-name"
-  - "helm-reset-then-reuse-values"
-  - "helm-insecure"

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

@@ -4,5 +4,4 @@
   loop_control:
     loop_var: helm_version
   with_items:
-    - "v3.15.4"
+    - "v3.7.0"
-    - "v3.16.0"

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

@@ -28,9 +28,6 @@
 - name: test helm upgrade with reuse_values
   include_tasks: test_helm_reuse_values.yml
 
-- name: test helm upgrade with reset_then_reuse_values
-  include_tasks: test_helm_reset_then_reuse_values.yml
-
 - name: test helm dependency update
   include_tasks: test_up_dep.yml
 
@@ -44,9 +41,6 @@
 - name: Test Skip CRDS feature in helm chart install
   include_tasks: test_crds.yml
 
-- name: Test insecure registry flag feature
-  include_tasks: test_helm_insecure.yml
-
 - name: Clean helm install
   file:
     path: "{{ item }}"

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

@@ -3,89 +3,78 @@
   vars:
     test_chart: "test-crds"
     helm_namespace: "{{ test_namespace[0] }}"
-    helm_binary: helm
   block:
     - name: Create namespace
       k8s:
         kind: Namespace
         name: "{{ helm_namespace }}"
 
-    - name: Check if CRD resource is already present
+    - name: Copy test chart
-      k8s_info:
+      copy:
-        namespace: default
+        src: "{{ test_chart }}"
-        kind: Foo
+        dest: "/tmp/helm_test_crds/"
-        api_version: ansible.com/v1
+
+    - name: Install chart while skipping CRDs
+      helm:
+        binary_path: "{{ helm_binary }}"
+        chart_ref: "/tmp/helm_test_crds/{{ test_chart }}"
+        namespace: "{{ helm_namespace }}"
+        name: test-crds
+        skip_crds: true
+      register: install
+
+    - assert:
+        that:
+          - install is changed
+          - install.status.name == "test-crds"
+
+    - name: Fail to create custom resource
+      k8s:
+        definition:
+          apiVersion: ansible.com/v1
+          kind: Foo
+          metadata:
+            namespace: "{{ helm_namespace }}"
+            name: test-foo
+          foobar: footest
       ignore_errors: true
-      register: crd_check
+      register: result
 
-    - when: crd_check is failed
+    - assert:
-      block:
+        that:
-        - name: Copy test chart
+          - result is failed
-          copy:
+          - "result.msg.startswith('Failed to find exact match for ansible.com/v1.Foo')"
-            src: "{{ test_chart }}"
-            dest: "/tmp/helm_test_crds/"
 
-        - name: Install chart while skipping CRDs
+    # Helm won't install CRDs into an existing release, so we need to delete this, first
-          helm:
+    - name: Uninstall chart
-            binary_path: "{{ helm_binary }}"
+      helm:
-            chart_ref: "/tmp/helm_test_crds/{{ test_chart }}"
+        binary_path: "{{ helm_binary }}"
+        namespace: "{{ helm_namespace }}"
+        name: test-crds
+        state: absent
+
+    - name: Install chart with CRDs
+      helm:
+        binary_path: "{{ helm_binary }}"
+        chart_ref: "/tmp/helm_test_crds/{{ test_chart }}"
+        namespace: "{{ helm_namespace }}"
+        name: test-crds
+
+    - name: Create custom resource
+      k8s:
+        definition:
+          apiVersion: ansible.com/v1
+          kind: Foo
+          metadata:
             namespace: "{{ helm_namespace }}"
-            name: test-crds
+            name: test-foo
-            skip_crds: true
+          foobar: footest
-          register: install
+      register: result
 
-        - assert:
+    - assert:
-            that:
+        that:
-              - install is changed
+          - result is changed
-              - install.status.name == "test-crds"
+          - result.result.foobar == "footest"
-
-        - name: Fail to create custom resource
-          k8s:
-            definition:
-              apiVersion: ansible.com/v1
-              kind: Foo
-              metadata:
-                namespace: "{{ helm_namespace }}"
-                name: test-foo
-              foobar: footest
-          ignore_errors: true
-          register: result
-
-        - assert:
-            that:
-              - result is failed
-              - "result.msg.startswith('Failed to find exact match for ansible.com/v1.Foo')"
-
-        # Helm won't install CRDs into an existing release, so we need to delete this, first
-        - name: Uninstall chart
-          helm:
-            binary_path: "{{ helm_binary }}"
-            namespace: "{{ helm_namespace }}"
-            name: test-crds
-            state: absent
-
-        - name: Install chart with CRDs
-          helm:
-            binary_path: "{{ helm_binary }}"
-            chart_ref: "/tmp/helm_test_crds/{{ test_chart }}"
-            namespace: "{{ helm_namespace }}"
-            name: test-crds
-
-        - name: Create custom resource
-          k8s:
-            definition:
-              apiVersion: ansible.com/v1
-              kind: Foo
-              metadata:
-                namespace: "{{ helm_namespace }}"
-                name: test-foo
-              foobar: footest
-          register: result
-
-        - assert:
-            that:
-              - result is changed
-              - result.result.foobar == "footest"
 
   always:
     - name: Remove chart

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

@@ -1,52 +0,0 @@
----
-- name: Test helm insecure
-  vars:
-    helm_namespace: "{{ test_namespace[12] }}"
-  block:
-
-    - name: Initial chart installation (no flag set)
-      helm:
-        binary_path: "{{ helm_binary }}"
-        chart_ref: "{{ chart_test_oci }}"
-        release_name: test-secure
-        release_namespace: "{{ helm_namespace }}"
-        create_namespace: true
-      register: install
-
-    - name: Validate that insecure flag is not set
-      assert:
-        that:
-          - install is changed
-          - '"--insecure-skip-tls-verify" not in install.command'
-
-    - name: Initial chart installation (insecure flag set)
-      helm:
-        binary_path: "{{ helm_binary }}"
-        chart_ref: "{{ chart_test_oci }}"
-        release_name: test-insecure
-        release_namespace: "{{ helm_namespace }}"
-        insecure_skip_tls_verify: true
-      register: install
-      ignore_errors: true
-
-    - name: Validate that insecure flag IS set if helm version is >= 3.16.0
-      assert:
-        that:
-          - install is changed
-          - '"--insecure-skip-tls-verify" in install.command'
-      when: '"v3.16.0" <= helm_version'
-
-    - name: Validate that feature fails for helm < 3.16.0
-      assert:
-        that:
-          - install is failed
-          - '"insecure_skip_tls_verify requires helm >= 3.16.0" in install.msg'
-      when: 'helm_version < "v3.16.0"'
-
-  always:
-    - name: Remove helm namespace
-      k8s:
-        api_version: v1
-        kind: Namespace
-        name: "{{ helm_namespace }}"
-        state: absent

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

@@ -13,11 +13,3 @@
     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

@@ -1,75 +0,0 @@
----
-- name: Test helm reset_then_reuse_values
-  vars:
-    helm_namespace: "{{ test_namespace[11] }}"
-    chart_release_values:
-      replica:
-        replicaCount: 3
-      master:
-        count: 1
-        kind: Deployment
-    chart_reset_then_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
-
-    - name: Get value set as string
-      helm_info:
-        binary_path: "{{ helm_binary }}"
-        release_name: test-redis
-        release_namespace: "{{ helm_namespace }}"
-      register: release_value
-
-    - name: Validate that chart values are as expected
-      assert:
-        that:
-          - install is changed
-          - '"--reset-then-reuse-values" not in install.command'
-          - release_value["status"]["values"] == chart_release_values
-
-    - name: Upgrade chart using reset_then_reuse_values=true
-      helm:
-        binary_path: "{{ helm_binary }}"
-        chart_ref: oci://registry-1.docker.io/bitnamicharts/redis
-        release_name: test-redis
-        release_namespace: "{{ helm_namespace }}"
-        reuse_values: false
-        reset_values: false
-        reset_then_reuse_values: true
-        release_values: "{{ chart_reset_then_reuse_values }}"
-      register: upgrade
-
-    - name: Get value set as string
-      helm_info:
-        binary_path: "{{ helm_binary }}"
-        release_name: test-redis
-        release_namespace: "{{ helm_namespace }}"
-      register: release_value
-
-    - name: Validate that chart values are as expected
-      assert:
-        that:
-          - upgrade is changed
-          - '"--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)
-
-  always:
-    - name: Remove helm namespace
-      k8s:
-        api_version: v1
-        kind: Namespace
-        name: "{{ helm_namespace }}"
-        state: absent

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

@@ -17,7 +17,8 @@
     - name: Initial chart installation
       helm:
         binary_path: "{{ helm_binary }}"
-        chart_ref: oci://registry-1.docker.io/bitnamicharts/redis
+        chart_ref: redis
+        chart_repo_url: https://charts.bitnami.com/bitnami
         release_name: test-redis
         release_namespace: "{{ helm_namespace }}"
         create_namespace: true
@@ -41,7 +42,8 @@
     - name: Upgrade chart using reuse_values=true
       helm:
         binary_path: "{{ helm_binary }}"
-        chart_ref: oci://registry-1.docker.io/bitnamicharts/redis
+        chart_ref: redis
+        chart_repo_url: https://charts.bitnami.com/bitnami
         release_name: test-redis
         release_namespace: "{{ helm_namespace }}"
         reuse_values: true

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

@@ -73,7 +73,7 @@
       assert:
         that:
           - install is changed
-          - install.status.chart == chart_test+"-"+chart_test_version
+          - install.status.chart == "{{ chart_test }}-{{ chart_test_version }}"
           - install.status.status | lower == 'deployed'
 
     - name: Check helm_info content
@@ -95,7 +95,7 @@
     - name: "Assert that {{ chart_test }} is installed from {{ source }} with helm_info"
       assert:
         that:
-          - content_info.status.chart == chart_test+"-"+chart_test_version
+          - content_info.status.chart == "{{ chart_test }}-{{ chart_test_version }}"
           - content_info.status.status | lower == 'deployed'
           - release_state_content_info.status.status | lower == 'deployed'
 
@@ -112,7 +112,7 @@
       assert:
         that:
           - install is not changed
-          - install.status.chart == chart_test+"-"+chart_test_version
+          - install.status.chart == "{{ chart_test }}-{{ chart_test_version }}"
           - install.status.status | lower == 'deployed'
 
     - name: "Add vars to {{ chart_test }} from {{ source }}"
@@ -130,7 +130,7 @@
         that:
           - install is changed
           - install.status.status | lower == 'deployed'
-          - install.status.chart == chart_test+"-"+chart_test_version
+          - install.status.chart == "{{ chart_test }}-{{ chart_test_version }}"
           - "install.status['values'].revisionHistoryLimit == 0"
 
     - name: Check idempotency after adding vars
@@ -148,7 +148,7 @@
         that:
           - install is not changed
           - install.status.status | lower == 'deployed'
-          - install.status.chart == chart_test+"-"+chart_test_version
+          - install.status.chart == "{{ chart_test }}-{{ chart_test_version }}"
           - "install.status['values'].revisionHistoryLimit == 0"
 
     - name: "Remove Vars to {{ chart_test }} from {{ source }}"
@@ -165,7 +165,7 @@
         that:
           - install is changed
           - install.status.status | lower == 'deployed'
-          - install.status.chart == chart_test+"-"+chart_test_version
+          - install.status.chart == "{{ chart_test }}-{{ chart_test_version }}"
           - install.status['values'] == {}
 
     - name: Check idempotency after removing vars
@@ -182,7 +182,7 @@
         that:
           - install is not changed
           - install.status.status | lower == 'deployed'
-          - install.status.chart == chart_test+"-"+chart_test_version
+          - install.status.chart == "{{ chart_test }}-{{ chart_test_version }}"
           - install.status['values'] == {}
 
     - name: "Upgrade {{ chart_test }} from {{ source }}"
@@ -199,7 +199,7 @@
         that:
           - install is changed
           - install.status.status | lower == 'deployed'
-          - install.status.chart == chart_test+"-"+chart_test_version_upgrade
+          - install.status.chart == "{{ chart_test }}-{{ chart_test_version_upgrade }}"
 
     - name: Check idempotency after upgrade
       helm:
@@ -215,7 +215,7 @@
         that:
           - install is not changed
           - install.status.status | lower == 'deployed'
-          - install.status.chart == chart_test+"-"+chart_test_version_upgrade
+          - install.status.chart == "{{ chart_test }}-{{ chart_test_version_upgrade }}"
 
     - name: "Remove {{ chart_test }} from {{ source }}"
       helm:
@@ -316,7 +316,7 @@
         that:
           - install is changed
           - install.status.status | lower == 'deployed'
-          - install.status.chart == chart_test+"-"+chart_test_version
+          - install.status.chart == "{{ chart_test }}-{{ chart_test_version }}"
           - "install.status['values'].revisionHistoryLimit == 0"
 
     - name: "Install {{ chart_test }} from {{ source }} with values_files (again)"
@@ -357,7 +357,7 @@
           - result is changed
           - result is not failed
           - result.rc == 0
-          - result.command is match(helm_binary+" template "+chart_source)
+          - result.command is match("{{ helm_binary }} template {{ chart_source }}")
 
     - name: Check templates created
       stat:
@@ -374,8 +374,8 @@
         chart_ref: "{{ chart_source }}"
         chart_version: "{{ chart_source_version | default(omit) }}"
         disable_hook: True
-        release_name: "myrelease"
+        release_name: "MyRelease"
-        release_namespace: "myreleasenamespace"
+        release_namespace: "MyReleaseNamespace"
         show_only:
           - "templates/configmap.yaml"
         release_values:
@@ -388,7 +388,7 @@
           - result is changed
           - result is not failed
           - result.rc == 0
-          - result.command is match(helm_binary+" template myrelease "+chart_source)
+          - result.command is match("{{ helm_binary }} template MyRelease {{ chart_source }}")
           - result.stdout is search("ThisValue")
       when: chart_source is search("test-chart")
       # limit assertion of test result to controlled (local) chart_source

tests/integration/targets/helm_diff/files/test-chart-deployment-time/Chart.yaml

@@ -1,6 +0,0 @@
-apiVersion: v2
-name: test-chart-deployment-time
-description: A chart with a config map containing the deployment time in data
-type: application
-version: 0.1.0
-appVersion: "default"

tests/integration/targets/helm_diff/files/test-chart-deployment-time/templates/configmap.yaml

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ default "ansible-configmap" .Values.myConfigmapName }}
-data:
-  myValue: {{ default "test" .Values.myValue }}
-  deploymentTime: {{ now }}

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

@@ -2,4 +2,3 @@
 dependencies:
   - remove_namespace
   - install_helm
-  - setup_helm_registry

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

@@ -2,6 +2,7 @@
 - name: Test helm diff functionality
   vars:
     test_chart_ref: "/tmp/test-chart"
+    redis_chart_version: '17.0.5'
 
   block:
 
@@ -10,7 +11,7 @@
         binary_path: "{{ helm_binary }}"
         state: present
         plugin_path: https://github.com/databus23/helm-diff
-        plugin_version: 3.9.13
+        plugin_version: 3.4.0
 
     - name: Copy test chart
       copy:
@@ -23,7 +24,7 @@
         name: test-chart
         namespace: "{{ helm_namespace }}"
         chart_ref: "{{ test_chart_ref }}"
-        create_namespace: true
+        create_namespace: yes
       register: install
 
     - assert:
@@ -48,8 +49,8 @@
         name: test-chart
         namespace: "{{ helm_namespace }}"
         chart_ref: "{{ test_chart_ref }}"
-      check_mode: true
+      check_mode: yes
-      diff: true
+      diff: yes
       register: diff_result
 
     - name: Check if helm diff check is correct
@@ -78,7 +79,7 @@
         namespace: "{{ helm_namespace }}"
         chart_ref: "{{ test_chart_ref }}"
       check_mode: yes
-      diff: true
+      diff: yes
       register: diff_result
 
     - name: Check if no diff in check mode when no change
@@ -100,7 +101,7 @@
 
     - name: Modify values
       blockinfile:
-        create: true
+        create: yes
         path: "{{ test_chart_ref }}/values.yml"
         block: |
           ---
@@ -205,76 +206,52 @@
           - install is not changed
 
     # Test helm diff with chart_repo_url
+    - name: Define Redis chart values
+      set_fact:
+        redis_chart_values:
+          commonLabels:
+            phase: testing
+            company: RedHat
+          image:
+            tag: 6.2.6-debian-10-r135
+          architecture: standalone
+
+    - name: Install Redis chart
+      helm:
+        binary_path: "{{ helm_binary }}"
+        chart_repo_url: https://charts.bitnami.com/bitnami
+        chart_ref: redis
+        namespace: "{{ helm_namespace }}"
+        name: redis-chart
+        chart_version: "{{ redis_chart_version }}"
+        release_values: "{{ redis_chart_values }}"
+
+    - name: Upgrade Redis chart
+      helm:
+        binary_path: "{{ helm_binary }}"
+        chart_repo_url: https://charts.bitnami.com/bitnami
+        chart_ref: redis
+        namespace: "{{ helm_namespace }}"
+        name: redis-chart
+        chart_version: "{{ redis_chart_version }}"
+        release_values: "{{ redis_chart_values }}"
+      check_mode: yes
+      register: redis_upgrade
+
+    - name: Assert that module raised a warning
+      assert:
+        that:
+          - not redis_upgrade.changed
+          - redis_upgrade.warnings is defined
+          - redis_upgrade.warnings | length == 1
+          - redis_upgrade.warnings[0] == "The default idempotency check can fail to report changes in certain cases. Install helm diff >= 3.4.1 for better results."
+
     - name: Uninstall helm diff
       helm_plugin:
         binary_path: "{{ helm_binary }}"
         state: absent
         plugin_name: diff
-      ignore_errors: true
+      ignore_errors: yes
-
-    - name: Define chart variables
-      set_fact:
-        test_chart_values:
-          myValue: 'Some ConfigMap data value'
-          myConfigmapName: 'ansible-config-from-url'
-        test_chart_version: 0.1.0
-        test_chart_ref_url: "oci://localhost:6035/testing/test-chart-deployment-time"
-
-    - name: Deploy chart to remote registry
-      block:
-        - name: Create local directory to copy chart in
-          ansible.builtin.tempfile:
-            suffix: .chart
-            state: directory
-          register: _tmpd
-
-        - name: Copy local registry
-          ansible.builtin.copy:
-            dest: "{{ _tmpd.path }}"
-            src: '{{ role_path }}/files/test-chart-deployment-time'
-
-        - name: Push chart to helm registry
-          ansible.builtin.include_role:
-            name: push_to_helm_registry
-          vars:
-            chart_local_path: '{{ _tmpd.path }}/test-chart-deployment-time'
-            chart_repo_path: 'testing'
-      always:
-        - name: Delete temporary directory
-          ansible.builtin.file:
-            state: absent
-            path: '{{ _tmpd.path }}'
-
-    - name: Log into Helm registry
-      ansible.builtin.command: "{{ helm_binary }} registry login -u testuser -p 'pass123!' localhost:6035"
-
-    - name: Install chart from remote URL
-      helm:
-        binary_path: "{{ helm_binary }}"
-        chart_ref: "{{ test_chart_ref_url }}"
-        chart_version: 0.1.0
-        namespace: "{{ helm_namespace }}"
-        name: another-chart
-        release_values: "{{ test_chart_values }}"
-
-    - name: Upgrade chart
-      helm:
-        binary_path: "{{ helm_binary }}"
-        chart_ref: "{{ test_chart_ref_url }}"
-        chart_version: 0.1.0
-        namespace: "{{ helm_namespace }}"
-        name: another-chart
-        release_values: "{{ test_chart_values }}"
-      check_mode: true
-      register: _upgrade
-
-    - name: Assert that module raised a warning
-      assert:
-        that:
-          - not _upgrade.changed
-          - _upgrade.warnings is defined
-          - _upgrade.warnings | length == 1
-          - _upgrade.warnings[0] == "The default idempotency check can fail to report changes in certain cases. Install helm diff >= 3.4.1 for better results."
 
     - name: Install helm diff (version=3.4.1)
       helm_plugin:
@@ -283,36 +260,37 @@
         plugin_path: https://github.com/databus23/helm-diff
         plugin_version: 3.4.1
 
-    - name: Upgrade chart once again
+    - name: Upgrade Redis chart once again
       helm:
         binary_path: "{{ helm_binary }}"
-        chart_ref: "{{ test_chart_ref_url }}"
+        chart_repo_url: https://charts.bitnami.com/bitnami
-        chart_version: 0.1.0
+        chart_ref: redis
         namespace: "{{ helm_namespace }}"
-        name: another-chart
+        name: redis-chart
-        release_values: "{{ test_chart_values }}"
+        chart_version: "{{ redis_chart_version }}"
-      check_mode: true
+        release_values: "{{ redis_chart_values }}"
-      register: _upgrade_2
+      check_mode: yes
+      register: redis_upgrade_2
 
     - name: Assert that module raised a warning
       assert:
         that:
-          - _upgrade_2.changed
+          - redis_upgrade_2.changed
-          - _upgrade_2.warnings is not defined
+          - redis_upgrade_2.warnings is not defined
 
   always:
     - name: Remove chart directory
       file:
         path: "{{ test_chart_ref }}"
         state: absent
-      ignore_errors: true
+      ignore_errors: yes
 
     - name: Uninstall helm diff
       helm_plugin:
         binary_path: "{{ helm_binary }}"
         state: absent
         plugin_name: diff
-      ignore_errors: true
+      ignore_errors: yes
 
     - name: Remove helm namespace
       k8s:
@@ -321,8 +299,6 @@
         name: "{{ helm_namespace }}"
         state: absent
         wait: true
-      ignore_errors: true
+      ignore_errors: yes
 
 - include_tasks: reuse_values.yml
-
-- include_tasks: reset_then_reuse_values.yml

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

@@ -1,189 +0,0 @@
----
-- name: Create temporary directory for helm chart
-  tempfile:
-    suffix: .helm
-    state: directory
-  register: helm_dir
-
-- name: Test helm diff functionality
-  vars:
-    test_chart_path: "{{ helm_dir.path }}/test-chart-reuse-values"
-    test_release_name: "myrelease"
-
-  block:
-    - name: Install helm diff
-      kubernetes.core.helm_plugin:
-        binary_path: "{{ helm_binary }}"
-        state: present
-        plugin_path: https://github.com/databus23/helm-diff
-        plugin_version: 3.9.14
-
-    - name: Copy test chart
-      ansible.builtin.copy:
-        src: "test-chart-reuse-values"
-        dest: "{{ helm_dir.path }}"
-
-    - name: Delete existing namespace
-      kubernetes.core.k8s:
-        state: absent
-        wait: true
-        kind: Namespace
-        name: "{{ helm_namespace }}"
-      ignore_errors: true
-
-    - name: Create helm release
-      kubernetes.core.helm:
-        state: present
-        binary_path: "{{ helm_binary }}"
-        chart_ref: "{{ test_chart_path }}"
-        release_name: "{{ test_release_name }}"
-        release_namespace: "{{ helm_namespace }}"
-        create_namespace: true
-        release_values:
-          ansible_version: devel
-          phase: ci
-        wait: true
-
-    - name: Upgrade helm release (reset_values=false and reuse_values=false and reset_then_reuse_values=true)
-      kubernetes.core.helm:
-        binary_path: "{{ helm_binary }}"
-        chart_ref: "{{ test_chart_path }}"
-        reset_values: false
-        reuse_values: false
-        reset_then_reuse_values: true
-        release_name: "{{ test_release_name }}"
-        release_namespace: "{{ helm_namespace }}"
-        values:
-          ansible_version: devel
-      register: helm_upgrade
-
-    - name: Ensure task did not reported change
-      assert:
-        that:
-          - helm_upgrade is not changed
-
-    - name: Upgrade helm release (reset_then_reuse_values=true with default value for reset_values and reuse_values=false)
-      kubernetes.core.helm:
-        binary_path: "{{ helm_binary }}"
-        chart_ref: "{{ test_chart_path }}"
-        reuse_values: false
-        reset_then_reuse_values: true
-        release_name: "{{ test_release_name }}"
-        release_namespace: "{{ helm_namespace }}"
-        values:
-          ansible_version: devel
-      register: helm_upgrade
-
-    - name: Ensure task reported change
-      assert:
-        that:
-          - helm_upgrade is changed
-
-    # Delete helm and helm diff to install older version
-    - name: Uninstall helm diff
-      helm_plugin:
-        binary_path: "{{ helm_binary }}"
-        state: absent
-        plugin_name: diff
-      ignore_errors: true
-
-    - name: Delete Helm folders
-      file:
-        path: /tmp/helm/
-        state: absent
-
-    - name: Init Helm folders
-      file:
-        path: /tmp/helm
-        state: directory
-
-    - name: Set Helm old version
-      set_fact:
-        helm_archive_name: "helm-v3.8.0-linux-amd64.tar.gz"
-        helm_diff_old_version: "3.8.0"
-
-    - name: Unarchive Helm binary
-      unarchive:
-        src: "https://get.helm.sh/{{ helm_archive_name | default(helm_default_archive_name) }}"
-        dest: /tmp/helm/
-        remote_src: yes
-      retries: 10
-      delay: 5
-      register: result
-      until: result is not failed
-
-    - name: Upgrade helm release (with reset_then_reuse_values=true)
-      kubernetes.core.helm:
-        binary_path: "{{ helm_binary }}"
-        chart_ref: "{{ test_chart_path }}"
-        reuse_values: false
-        reset_then_reuse_values: true
-        release_name: "{{ test_release_name }}"
-        release_namespace: "{{ helm_namespace }}"
-        values:
-          ansible_version: test
-      register: helm_upgrade
-      ignore_errors: true
-
-    - name: Debug
-      debug:
-        var: helm_upgrade
-
-    - name: Ensure warning for Helm version
-      assert:
-        that:
-          - helm_upgrade is failed
-          - '"reset_then_reuse_values requires helm >= 3.14.0, current version is" in helm_upgrade.msg'
-
-    - name: Install helm diff
-      helm_plugin:
-        binary_path: "{{ helm_binary }}"
-        state: present
-        plugin_path: https://github.com/databus23/helm-diff
-        plugin_version: "{{ helm_diff_old_version }}"
-
-    - name: Upgrade helm release (with reset_then_reuse_values=true)
-      kubernetes.core.helm:
-        binary_path: "{{ helm_binary }}"
-        chart_ref: "{{ test_chart_path }}"
-        reuse_values: false
-        reset_then_reuse_values: true
-        release_name: "{{ test_release_name }}"
-        release_namespace: "{{ helm_namespace }}"
-        values:
-          ansible_version: devel
-      register: helm_upgrade
-      ignore_errors: true
-
-    - name: Debug
-      debug:
-        var: helm_upgrade
-
-    - name: Ensure warning for Helm Diff version
-      assert:
-        that:
-          - helm_upgrade is failed
-          - '"reset_then_reuse_values requires helm diff >= 3.9.12, current version is" in helm_upgrade.msg'
-
-  always:
-    - name: Remove temporary directory
-      file:
-        path: "{{ helm_dir.path }}"
-        state: absent
-      ignore_errors: true
-
-    - name: Uninstall helm diff
-      kubernetes.core.helm_plugin:
-        binary_path: "{{ helm_binary }}"
-        state: absent
-        plugin_name: diff
-      ignore_errors: true
-
-    - name: Remove helm namespace
-      kubernetes.core.k8s:
-        api_version: v1
-        kind: Namespace
-        name: "{{ helm_namespace }}"
-        state: absent
-        wait: true
-      ignore_errors: true

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

@@ -90,5 +90,4 @@
         kind: Namespace
         name: "{{ helm_namespace }}"
         state: absent
-        wait: true
       ignore_errors: true

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

@@ -18,12 +18,7 @@
 - set_fact:
     saved_kubeconfig_path: "{{ _dir.path }}/config"
 
-- vars:
+- block:
-    helm_repo_name: autoscaler
-    helm_repo_url: "https://kubernetes.github.io/autoscaler"
-    helm_release_name: "autoscaler"
-    helm_chart_name: "cluster-autoscaler"
-  block:
     - name: Copy default kubeconfig
       copy:
         remote_src: true
@@ -64,14 +59,14 @@
           - plugin_info.plugin_list != []
 
     # helm_repository, helm, helm_info
-    - name: 'Add "{{ helm_repo_name }}" chart repository'
+    - name: Add test_bitnami chart repository
       helm_repository:
         binary_path: "{{ helm_binary }}"
-        name: "{{ helm_repo_name }}"
+        name: test_bitnami
         kubeconfig: "{{ test_kubeconfig | default(omit) }}"
         validate_certs: "{{ test_validate_certs | default(omit) }}"
         ca_cert: "{{ test_ca_cert | default(omit) }}"
-        repo_url: "{{ helm_repo_url }}"
+        repo_url: https://charts.bitnami.com/bitnami
       register: repository
 
     - name: Assert that repository was added
@@ -82,8 +77,8 @@
     - name: Install chart from repository added before
       helm:
         binary_path: "{{ helm_binary }}"
-        name: "{{ helm_release_name }}"
+        name: rabbitmq
-        chart_ref: "{{ helm_repo_name }}/{{ helm_chart_name }}"
+        chart_ref: test_bitnami/rabbitmq
         namespace: "{{ helm_namespace }}"
         update_repo_cache: true
         kubeconfig: "{{ test_kubeconfig | default(omit) }}"
@@ -103,7 +98,7 @@
         kubeconfig: "{{ test_kubeconfig | default(omit) }}"
         validate_certs: "{{ test_validate_certs | default(omit) }}"
         ca_cert: "{{ test_ca_cert | default(omit) }}"
-        name: "{{ helm_release_name }}"
+        name: "rabbitmq"
         namespace: "{{ helm_namespace }}"
       register: chart_info
 
@@ -117,7 +112,7 @@
     - name: Remove chart
       helm:
         binary_path: "{{ helm_binary }}"
-        name: "{{ helm_release_name }}"
+        name: rabbitmq
         namespace: "{{ helm_namespace }}"
         kubeconfig: "{{ test_kubeconfig | default(omit) }}"
         validate_certs: "{{ test_validate_certs | default(omit) }}"
@@ -136,7 +131,7 @@
         kubeconfig: "{{ test_kubeconfig | default(omit) }}"
         validate_certs: "{{ test_validate_certs | default(omit) }}"
         ca_cert: "{{ test_ca_cert | default(omit) }}"
-        name: "{{ helm_release_name }}"
+        name: "rabbitmq"
         namespace: "{{ helm_namespace }}"
       register: chart_info
 
@@ -148,7 +143,7 @@
     - name: Remove chart repository
       helm_repository:
         binary_path: "{{ helm_binary }}"
-        name: "{{ helm_repo_name }}"
+        name: test_bitnami
         kubeconfig: "{{ test_kubeconfig | default(omit) }}"
         validate_certs: "{{ test_validate_certs | default(omit) }}"
         ca_cert: "{{ test_ca_cert | default(omit) }}"
@@ -197,6 +192,6 @@
     - name: Delete helm repository
       helm_repository:
         binary_path: "{{ helm_binary }}"
-        name: "{{ helm_repo_name }}"
+        name: test_bitnami
         state: absent
       ignore_errors: true

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

@@ -180,7 +180,6 @@
               - '"--username ansible" in _result.command'
               - '"--password ***" in _result.command'
               - '"--keyring pubring.gpg" in _result.command'
-              - '"Module did not set no_log for pass_credentials" not in _result.stderr'
 
         - name: Download chart using chart_ref
           helm_pull:
@@ -204,8 +203,9 @@
         - name: Download chart using untar_chart
           helm_pull:
             binary_path: "{{ helm_path }}"
-            chart_ref: "oci://registry-1.docker.io/bitnamicharts/redis"
+            chart_ref: redis
             destination: "{{ destination }}"
+            repo_url: "https://charts.bitnami.com/bitnami"
             untar_chart: true
           register: _result
 

tests/integration/targets/helm_registry_auth/aliases

@@ -1,2 +0,0 @@
-time=16
-helm_registry_auth

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

@@ -1,9 +0,0 @@
----
-# Username and password for the registry
-# ../files/registry.password contains username and hashed password
-username: testuser
-password: testpassword
-wrong_password: 'WrongPassword'
-registry_name: oci_registry
-registry_port: 5000
-test_chart: https://github.com/grafana/helm-charts/releases/download/k8s-monitoring-1.6.8/k8s-monitoring-1.6.8.tgz

tests/integration/targets/helm_registry_auth/files/registry.password

@@ -1 +0,0 @@
-testuser:$2y$05$PmdUjSCJYdRUZlsYy8QGWuJDiwuHtWXa28YrELlN5haeHkZ1seZZG

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

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

tests/integration/targets/helm_registry_auth/playbook.yaml

@@ -1,7 +0,0 @@
----
-- name: Test helm_registry_auth module
-  hosts: localhost
-  connection: local
-  gather_facts: true
-  roles:
-  - helm_registry_auth

tests/integration/targets/helm_registry_auth/runme.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -eux
-export ANSIBLE_CALLBACKS_ENABLED=profile_tasks
-export ANSIBLE_ROLES_PATH=../
-ansible-playbook playbook.yaml "$@"

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

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

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

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

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

@@ -16,7 +16,6 @@
   assert:
     that:
       - repository is changed
-      - '"--insecure-skip-tls-verify" not in repository.command'
 
 - name: Check idempotency
   helm_repository:
@@ -79,23 +78,3 @@
   assert:
     that:
       - repository is not changed
-
-- name: Add test_helm_repo chart repository as insecure
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    repo_url: "{{ chart_test_repo }}"
-    insecure_skip_tls_verify: true
-  register: repository
-
-- name: Assert that repository added and flag set
-  assert:
-    that:
-      - repository is changed
-      - '"--insecure-skip-tls-verify" in repository.command'
-
-- name: Clean test_helm_repo chart repository
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    state: absent

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

@@ -1,7 +1,8 @@
 - name: Install helm using set_values parameters
   helm:
     binary_path: "{{ helm_binary }}"
-    chart_ref: oci://registry-1.docker.io/bitnamicharts/mariadb
+    chart_ref: mariadb
+    chart_repo_url: https://charts.bitnami.com/bitnami
     release_name: test-mariadb
     release_namespace: "{{ helm_namespace }}"
     create_namespace: true
@@ -35,7 +36,8 @@
 - name: Install helm using set_values parameters
   helm:
     binary_path: "{{ helm_binary }}"
-    chart_ref: oci://registry-1.docker.io/bitnamicharts/apache
+    chart_ref: apache
+    chart_repo_url: https://charts.bitnami.com/bitnami
     release_name: test-apache
     release_namespace: "{{ helm_namespace }}"
     create_namespace: true
@@ -77,7 +79,8 @@
   - name: Install helm using set_values parameters
     helm:
       binary_path: "{{ helm_binary }}"
-      chart_ref: oci://registry-1.docker.io/bitnamicharts/minio
+      chart_ref: minio
+      chart_repo_url: https://charts.bitnami.com/bitnami
       release_name: test-minio
       release_namespace: "{{ helm_namespace }}"
       create_namespace: true
@@ -104,11 +107,3 @@
     file:
       state: absent
       path: "{{ ymlfile.path }}"
-    ignore_errors: true
-
-  - name: Delete namespace
-    k8s:
-      state: absent
-      kind: namespace
-      name: "{{ helm_namespace }}"
-    ignore_errors: true

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

@@ -1,4 +1,4 @@
 ---
-helm_version: v3.16.4
+helm_version: v3.7.0
 helm_install_path: /tmp/helm
 helm_default_archive_name: "helm-{{ helm_version }}-{{ ansible_system | lower }}-amd64.tar.gz"

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

@@ -26,8 +26,7 @@
       assert:
         that:
           - k8s_configmap is changed
-          - '"annotations" in k8s_configmap.result.metadata'
+          - k8s_configmap.result.metadata.annotations|default(False)
-          - k8s_configmap.result.metadata.annotations != {}
 
     - name: Add same configmap again
       k8s:
@@ -468,7 +467,7 @@
       assert:
         that:
           - k8s_secret is changed
-          - k8s_secret.result.data.foo != ""
+          - k8s_secret.result.data.foo
 
     - name: Add same secret
       k8s:
@@ -749,7 +748,7 @@
       assert:
         that:
           - _create is changed
-          - _info.resources | length == 0
+          - not _info.resources
 
     # server side apply over kubernetes client releases
     - name: Create temporary directory

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

@@ -38,7 +38,7 @@
     - name: Assert that there are pods
       assert:
         that:
-          - pods_create.resources | length > 0
+          - pods_create.resources
 
     - name: Remove the daemonset
       k8s:
@@ -74,7 +74,7 @@
     - name: Assert that deleting the daemonset deleted the pods
       assert:
         that:
-          - pods_delete.resources | length == 0
+          - not pods_delete.resources
 
     # test deletion using label selector
     - name: Deploy load balancer
@@ -152,27 +152,6 @@
       register: _deployment
       failed_when: _deployment.resources | length == 0
 
-    - name: Trying to delete nginx deployment in check mode and with deleteOptions set
-      k8s:
-        kind: Deployment
-        api_version: apps/v1
-        namespace: "{{ test_namespace }}"
-        name: nginx-d
-        state: absent
-        delete_options:
-          propagationPolicy: Foreground
-      check_mode: true
-      register: _delete
-
-    - name: Validate that Deployment nginx-d still exists
-      k8s_info:
-        kind: Deployment
-        api_version: apps/v1
-        namespace: "{{ test_namespace }}"
-        name: nginx-d
-      register: _deployment
-      failed_when: _deployment.resources | length != 1
-
     - name: Trying to delete using delete_all=true but missing kind option
       k8s:
         api_version: apps/v1

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

@@ -182,7 +182,7 @@
   - name: assert that pods are running on cordoned node
     assert:
       that:
-      - Pod.resources | selectattr('status.phase', 'equalto', 'Running') | selectattr('spec.nodeName', 'equalto', node_to_drain) | list | length > 0
+      - "{{ Pod.resources | selectattr('status.phase', 'equalto', 'Running') | selectattr('spec.nodeName', 'equalto', node_to_drain) | list | length > 0 }}"
 
   - name: Uncordon node
     k8s_drain:
@@ -236,7 +236,7 @@
     assert:
       that:
       - drain_result is changed
-      - '"node "+node_to_drain+" marked unschedulable." in drain_result.result'
+      - '"node {{ node_to_drain }} marked unschedulable." in drain_result.result'
 
   - name: assert that unmanaged pod were deleted
     k8s_info:
@@ -244,7 +244,7 @@
       kind: Pod
       name: '{{ drain_pod_name }}'
     register: _result
-    failed_when: _result.resources | length > 0
+    failed_when: _result.resources
 
   - name: assert that emptyDir pod was deleted
     k8s_info:
@@ -338,7 +338,7 @@
     assert:
       that:
       - disable_evict is changed
-      - '"node "+node_to_drain+" marked unschedulable." in disable_evict.result'
+      - '"node {{ node_to_drain }} marked unschedulable." in disable_evict.result'
 
   - name: assert that unmanaged pod were deleted
     k8s_info:
@@ -346,7 +346,7 @@
       kind: Pod
       name: '{{ drain_pod_name }}-01'
     register: _result
-    failed_when: _result.resources | length > 0
+    failed_when: _result.resources
 
   # test: drain using pod_selectors
   - name: Uncordon node
@@ -401,7 +401,7 @@
     assert:
       that:
       - drain_pod_selector is changed
-      - '"node "+node_to_drain+" marked unschedulable." in drain_pod_selector.result'
+      - '"node {{ node_to_drain }} marked unschedulable." in drain_pod_selector.result'
 
   - name: assert that pod created before is still running
     k8s_info:
@@ -429,8 +429,8 @@
     assert:
       that:
       - drain_pod_selector_equal is changed
-      - '"node "+node_to_drain+" already marked unschedulable." in drain_pod_selector_equal.result'
+      - '"node {{ node_to_drain }} already marked unschedulable." in drain_pod_selector_equal.result'
-      - '"Deleting Pods not managed by ReplicationController, ReplicaSet, Job, DaemonSet or StatefulSet: "+test_namespace+"/ansible-drain-pod." in drain_pod_selector_equal.warnings'
+      - '"Deleting Pods not managed by ReplicationController, ReplicaSet, Job, DaemonSet or StatefulSet: {{ test_namespace }}/ansible-drain-pod." in drain_pod_selector_equal.warnings'
 
   - name: Uncordon node
     k8s_drain:

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

@@ -394,11 +394,9 @@
       register: k8s_info_testing6
       failed_when: not k8s_info_testing6.resources or k8s_info_testing6.resources[0].status.phase != "Active"
 
-    - name: Create a file with specific size and attributes, to be used as swap space
+    - name: Create large configmap data
-      community.general.filesize:
+      command: dd if=/dev/urandom bs=500K count=1
-        path: /tmp/configmap.bin
+      register: cmap_data
-        size: 500K
-        source: /dev/urandom
 
     - name: Create configmap with large value
       k8s:
@@ -409,7 +407,7 @@
             name: testmap
             namespace: testing
           data:
-            testkey: "{{ lookup('file', '/tmp/configmap.bin') | b64encode }}"
+            testkey: "{{ cmap_data.stdout | b64encode }}"
         wait: true
       register: result
 
@@ -426,7 +424,7 @@
 
     - assert:
         that:
-          - result.resources[0].data.testkey == (lookup('file', '/tmp/configmap.bin') | b64encode)
+          - result.resources[0].data.testkey == "{{ cmap_data.stdout | b64encode }}"
 
     # test setting module defaults for kubernetes.core.k8s_info
     - block:

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

@@ -36,7 +36,7 @@
         label_selectors:
           - "job=gc"
       register: wait_job
-      until: wait_job.resources | length > 0
+      until: wait_job.resources
       retries: 5
       delay: 10
 
@@ -87,7 +87,7 @@
         label_selectors:
           - "job=gc"
       register: wait_job
-      until: wait_job.resources | length > 0
+      until: wait_job.resources
       retries: 5
       delay: 10
 
@@ -139,7 +139,7 @@
         label_selectors:
           - "job=gc"
       register: wait_job
-      until: wait_job.resources | length > 0
+      until: wait_job.resources
       retries: 5
       delay: 10
 
@@ -225,7 +225,7 @@
 
     - name: Assert job is deleted
       assert:
-        that: job.resources | length == 0
+        that: not job.resources
 
   always:
     - name: Delete namespace

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

@@ -69,7 +69,7 @@
   - name: assert pod has been created
     assert:
       that:
-      - pods.resources | length == 1
+      - "{{ pods.resources | length == 1 }}"
 
   - name: create pod using generate_name parameter should succeed
     k8s:
@@ -86,7 +86,7 @@
   - name: assert pod has been created
     assert:
       that:
-      - pods.resources | length == 2
+      - "{{ pods.resources | length == 2 }}"
 
   - name: create pod using metadata.generateName parameter should succeed
     k8s:
@@ -102,7 +102,7 @@
   - name: assert pod has been created
     assert:
       that:
-      - pods.resources | length == 3
+      - "{{ pods.resources | length == 3 }}"
 
   - name: create object using metadata.generateName should support wait option
     k8s:

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

@@ -77,7 +77,6 @@
         definition: "{{ hide_fields_base_configmap | combine({'data':{'anew':'value'}}) }}"
         hidden_fields:
           - data
-          - metadata.annotations[kubectl.kubernetes.io/last-applied-configuration]
         apply: true
       register: hf6
       diff: true
@@ -87,22 +86,6 @@
         that:
           - hf6.changed
 
-    - name: Ensure hidden fields are not present
-      assert:
-        that:
-          - >-
-            'annotations' not in hf6.result.metadata or
-            'kubectl.kubernetes.io/last-applied-configuration'
-            not in hf6.result.metadata.annotations
-          - >-
-            'annotations' not in hf6.diff.before.metadata or
-            'kubectl.kubernetes.io/last-applied-configuration'
-            not in hf6.diff.before.metadata.annotations
-          - >-
-            'annotations' not in hf6.diff.after.metadata or
-            'kubectl.kubernetes.io/last-applied-configuration'
-            not in hf6.diff.after.metadata.annotations
-
     - name: Hidden field should not show up in deletion
       k8s:
         definition: "{{ hide_fields_base_configmap}}"

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

@@ -47,7 +47,7 @@
           - result.changed
           - result.result.metadata.labels.label2 == "bar"
           - result.result.spec.containers[0].image == "busybox:glibc"
-          - result.diff != {}
+          - result.diff
 
     - name: Describe pod
       kubernetes.core.k8s_info:

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

@@ -11,7 +11,7 @@
       assert:
         that:
           - fake_pod is failed
-          - fake_pod.msg == "Pod "+test_namespace+"/this_pod_does_exist not found."
+          - 'fake_pod.msg == "Pod {{ test_namespace }}/this_pod_does_exist not found."'
 
     - name: create hello-world deployment
       k8s:

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

@@ -23,7 +23,7 @@
         - name: Update directory permissions
           file:
             path: "{{ manifests_dir.path }}"
-            mode: '0755'
+            mode: 0755
 
         - name: Create manifests files
           copy:

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

@@ -129,7 +129,7 @@
         that:
           - scale_down is changed
           - '"duration" in scale_down'
-          - scale_down.diff != {}
+          - scale_down.diff
 
     - name: Scale the deployment once again (idempotency)
       k8s_scale:
@@ -274,7 +274,7 @@
       assert:
         that:
           - scale_down_no_wait is changed
-          - scale_down_no_wait.diff != {}
+          - scale_down_no_wait.diff
           - scale_down_no_wait_pods.resources | length == 1
 
     # scale multiple resource using label selectors

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

@@ -65,7 +65,7 @@
     assert:
       that:
       - _result.result.status.phase == 'Running'
-      - _result.result.spec.nodeName == node_to_taint
+      - _result.result.spec.nodeName == "{{ node_to_taint }}"
 
   - name: Taint node (check_mode)
     kubernetes.core.k8s_taint:
@@ -89,8 +89,8 @@
     assert:
       that:
       - _result.changed
-      - item['effect'] == taint_patch_1[0]['effect']
+      - "{{ item['effect'] == taint_patch_1[0]['effect'] }}"
-      - item['key'] == taint_patch_1[0]['key']
+      - "{{ item['key'] == taint_patch_1[0]['key'] }}"
     loop: "{{ _result.result.spec.taints }}"
 
   - name: Taint node (idempotency) - (check_mode)
@@ -421,7 +421,7 @@
   - name: Assert that taints have been removed
     assert:
       that:
-      - _result.resources | selectattr('spec.taints', 'undefined') | list | length > 0
+      - _result.resources | selectattr('spec.taints', 'undefined')
 
   always:
 

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

@@ -7,7 +7,7 @@
       kubernetes.core.k8s_service:
         template: "pod_one.j2"
         state: present
-      ignore_errors: true
+      ignore_errors: yes
       register: r
 
     - name: Check for expected failures in last tasks
@@ -35,7 +35,7 @@
         k8s_pod_name_one: pod
         k8s_pod_namespace: "{{ template_namespace }}"
       register: r
-      ignore_errors: true
+      ignore_errors: yes
 
     - name: Check if definition and template are mutually exclusive
       assert:
@@ -52,7 +52,7 @@
         k8s_pod_name_one: pod
         k8s_pod_namespace: "{{ template_namespace }}"
       register: r
-      ignore_errors: true
+      ignore_errors: yes
 
     - name: Check if src and template are mutually exclusive
       assert:
@@ -63,7 +63,7 @@
     - name: Create pod using template (direct specification)
       kubernetes.core.k8s:
         template: "pod_one.j2"
-        wait: true
+        wait: yes
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
       vars:
         k8s_pod_name_one: pod-1
@@ -79,7 +79,7 @@
       kubernetes.core.k8s:
         template:
           - default
-        wait: true
+        wait: yes
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
       vars:
         k8s_pod_name_one: pod-2
@@ -96,7 +96,7 @@
       kubernetes.core.k8s:
         template:
           path: "pod_one.j2"
-        wait: true
+        wait: yes
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
       vars:
         k8s_pod_name_one: pod-3
@@ -114,11 +114,12 @@
           path: "pod_two.j2"
           variable_start_string: '[['
           variable_end_string: ']]'
-        wait: true
+        wait: yes
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
       vars:
         k8s_pod_name_two: pod-4
-        k8s_pod_namespace: "template-test"
+        k8s_pod_namespace: "[[ template_namespace ]]"
+        ansible_python_interpreter: "[[ ansible_playbook_python ]]"
       register: r
 
     - name: Assert that pod creation succeeded using template
@@ -130,7 +131,7 @@
       kubernetes.core.k8s:
         template:
           path: "pod_three.j2"
-        wait: true
+        wait: yes
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
       vars:
         k8s_pod_name_three_one: pod-5
@@ -151,7 +152,7 @@
             variable_start_string: '[['
             variable_end_string: ']]'
           - path: "pod_three.j2"
-        wait: true
+        wait: yes
         wait_timeout: "{{ k8s_wait_timeout | default(omit) }}"
       vars:
         k8s_pod_name_one: pod-7
@@ -212,8 +213,8 @@
     - name: check that resources creation failed
       assert:
         that:
-          - resource.results.0.resources | length == 0
+          - '{{ resource.results[0].resources | length == 0 }}'
-          - resource.results.1.resources | length == 0
+          - '{{ resource.results[1].resources | length == 0 }}'
 
     - name: create pod without namespace (continue_on_error = true)
       kubernetes.core.k8s:
@@ -238,6 +239,63 @@
           - resource.result.results | selectattr('changed') | list | length == 1
           - resource.result.results | selectattr('error', 'defined') | list | length == 1
 
+    # Test resource definition using template with 'omit'
+    - name: Deploy configmap using template
+      k8s:
+        namespace: "{{ template_namespace }}"
+        name: test-data
+        template: configmap.yml.j2
+
+    - name: Read configmap created
+      k8s_info:
+        kind: configmap
+        namespace: "{{ template_namespace }}"
+        name: test-data
+      register: _configmap
+
+    - name: Validate that the configmap does not contains annotations
+      assert:
+        that:
+          - '"annotations" not in _configmap.resources.0.metadata'
+
+    - name: Create resource once again
+      k8s:
+        namespace: "{{ template_namespace }}"
+        name: test-data
+        template: configmap.yml.j2
+      register: _configmap
+
+    - name: assert that nothing changed
+      assert:
+        that:
+          - _configmap is not changed
+
+    - name: Create resource once again (using description)
+      k8s:
+        namespace: "{{ template_namespace }}"
+        name: test-data
+        template: configmap.yml.j2
+      register: _configmap
+      vars:
+        k8s_configmap_desc: "This is a simple configmap used to test ansible k8s collection"
+
+    - name: assert that configmap was changed
+      assert:
+        that:
+          - _configmap is changed
+
+    - name: Read configmap created
+      k8s_info:
+        kind: configmap
+        namespace: "{{ template_namespace }}"
+        name: test-data
+      register: _configmap
+
+    - name: Validate that the configmap does not contains annotations
+      assert:
+        that:
+          - _configmap.resources.0.metadata.annotations.description == "This is a simple configmap used to test ansible k8s collection"
+
   always:
     - name: Remove namespace (Cleanup)
       kubernetes.core.k8s:

tests/integration/targets/k8s_template/templates/configmap.yml.j2

@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+    annotations:
+        description: "{{ k8s_configmap_desc | default(omit) }}"
+data:
+    key: "testing-template"

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

@@ -5,7 +5,6 @@ k8s_pod_metadata:
 
 k8s_pod_spec:
   serviceAccount: "{{ k8s_pod_service_account }}"
-  nodeSelector: "{{ k8s_pod_node_selector }}"
   containers:
     - image: "{{ k8s_pod_image }}"
       imagePullPolicy: Always
@@ -34,8 +33,6 @@ k8s_pod_ports: []
 
 k8s_pod_env: []
 
-k8s_pod_node_selector: {}
-
 k8s_pod_template:
   metadata: "{{ k8s_pod_metadata }}"
   spec: "{{ k8s_pod_spec }}"

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

@@ -127,48 +127,6 @@
           - ds.result.status.currentNumberScheduled == ds.result.status.desiredNumberScheduled
           - updated_ds_pods.resources[0].spec.containers[0].image.endswith(":3")
 
-    - name: Create daemonset with nodeSelector and not existing label
-      k8s:
-        definition:
-          apiVersion: apps/v1
-          kind: DaemonSet
-          metadata:
-            name: wait-daemonset-not-existing-label
-            namespace: "{{ wait_namespace }}"
-          spec:
-            selector:
-              matchLabels:
-                app: "{{ k8s_pod_name }}"
-            template: "{{ k8s_pod_template }}"
-        wait: yes
-        wait_sleep: 5
-        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_command:
-          - sleep
-          - "600"
-        k8s_pod_node_selector:
-          nonExisitingLabel: test-not-exiting-label
-      register: ds_not_existing_label
-
-    - name: Get updated pods
-      k8s_info:
-        api_version: v1
-        kind: Pod
-        namespace: "{{ wait_namespace }}"
-        label_selectors:
-          - app=wait-daemonset-not-existing-label
-      register: updated_ds_pods_not_existing_label
-
-    - name: Check that daemonset wait worked (when desired number is 0)
-      assert:
-        that:
-          - ds_not_existing_label.result.status.currentNumberScheduled == ds_not_existing_label.result.status.desiredNumberScheduled
-          - ds_not_existing_label.result.status.desiredNumberScheduled == 0
-          - updated_ds_pods_not_existing_label.resources | length == 0
-
     - name: Add a statefulset
       k8s:
         definition:

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

@@ -56,8 +56,8 @@
           # Without wantlist=True lookup should return mapping
           - test5 is mapping
           - test6 is mapping
-          # errors='ignore' (return null with ansible-core 2.19)
+          # errors='ignore'
-          - test7 is string or not test7
+          - test7 is string
           - test8 is not defined
 
     - name: Create another namespace with label
@@ -130,9 +130,9 @@
       assert:
         that:
           - result_configmap.apiVersion == 'v1'
-          - result_configmap.metadata.name == configmap_name
+          - result_configmap.metadata.name == "{{ configmap_name }}"
-          - result_configmap.metadata.namespace == test_namespace[2]
+          - result_configmap.metadata.namespace == "{{ test_namespace[2] }}"
-          - result_configmap.data.value == configmap_data
+          - result_configmap.data.value == "{{ configmap_data }}"
 
     # test lookup plugin using src parameter
     - block:
@@ -159,9 +159,9 @@
           assert:
             that:
               - src_configmap.apiVersion == 'v1'
-              - src_configmap.metadata.name == configmap_name
+              - src_configmap.metadata.name == "{{ configmap_name }}"
-              - src_configmap.metadata.namespace == test_namespace[2]
+              - src_configmap.metadata.namespace == "{{ test_namespace[2] }}"
-              - src_configmap.data.value == configmap_data
+              - src_configmap.data.value == "{{ configmap_data }}"
 
       always:
         - name: Delete temporary file created
@@ -198,9 +198,9 @@
           assert:
             that:
               - configmap_no_ssl.apiVersion == 'v1'
-              - configmap_no_ssl.metadata.name == configmap_name
+              - configmap_no_ssl.metadata.name == "{{ configmap_name }}"
-              - configmap_no_ssl.metadata.namespace == test_namespace[2]
+              - configmap_no_ssl.metadata.namespace == "{{ test_namespace[2] }}"
-              - configmap_no_ssl.data.value == configmap_data
+              - configmap_no_ssl.data.value == "{{ configmap_data }}"
 
         - name: Retrieve configmap using authentication aliases (validate_certs=true)
           set_fact:
@@ -210,9 +210,9 @@
           assert:
             that:
               - configmap_with_ssl.apiVersion == 'v1'
-              - configmap_with_ssl.metadata.name == configmap_name
+              - configmap_with_ssl.metadata.name == "{{ configmap_name }}"
-              - configmap_with_ssl.metadata.namespace == test_namespace[2]
+              - configmap_with_ssl.metadata.namespace == "{{ test_namespace[2] }}"
-              - configmap_with_ssl.data.value == configmap_data
+              - configmap_with_ssl.data.value == "{{ configmap_data }}"
 
       always:
         - name: Delete temporary directory

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

@@ -45,7 +45,7 @@
     - name: make script as executable
       file:
         path: "{{ tmp_dir_path }}/install_kustomize.sh"
-        mode: '0755'
+        mode: 0755
 
     - name: Install kustomize
       command: "{{ tmp_dir_path }}/install_kustomize.sh"

tests/integration/targets/push_to_helm_registry/aliases

@@ -1 +0,0 @@
-disabled

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

@@ -1,5 +0,0 @@
----
-helm_binary_path: "helm"
-chart_repo_url: 'localhost:6035'
-chart_repo_username: testuser
-chart_repo_password: 'pass123!'

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

@@ -1,38 +0,0 @@
----
-- name: Ensure we can log into the helm registry
-  command: >-
-    {{ helm_binary_path }} registry login
-    -u {{ chart_repo_username }}
-    -p {{ chart_repo_password }}
-    {{ chart_repo_url }}
-
-- name: Package chart and push to helm registry
-  block:
-    - name: Create temporary directory to store chart
-      ansible.builtin.tempfile:
-        state: directory
-        suffix: .chart
-      register: _tmpfile
-
-    - name: Package helm chart
-      command: '{{ helm_binary_path }} package {{ chart_local_path }} --destination {{ _tmpfile.path }}'
-
-    - name: Locate helm chart package
-      ansible.builtin.find:
-        paths: "{{ _tmpfile.path }}"
-        patterns: '*.tgz'
-      register: _files
-
-    - name: Helm push chart to the registry
-      command: '{{ helm_binary_path }} push {{ _files.files.0.path }} oci://{{ chart_repo_url }}/{{ chart_repo_path }}'
-
-  always:
-    - name: Logout from registry
-      command: '{{ helm_binary_path }} registry logout {{ chart_repo_url }}'
-      ignore_errors: true
-
-    - name: Delete temporary directory
-      ansible.builtin.file:
-        state: absent
-        path: '{{ _tmpfile.path }}'
-      ignore_errors: true

tests/integration/targets/setup_helm_registry/aliases

@@ -1 +0,0 @@
-disabled

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

@@ -1,5 +0,0 @@
----
-# user: testuser, password: pass123!
-registry_credentials: testuser:$2y$05$d8tw6L1hojRFW.FjHOAnIOihJWAvFb0/Pu/30hLbQNJIYzCmlyBCi
-registry_name: helm_registry
-registry_port: 6035

tests/integration/targets/setup_helm_registry/handlers/main.yml

@@ -1,3 +0,0 @@
----
-- name: Teardown registry
-  include_tasks: teardown_registry.yml

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

@@ -1,32 +0,0 @@
----
-- name: Ensure we can talk to docker daemon
-  ansible.builtin.shell:
-    cmd: docker ps
-
-- name: Create temporary directory to store file in
-  tempfile:
-    state: directory
-    suffix: .helm_registry
-  register: _tmpfile
-  # notify:
-  #   - Teardown registry
-
-- name: Create authentication file
-  copy:
-    content: "{{ registry_credentials }}"
-    dest: "{{ _tmpfile.path }}/htpasswd"
-
-- name: Remove existing registry
-  ansible.builtin.include_tasks: remove_docker_container.yml
-
-- name: Create registry container
-  command: >-
-    docker run -d
-    -p {{ registry_port }}:5000
-    --restart=always
-    --name "{{ registry_name }}"
-    -v "{{ _tmpfile.path }}:/auth"
-    -e "REGISTRY_AUTH=htpasswd"
-    -e "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm"
-    -e REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd
-    registry:2

tests/integration/targets/setup_helm_registry/tasks/remove_docker_container.yml

@@ -1,15 +0,0 @@
----
-- name: Inspect docker container
-  command: docker container inspect {{ registry_name }} -f '{{ '{{' }} .State.Running {{ '}}' }}'
-  register: _inspect
-  ignore_errors: true
-
-- name: Remove container
-  when: _inspect.rc == 0
-  block:
-    - name: Stop running container
-      command: docker container stop {{ registry_name }}
-      when: _inspect.stdout == "true"
-
-    - name: Remove container
-      command: docker container rm {{ registry_name }}

tests/integration/targets/setup_helm_registry/tasks/teardown_registry.yml

@@ -1,9 +0,0 @@
----
-- name: Remove Docker container
-  ansible.builtin.include_tasks: remove_docker_container.yml
-
-- name: Delete temporary directory
-  file:
-    state: absent
-    path: '{{ _tmpfile.path }}'
-  ignore_errors: true