Release 3.3.1 (#890)

Release 3.3.1

Update galaxy.yml
Update changelog/changelog.yaml and CHANGELOG.rst

Reviewed-by: Yuriy Novostavskiy
Reviewed-by: Mike Graves <mgraves@redhat.com>
Reviewed-by: Alina Buzachis

.ansible-lint-ignore

@@ -0,0 +1,7 @@
+# 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]
+# stable-3 branch support ansible-core>=2.14.0
+meta/runtime.yml meta-runtime[unsupported-version]

.config/ansible-lint-ignore.txt

@@ -1,2 +0,0 @@
-# no-changed-when is not requried for examples
-plugins/connection/kubectl.py no-changed-when

.gitignore

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

.yamllint

@@ -5,16 +5,24 @@ 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

CHANGELOG.rst

@@ -4,93 +4,27 @@ Kubernetes Collection Release Notes
 
 .. contents:: Topics
 
-v5.1.0
-======
-
-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).
-- connection/kubectl.py - Added an example of using the kubectl connection plugin to the documentation (https://github.com/ansible-collections/kubernetes.core/pull/741).
-- 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
+v3.3.1
 ======
 
 Release Summary
 ---------------
 
-This major release drops support for ``ansible-core<2.15``.
-
-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).
-
-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).
+This release fixes the CI issues with the ``linters`` workflow.
 
 v3.3.0
 ======
+
 Minor Changes
 -------------
+
 - 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).
 - 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).
@@ -104,13 +38,14 @@ v3.2.0
 
 Release Summary
 ---------------
+
 This release comes with documentation updates.
 
 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).
 - 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).
 
 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.1.0
+VERSION = 3.3.1
 
 TEST_ARGS ?= ""
 PYTHON_VERSION ?= `python -c 'import platform; print(".".join(platform.python_version_tuple()[0:2]))'`

README.md

@@ -1,29 +1,19 @@
 # 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`).
@@ -47,28 +37,28 @@ This collection supports Kubernetes versions >= 1.24.
 Click on the name of a plugin or module to view that content's documentation:
 
 <!--start collection content-->
-### Connection plugins
+#### Connection plugins
 Name | Description
 --- | ---
 [kubernetes.core.kubectl](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.kubectl_connection.rst)|Execute tasks in pods running on Kubernetes.
 
-### K8s filter plugins
+#### K8s filter plugins
 Name | Description
 --- | ---
 kubernetes.core.k8s_config_resource_name|Generate resource name for the given resource of type ConfigMap, Secret
 
-### 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
 [kubernetes.core.kustomize](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.kustomize_lookup.rst)|Build a set of kubernetes resources using a 'kustomization.yaml' file.
 
-### Modules
+#### Modules
 Name | Description
 --- | ---
 [kubernetes.core.helm](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.helm_module.rst)|Manages Kubernetes packages with the Helm package manager
@@ -76,7 +66,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
@@ -106,7 +95,7 @@ You can also include it in a `requirements.yml` file and install it via `ansible
 ---
 collections:
   - name: kubernetes.core
-    version: 5.1.0
+    version: 3.3.1
 ```
 
 ### Installing the Kubernetes Python Library
@@ -267,6 +256,10 @@ If you encounter issues or have questions, you can submit a support request thro
 
 See the [raw generated changelog](https://github.com/ansible-collections/kubernetes.core/blob/main/CHANGELOG.rst).
 
+## More Information
+
+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.
+
 ## 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.

changelogs/changelog.yaml

@@ -859,15 +859,15 @@ releases:
       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).
-      - inventory/k8s.py - Defer removal of k8s inventory plugin to version 5.0 (https://github.com/ansible-collections/kubernetes.core/pull/723).
       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
-    - inventory-update_removal_date.yml
     - 3.2.0.yml
+    - inventory-update_removal_date.yml
     release_date: '2024-06-14'
   3.3.0:
     changes:
@@ -898,104 +898,10 @@ releases:
     - 796-false-positive-helmull.yaml
     - 798-drain-pdb-error-message.yaml
     - readme_template_update.yml
-    release_date: '2025-01-20'
-  4.0.0:
+    release_date: '2025-01-22'
+  3.3.1:
     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).
+      release_summary: This release fixes the CI issues with the ``linters`` workflow.
     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:
-      - 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).
-      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'
+    - release_summary.yml
+    release_date: '2025-03-26'

docs/kubernetes.core.helm_registry_auth_module.rst

@@ -1,332 +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>
-                </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_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_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>
@@ -513,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><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>mutually exclusive with <code>apply</code></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.1.0
+version: 3.3.1
 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/inventory/k8s.py

@@ -125,19 +125,19 @@ import json
 
 from ansible.errors import AnsibleError
 from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable, Constructable
-
-try:
-    from kubernetes.dynamic.exceptions import DynamicApiError
-
-    HAS_K8S_MODULE_HELPER = True
-    k8s_import_exception = None
-except ImportError as e:
-    HAS_K8S_MODULE_HELPER = False
-    k8s_import_exception = e
+from ansible_collections.kubernetes.core.plugins.module_utils.common import (
+    HAS_K8S_MODULE_HELPER,
+    k8s_import_exception,
+)
 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/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/helm.py

@@ -159,13 +159,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(
-            command, environ_update=self.env_update, data=data
-        )
+        rc, out, err = self.run_command(command, environ_update=self.env_update)
         if fails_on_error and rc != 0:
             self.fail_json(
                 msg="Failure when executing Helm command. Exited {0}.\nstdout: {1}\nstderr: {2}".format(

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,8 +2,6 @@
 # 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 re import compile
 from typing import Any, Dict, List, Optional, Tuple
 
 from ansible.module_utils.common.dict_transformations import dict_merge
@@ -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), []
-
-        try:
-            return decode_response(
-                self.client.create(
-                    resource, definition, namespace=namespace, serialize=False
+            k8s_obj = _encode_stringdata(definition)
+        else:
+            try:
+                k8s_obj = self.client.create(
+                    resource, definition, namespace=namespace
+                ).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
+                    )
                 )
-            )
-        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 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
+                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
+        return k8s_obj
 
     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, []
-
-        try:
-            params = {}
-            if server_side_apply:
-                params["server_side"] = True
-                params.update(server_side_apply)
-            return decode_response(
-                self.client.apply(
-                    resource, definition, namespace=namespace, serialize=False, **params
-                )
-            )
-        except Exception as e:
-            reason = e.body if hasattr(e, "body") else e
-            msg = "Failed to apply object: {0}".format(reason)
-            raise CoreException(msg) from e
+                k8s_obj = patch
+        else:
+            try:
+                params = {}
+                if server_side_apply:
+                    params["server_side"] = True
+                    params.update(server_side_apply)
+                k8s_obj = self.client.apply(
+                    resource, definition, namespace=namespace, **params
+                ).to_dict()
+            except Exception as e:
+                reason = e.body if hasattr(e, "body") else e
+                msg = "Failed to apply object: {0}".format(reason)
+                raise CoreException(msg) from e
+        return k8s_obj
 
     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), []
-
-        try:
-            return decode_response(
-                self.client.replace(
+            k8s_obj = _encode_stringdata(definition)
+        else:
+            try:
+                k8s_obj = self.client.replace(
                     resource,
                     definition,
                     name=name,
                     namespace=namespace,
                     append_hash=append_hash,
-                    serialize=False,
-                )
-            )
-        except Exception as e:
-            reason = e.body if hasattr(e, "body") else e
-            msg = "Failed to replace object: {0}".format(reason)
-            raise CoreException(msg) from e
+                ).to_dict()
+            except Exception as e:
+                reason = e.body if hasattr(e, "body") else e
+                msg = "Failed to replace object: {0}".format(reason)
+                raise CoreException(msg) from e
+        return k8s_obj
 
     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)), []
-
-        exception = None
-        for merge_type in self.module.params.get("merge_type") or [
-            "strategic-merge",
-            "merge",
-        ]:
-            try:
-                return self.patch_resource(
-                    resource,
-                    definition,
-                    name,
-                    namespace,
-                    merge_type=merge_type,
-                )
-            except CoreException as e:
-                exception = e
-                continue
-        raise exception
+            k8s_obj = dict_merge(existing.to_dict(), _encode_stringdata(definition))
+        else:
+            exception = None
+            for merge_type in self.module.params.get("merge_type") or [
+                "strategic-merge",
+                "merge",
+            ]:
+                try:
+                    k8s_obj = self.patch_resource(
+                        resource,
+                        definition,
+                        name,
+                        namespace,
+                        merge_type=merge_type,
+                    )
+                    exception = None
+                except CoreException as e:
+                    exception = e
+                    continue
+                break
+            if exception:
+                raise exception
+        return k8s_obj
 
     def delete(
         self,
@@ -540,83 +543,3 @@ def hide_field(definition: dict, hidden_field: str) -> dict:
         else:
             del definition[split[0]]
     return definition
-
-
-def decode_response(resp) -> Tuple[Dict, List[str]]:
-    """
-    This function decodes unserialized responses from the Kubernetes python
-    client and decodes the RFC2616 14.46 warnings found in the response
-    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

plugins/modules/helm_registry_auth.py

@@ -1,238 +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).
-    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,
-)
-
-
-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,
-            )
-
-    module.exit_json(changed=changed, stdout=out, stderr=err, command=helm_cmd)
-
-
-if __name__ == "__main__":
-    main()

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).
-    - I(merge_type=json) has been removed in version 4.0.0. Please use M(kubernetes.core.k8s_json_patch) instead.
+    - mutually exclusive with C(apply)
+    - 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:
@@ -459,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

@@ -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:

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,

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:

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,178 +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 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"
-          - "'authorization failed' 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 Unauthorized' in _helm_registry_auth_wrong.stderr"
-          - "'{{ 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/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:
@@ -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:
@@ -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'
-      - '"Deleting Pods not managed by ReplicationController, ReplicaSet, Job, DaemonSet or StatefulSet: "+test_namespace+"/ansible-drain-pod." in drain_pod_selector_equal.warnings'
+      - '"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'
 
   - name: Uncordon node
     k8s_drain:

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

@@ -424,7 +424,7 @@
 
     - assert:
         that:
-          - result.resources[0].data.testkey == (cmap_data.stdout | b64encode)
+          - result.resources[0].data.testkey == "{{ cmap_data.stdout | b64encode }}"
 
     # test setting module defaults for kubernetes.core.k8s_info
     - block:

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_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_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['key'] == taint_patch_1[0]['key']
+      - "{{ item['effect'] == taint_patch_1[0]['effect'] }}"
+      - "{{ item['key'] == taint_patch_1[0]['key'] }}"
     loop: "{{ _result.result.spec.taints }}"
 
   - name: Taint node (idempotency) - (check_mode)

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

@@ -213,8 +213,8 @@
     - name: check that resources creation failed
       assert:
         that:
-          - resource.results.0.resources | length == 0
-          - resource.results.1.resources | length == 0
+          - '{{ resource.results[0].resources | length == 0 }}'
+          - '{{ resource.results[1].resources | length == 0 }}'
 
     - name: create pod without namespace (continue_on_error = true)
       kubernetes.core.k8s:

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

@@ -130,9 +130,9 @@
       assert:
         that:
           - result_configmap.apiVersion == 'v1'
-          - result_configmap.metadata.name == configmap_name
-          - result_configmap.metadata.namespace == test_namespace[2]
-          - result_configmap.data.value == configmap_data
+          - result_configmap.metadata.name == "{{ configmap_name }}"
+          - result_configmap.metadata.namespace == "{{ test_namespace[2] }}"
+          - 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.namespace == test_namespace[2]
-              - src_configmap.data.value == configmap_data
+              - src_configmap.metadata.name == "{{ configmap_name }}"
+              - src_configmap.metadata.namespace == "{{ test_namespace[2] }}"
+              - 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.namespace == test_namespace[2]
-              - configmap_no_ssl.data.value == configmap_data
+              - configmap_no_ssl.metadata.name == "{{ configmap_name }}"
+              - configmap_no_ssl.metadata.namespace == "{{ test_namespace[2] }}"
+              - 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.namespace == test_namespace[2]
-              - configmap_with_ssl.data.value == configmap_data
+              - configmap_with_ssl.metadata.name == "{{ configmap_name }}"
+              - configmap_with_ssl.metadata.namespace == "{{ test_namespace[2] }}"
+              - 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/sanity/ignore-2.14.txt

@@ -1,9 +1,18 @@
+plugins/module_utils/client/discovery.py import-3.6!skip
+plugins/module_utils/client/discovery.py import-3.7!skip
+plugins/module_utils/client/discovery.py import-3.8!skip
 plugins/module_utils/client/discovery.py import-3.9!skip
 plugins/module_utils/client/discovery.py import-3.10!skip
 plugins/module_utils/client/discovery.py import-3.11!skip
+plugins/module_utils/client/resource.py import-3.6!skip
+plugins/module_utils/client/resource.py import-3.7!skip
+plugins/module_utils/client/resource.py import-3.8!skip
 plugins/module_utils/client/resource.py import-3.9!skip
 plugins/module_utils/client/resource.py import-3.10!skip
 plugins/module_utils/client/resource.py import-3.11!skip
+plugins/module_utils/k8sdynamicclient.py import-3.6!skip
+plugins/module_utils/k8sdynamicclient.py import-3.7!skip
+plugins/module_utils/k8sdynamicclient.py import-3.8!skip
 plugins/module_utils/k8sdynamicclient.py import-3.9!skip
 plugins/module_utils/k8sdynamicclient.py import-3.10!skip
 plugins/module_utils/k8sdynamicclient.py import-3.11!skip
@@ -25,6 +34,4 @@ plugins/modules/k8s_service.py validate-modules:return-syntax-error
 plugins/modules/k8s_taint.py validate-modules:return-syntax-error
 tests/integration/targets/k8s_delete/files/deployments.yaml yamllint!skip
 tests/integration/targets/helm_diff/files/test-chart-reuse-values/templates/configmap.yaml yamllint!skip
-tests/integration/targets/helm_registry_auth/tasks/main.yaml yamllint!skip
 tests/integration/targets/helm_diff/files/test-chart-deployment-time/templates/configmap.yaml yamllint!skip
-

tests/sanity/ignore-2.15.txt

@@ -1,9 +1,18 @@
+plugins/module_utils/client/discovery.py import-3.6!skip
+plugins/module_utils/client/discovery.py import-3.7!skip
+plugins/module_utils/client/discovery.py import-3.8!skip
 plugins/module_utils/client/discovery.py import-3.9!skip
 plugins/module_utils/client/discovery.py import-3.10!skip
 plugins/module_utils/client/discovery.py import-3.11!skip
+plugins/module_utils/client/resource.py import-3.6!skip
+plugins/module_utils/client/resource.py import-3.7!skip
+plugins/module_utils/client/resource.py import-3.8!skip
 plugins/module_utils/client/resource.py import-3.9!skip
 plugins/module_utils/client/resource.py import-3.10!skip
 plugins/module_utils/client/resource.py import-3.11!skip
+plugins/module_utils/k8sdynamicclient.py import-3.6!skip
+plugins/module_utils/k8sdynamicclient.py import-3.7!skip
+plugins/module_utils/k8sdynamicclient.py import-3.8!skip
 plugins/module_utils/k8sdynamicclient.py import-3.9!skip
 plugins/module_utils/k8sdynamicclient.py import-3.10!skip
 plugins/module_utils/k8sdynamicclient.py import-3.11!skip
@@ -26,5 +35,4 @@ plugins/modules/k8s_scale.py validate-modules:return-syntax-error
 plugins/modules/k8s_service.py validate-modules:return-syntax-error
 plugins/modules/k8s_taint.py validate-modules:return-syntax-error
 tests/integration/targets/helm_diff/files/test-chart-reuse-values/templates/configmap.yaml yamllint!skip
-tests/integration/targets/helm_registry_auth/tasks/main.yaml yamllint!skip
 tests/integration/targets/helm_diff/files/test-chart-deployment-time/templates/configmap.yaml yamllint!skip

tests/sanity/ignore-2.16.txt

@@ -1,11 +1,20 @@
+plugins/module_utils/client/discovery.py import-3.6!skip
+plugins/module_utils/client/discovery.py import-3.7!skip
+plugins/module_utils/client/discovery.py import-3.8!skip
 plugins/module_utils/client/discovery.py import-3.9!skip
 plugins/module_utils/client/discovery.py import-3.10!skip
 plugins/module_utils/client/discovery.py import-3.11!skip
 plugins/module_utils/client/discovery.py import-3.12!skip
+plugins/module_utils/client/resource.py import-3.6!skip
+plugins/module_utils/client/resource.py import-3.7!skip
+plugins/module_utils/client/resource.py import-3.8!skip
 plugins/module_utils/client/resource.py import-3.9!skip
 plugins/module_utils/client/resource.py import-3.10!skip
 plugins/module_utils/client/resource.py import-3.11!skip
 plugins/module_utils/client/resource.py import-3.12!skip
+plugins/module_utils/k8sdynamicclient.py import-3.6!skip
+plugins/module_utils/k8sdynamicclient.py import-3.7!skip
+plugins/module_utils/k8sdynamicclient.py import-3.8!skip
 plugins/module_utils/k8sdynamicclient.py import-3.9!skip
 plugins/module_utils/k8sdynamicclient.py import-3.10!skip
 plugins/module_utils/k8sdynamicclient.py import-3.11!skip
@@ -29,5 +38,4 @@ plugins/modules/k8s_scale.py validate-modules:return-syntax-error
 plugins/modules/k8s_service.py validate-modules:return-syntax-error
 plugins/modules/k8s_taint.py validate-modules:return-syntax-error
 tests/integration/targets/helm_diff/files/test-chart-reuse-values/templates/configmap.yaml yamllint!skip
-tests/integration/targets/helm_registry_auth/tasks/main.yaml yamllint!skip
 tests/integration/targets/helm_diff/files/test-chart-deployment-time/templates/configmap.yaml yamllint!skip

tests/sanity/ignore-2.17.txt

@@ -29,5 +29,4 @@ plugins/modules/k8s_scale.py validate-modules:return-syntax-error
 plugins/modules/k8s_service.py validate-modules:return-syntax-error
 plugins/modules/k8s_taint.py validate-modules:return-syntax-error
 tests/integration/targets/helm_diff/files/test-chart-reuse-values/templates/configmap.yaml yamllint!skip
-tests/integration/targets/helm_registry_auth/tasks/main.yaml yamllint!skip
 tests/integration/targets/helm_diff/files/test-chart-deployment-time/templates/configmap.yaml yamllint!skip

tests/sanity/ignore-2.18.txt

@@ -26,5 +26,4 @@ plugins/modules/k8s_scale.py validate-modules:return-syntax-error
 plugins/modules/k8s_service.py validate-modules:return-syntax-error
 plugins/modules/k8s_taint.py validate-modules:return-syntax-error
 tests/integration/targets/helm_diff/files/test-chart-reuse-values/templates/configmap.yaml yamllint!skip
-tests/integration/targets/helm_registry_auth/tasks/main.yaml yamllint!skip
 tests/integration/targets/helm_diff/files/test-chart-deployment-time/templates/configmap.yaml yamllint!skip

tests/sanity/ignore-2.19.txt

@@ -26,5 +26,4 @@ plugins/modules/k8s_scale.py validate-modules:return-syntax-error
 plugins/modules/k8s_service.py validate-modules:return-syntax-error
 plugins/modules/k8s_taint.py validate-modules:return-syntax-error
 tests/integration/targets/helm_diff/files/test-chart-reuse-values/templates/configmap.yaml yamllint!skip
-tests/integration/targets/helm_registry_auth/tasks/main.yaml yamllint!skip
 tests/integration/targets/helm_diff/files/test-chart-deployment-time/templates/configmap.yaml yamllint!skip

tests/unit/module_utils/test_helm.py

@@ -242,7 +242,7 @@ def test_module_run_helm_command(_ansible_helm_module):
     assert (rc, out, err) == (0, output, error)
 
     _ansible_helm_module.run_command.assert_called_once_with(
-        command, environ_update=env_update, data=None
+        command, environ_update=env_update
     )
 
 

tests/unit/module_utils/test_runner.py

@@ -31,7 +31,7 @@ modified_def["metadata"]["labels"]["environment"] = "testing"
 
 
 @pytest.mark.parametrize(
-    "action, params, existing, instance_warnings, expected",
+    "action, params, existing, instance, expected",
     [
         (
             "delete",
@@ -51,26 +51,14 @@ modified_def["metadata"]["labels"]["environment"] = "testing"
             "apply",
             {"apply": "yes"},
             {},
-            (definition, []),
+            definition,
             {"changed": True, "method": "apply", "result": definition},
         ),
-        (
-            "apply",
-            {"apply": "yes"},
-            {},
-            (definition, ["test warning"]),
-            {
-                "changed": True,
-                "method": "apply",
-                "result": definition,
-                "warnings": ["test warning"],
-            },
-        ),
         (
             "create",
             {"state": "patched"},
             {},
-            ({}, []),
+            {},
             {
                 "changed": False,
                 "result": {},
@@ -83,78 +71,42 @@ modified_def["metadata"]["labels"]["environment"] = "testing"
             "create",
             {},
             {},
-            (definition, []),
+            definition,
             {"changed": True, "method": "create", "result": definition},
         ),
-        (
-            "create",
-            {},
-            {},
-            (definition, ["test warning"]),
-            {
-                "changed": True,
-                "method": "create",
-                "result": definition,
-                "warnings": ["test warning"],
-            },
-        ),
         (
             "replace",
             {"force": "yes"},
             definition,
-            (definition, []),
+            definition,
             {"changed": False, "method": "replace", "result": definition},
         ),
         (
             "replace",
             {"force": "yes"},
             definition,
-            (modified_def, []),
+            modified_def,
             {"changed": True, "method": "replace", "result": modified_def},
         ),
-        (
-            "replace",
-            {"force": "yes"},
-            definition,
-            (modified_def, ["test warning"]),
-            {
-                "changed": True,
-                "method": "replace",
-                "result": modified_def,
-                "warnings": ["test warning"],
-            },
-        ),
         (
             "update",
             {},
             definition,
-            (definition, []),
+            definition,
             {"changed": False, "method": "update", "result": definition},
         ),
         (
             "update",
             {},
             definition,
-            (modified_def, []),
+            modified_def,
             {"changed": True, "method": "update", "result": modified_def},
         ),
-        (
-            "update",
-            {},
-            definition,
-            (modified_def, ["test warning"]),
-            {
-                "changed": True,
-                "method": "update",
-                "result": modified_def,
-                "warnings": ["test warning"],
-            },
-        ),
         (
             "create",
             {"label_selectors": ["app=foo"]},
             {},
-            (definition, []),
+            definition,
             {
                 "changed": False,
                 "msg": "resource 'kind=Pod,name=foo,namespace=foo' filtered by label_selectors.",
@@ -164,18 +116,18 @@ modified_def["metadata"]["labels"]["environment"] = "testing"
             "create",
             {"label_selectors": ["app=nginx"]},
             {},
-            (definition, []),
+            definition,
             {"changed": True, "method": "create", "result": definition},
         ),
     ],
 )
-def test_perform_action(action, params, existing, instance_warnings, expected):
+def test_perform_action(action, params, existing, instance, expected):
     svc = Mock()
     svc.find_resource.return_value = Mock(
         kind=definition["kind"], group_version=definition["apiVersion"]
     )
     svc.retrieve.return_value = ResourceInstance(None, existing) if existing else None
-    spec = {action + ".return_value": instance_warnings}
+    spec = {action + ".return_value": instance}
     svc.configure_mock(**spec)
 
     result = perform_action(svc, definition, params)

tests/unit/module_utils/test_service.py

@@ -1,11 +1,9 @@
-from json import dumps
 from unittest.mock import Mock
 
 import pytest
 from ansible_collections.kubernetes.core.plugins.module_utils.k8s.service import (
     K8sService,
     diff_objects,
-    parse_quoted_string,
 )
 from kubernetes.dynamic.exceptions import NotFoundError
 from kubernetes.dynamic.resource import Resource, ResourceInstance
@@ -59,22 +57,6 @@ def mock_pod_updated_resource_instance():
     return ResourceInstance(None, pod_definition_updated)
 
 
-@pytest.fixture(scope="module")
-def mock_pod_response():
-    resp = Mock()
-    resp.data.decode.return_value = dumps(pod_definition)
-    resp.headers = {}
-    return resp
-
-
-@pytest.fixture(scope="module")
-def mock_pod_warnings_response():
-    resp = Mock()
-    resp.data.decode.return_value = dumps(pod_definition)
-    resp.headers = {"warning": '299 - "test warning 1", 299 - "test warning 2"'}
-    return resp
-
-
 def test_diff_objects_no_diff():
     match, diff = diff_objects(pod_definition, pod_definition)
 
@@ -177,33 +159,16 @@ def test_service_delete_existing_resource_check_mode(mock_pod_resource_instance)
     client.delete.assert_not_called()
 
 
-def test_service_create_resource(mock_pod_response, mock_pod_resource_instance):
-    spec = {"create.side_effect": [mock_pod_response]}
+def test_service_create_resource(mock_pod_resource_instance):
+    spec = {"create.side_effect": [mock_pod_resource_instance]}
     client = Mock(**spec)
     module = Mock()
     module.params = {}
     module.check_mode = False
     svc = K8sService(client, module)
-    result, warnings = svc.create(Mock(), pod_definition)
+    result = svc.create(Mock(), pod_definition)
 
     assert result == mock_pod_resource_instance.to_dict()
-    assert not warnings
-
-
-def test_service_create_resource_warnings(
-    mock_pod_warnings_response, mock_pod_resource_instance
-):
-    spec = {"create.side_effect": [mock_pod_warnings_response]}
-    client = Mock(**spec)
-    module = Mock()
-    module.params = {}
-    module.check_mode = False
-    svc = K8sService(client, module)
-    result, warnings = svc.create(Mock(), pod_definition)
-
-    assert result == mock_pod_resource_instance.to_dict()
-    assert warnings[0] == "test warning 1"
-    assert warnings[1] == "test warning 2"
 
 
 def test_service_create_resource_check_mode():
@@ -211,10 +176,9 @@ def test_service_create_resource_check_mode():
     client.create.return_value = mock_pod_resource_instance
     module = Mock(params={}, check_mode=True)
     svc = K8sService(client, module)
-    result, warnings = svc.create(Mock(), pod_definition)
+    result = svc.create(Mock(), pod_definition)
 
     assert result == pod_definition
-    assert not warnings
     client.create.assert_not_called()
 
 
@@ -260,99 +224,40 @@ def test_create_project_request():
     assert results["result"] == project_definition
 
 
-def test_service_apply_existing_resource(mock_pod_response, mock_pod_resource_instance):
-    spec = {"apply.side_effect": [mock_pod_response]}
+def test_service_apply_existing_resource(mock_pod_resource_instance):
+    spec = {"apply.side_effect": [mock_pod_resource_instance]}
     client = Mock(**spec)
     module = Mock()
     module.params = {"apply": True}
     module.check_mode = False
     svc = K8sService(client, module)
-    result, warnings = svc.apply(
-        Mock(), pod_definition_updated, mock_pod_resource_instance
-    )
+    result = svc.apply(Mock(), pod_definition_updated, mock_pod_resource_instance)
 
     assert result == mock_pod_resource_instance.to_dict()
-    assert not warnings
 
 
-def test_service_apply_existing_resource_warnings(
-    mock_pod_warnings_response, mock_pod_resource_instance
-):
-    spec = {"apply.side_effect": [mock_pod_warnings_response]}
-    client = Mock(**spec)
-    module = Mock()
-    module.params = {"apply": True}
-    module.check_mode = False
-    svc = K8sService(client, module)
-    result, warnings = svc.apply(
-        Mock(), pod_definition_updated, mock_pod_resource_instance
-    )
-
-    assert result == mock_pod_resource_instance.to_dict()
-    assert warnings[0] == "test warning 1"
-    assert warnings[1] == "test warning 2"
-
-
-def test_service_replace_existing_resource(
-    mock_pod_response, mock_pod_resource_instance
-):
-    spec = {"replace.side_effect": [mock_pod_response]}
+def test_service_replace_existing_resource(mock_pod_resource_instance):
+    spec = {"replace.side_effect": [mock_pod_resource_instance]}
     client = Mock(**spec)
     module = Mock()
     module.params = {}
     module.check_mode = False
     svc = K8sService(client, module)
-    result, warnings = svc.replace(Mock(), pod_definition, mock_pod_resource_instance)
+    result = svc.replace(Mock(), pod_definition, mock_pod_resource_instance)
 
     assert result == mock_pod_resource_instance.to_dict()
-    assert not warnings
 
 
-def test_service_replace_existing_resource_warnings(
-    mock_pod_warnings_response, mock_pod_resource_instance
-):
-    spec = {"replace.side_effect": [mock_pod_warnings_response]}
+def test_service_update_existing_resource(mock_pod_resource_instance):
+    spec = {"replace.side_effect": [mock_pod_resource_instance]}
     client = Mock(**spec)
     module = Mock()
     module.params = {}
     module.check_mode = False
     svc = K8sService(client, module)
-    result, warnings = svc.replace(Mock(), pod_definition, mock_pod_resource_instance)
+    result = svc.replace(Mock(), pod_definition, mock_pod_resource_instance)
 
     assert result == mock_pod_resource_instance.to_dict()
-    assert warnings[0] == "test warning 1"
-    assert warnings[1] == "test warning 2"
-
-
-def test_service_update_existing_resource(
-    mock_pod_response, mock_pod_resource_instance
-):
-    spec = {"replace.side_effect": [mock_pod_response]}
-    client = Mock(**spec)
-    module = Mock()
-    module.params = {}
-    module.check_mode = False
-    svc = K8sService(client, module)
-    result, warnings = svc.replace(Mock(), pod_definition, mock_pod_resource_instance)
-
-    assert result == mock_pod_resource_instance.to_dict()
-    assert not warnings
-
-
-def test_service_update_existing_resource_warnings(
-    mock_pod_warnings_response, mock_pod_resource_instance
-):
-    spec = {"replace.side_effect": [mock_pod_warnings_response]}
-    client = Mock(**spec)
-    module = Mock()
-    module.params = {}
-    module.check_mode = False
-    svc = K8sService(client, module)
-    result, warnings = svc.replace(Mock(), pod_definition, mock_pod_resource_instance)
-
-    assert result == mock_pod_resource_instance.to_dict()
-    assert warnings[0] == "test warning 1"
-    assert warnings[1] == "test warning 2"
 
 
 def test_service_find(mock_pod_resource_instance):
@@ -383,24 +288,3 @@ def test_service_find_error():
     assert isinstance(results, dict)
     assert results["api_found"] is True
     assert results["resources"] == []
-
-
-@pytest.mark.parametrize(
-    "quoted_string,expected_val,expected_remainder",
-    [
-        (
-            '"Response is stale" Tue, 15 Nov 1994 12:45:26 GMT',
-            "Response is stale",
-            "Tue, 15 Nov 1994 12:45:26 GMT",
-        ),
-        (
-            '"unknown field \\"spec.template.spec.disk\\""',
-            'unknown field "spec.template.spec.disk"',
-            "",
-        ),
-    ],
-)
-def test_parse_quoted_string(quoted_string, expected_val, expected_remainder):
-    val, remainder = parse_quoted_string(quoted_string)
-    assert val == expected_val
-    assert remainder == expected_remainder

tests/unit/modules/test_helm_template_module.py

@@ -51,7 +51,7 @@ class TestDependencyUpdateWithoutChartRepoUrlOption(unittest.TestCase):
             with self.assertRaises(AnsibleExitJson) as result:
                 helm_template.main()
         mock_run_command.assert_called_once_with(
-            "/usr/bin/helm template /tmp/path", environ_update={}, data=None
+            "/usr/bin/helm template /tmp/path", environ_update={}
         )
         assert result.exception.args[0]["command"] == "/usr/bin/helm template /tmp/path"
 
@@ -74,7 +74,6 @@ class TestDependencyUpdateWithoutChartRepoUrlOption(unittest.TestCase):
         mock_run_command.assert_called_once_with(
             "/usr/bin/helm template test --repo=https://charts.com/test",
             environ_update={},
-            data=None,
         )
         assert (
             result.exception.args[0]["command"]
@@ -96,7 +95,6 @@ class TestDependencyUpdateWithoutChartRepoUrlOption(unittest.TestCase):
         mock_run_command.assert_called_once_with(
             "/usr/bin/helm template https://charts/example.tgz --dependency-update",
             environ_update={},
-            data=None,
         )
         assert (
             result.exception.args[0]["command"]

tests/unit/modules/test_module_helm.py

@@ -88,7 +88,6 @@ class TestDependencyUpdateWithoutChartRepoUrlOption(unittest.TestCase):
         mock_run_command.assert_called_once_with(
             "/usr/bin/helm upgrade -i --reset-values test '/tmp/path'",
             environ_update={"HELM_NAMESPACE": "test"},
-            data=None,
         )
         assert (
             result.exception.args[0]["command"]
@@ -119,7 +118,6 @@ class TestDependencyUpdateWithoutChartRepoUrlOption(unittest.TestCase):
         mock_run_command.assert_called_once_with(
             "/usr/bin/helm upgrade -i --reset-values test '/tmp/path'",
             environ_update={"HELM_NAMESPACE": "test"},
-            data=None,
         )
         assert (
             result.exception.args[0]["command"]
@@ -149,7 +147,6 @@ class TestDependencyUpdateWithoutChartRepoUrlOption(unittest.TestCase):
                 call(
                     "/usr/bin/helm upgrade -i --reset-values test '/tmp/path'",
                     environ_update={"HELM_NAMESPACE": "test"},
-                    data=None,
                 )
             ]
         )
@@ -184,7 +181,6 @@ class TestDependencyUpdateWithoutChartRepoUrlOption(unittest.TestCase):
                 call(
                     "/usr/bin/helm upgrade -i --reset-values test '/tmp/path'",
                     environ_update={"HELM_NAMESPACE": "test"},
-                    data=None,
                 )
             ]
         )
@@ -255,7 +251,6 @@ class TestDependencyUpdateWithChartRepoUrlOption(unittest.TestCase):
         mock_run_command.assert_called_once_with(
             "/usr/bin/helm --repo=http://repo.example/charts upgrade -i --reset-values test 'chart1'",
             environ_update={"HELM_NAMESPACE": "test"},
-            data=None,
         )
         assert (
             result.exception.args[0]["command"]
@@ -285,7 +280,6 @@ class TestDependencyUpdateWithChartRepoUrlOption(unittest.TestCase):
         mock_run_command.assert_called_once_with(
             "/usr/bin/helm --repo=http://repo.example/charts upgrade -i --reset-values test 'chart1'",
             environ_update={"HELM_NAMESPACE": "test"},
-            data=None,
         )
         assert (
             result.exception.args[0]["command"]
@@ -344,7 +338,6 @@ class TestDependencyUpdateWithChartRepoUrlOption(unittest.TestCase):
         mock_run_command.assert_called_once_with(
             "/usr/bin/helm --repo=http://repo.example/charts install --dependency-update --replace test 'chart1'",
             environ_update={"HELM_NAMESPACE": "test"},
-            data=None,
         )
         assert (
             result.exception.args[0]["command"]
@@ -412,7 +405,6 @@ class TestDependencyUpdateWithChartRefIsUrl(unittest.TestCase):
         mock_run_command.assert_called_once_with(
             "/usr/bin/helm upgrade -i --reset-values test 'http://repo.example/charts/application.tgz'",
             environ_update={"HELM_NAMESPACE": "test"},
-            data=None,
         )
         assert (
             result.exception.args[0]["command"]
@@ -441,7 +433,6 @@ class TestDependencyUpdateWithChartRefIsUrl(unittest.TestCase):
         mock_run_command.assert_called_once_with(
             "/usr/bin/helm upgrade -i --reset-values test 'http://repo.example/charts/application.tgz'",
             environ_update={"HELM_NAMESPACE": "test"},
-            data=None,
         )
         assert (
             result.exception.args[0]["command"]
@@ -498,7 +489,6 @@ class TestDependencyUpdateWithChartRefIsUrl(unittest.TestCase):
         mock_run_command.assert_called_once_with(
             "/usr/bin/helm install --dependency-update --replace test 'http://repo.example/charts/application.tgz'",
             environ_update={"HELM_NAMESPACE": "test"},
-            data=None,
         )
         assert (
             result.exception.args[0]["command"]