Update documentation (#409)

Update documentation

SUMMARY


ISSUE TYPE


Docs Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION

Reviewed-by: None <None>
Reviewed-by: Abhijeet Kasurde <None>

CHANGELOG.rst

@@ -5,103 +5,6 @@ Kubernetes Collection Release Notes
 .. contents:: Topics
 
 
-v2.4.0
-======
-
-Major Changes
--------------
-
-- refactor K8sAnsibleMixin into module_utils/k8s/ (https://github.com/ansible-collections/kubernetes.core/pull/481).
-
-Minor Changes
--------------
-
-- Adjust k8s_user_impersonation tests to be compatible with Kubernetes 1.24 (https://github.com/ansible-collections/kubernetes.core/pull/520).
-- add support for dry run with kubernetes client version >=18.20 (https://github.com/ansible-collections/kubernetes.core/pull/245).
-- added ignore.txt for Ansible 2.14 devel branch.
-- fixed module_defaults by removing routing hacks from runtime.yml (https://github.com/ansible-collections/kubernetes.core/pull/347).
-- helm - add support for -set-file, -set-json, -set and -set-string options when running helm install (https://github.com/ansible-collections/kubernetes.core/issues/533).
-- helm - add support for helm dependency update (https://github.com/ansible-collections/kubernetes.core/pull/208).
-- helm - add support for post-renderer flag (https://github.com/ansible-collections/kubernetes.core/issues/30).
-- helm - add support for timeout cli parameter to allow setting Helm timeout independent of wait (https://github.com/ansible-collections/kubernetes.core/issues/67).
-- helm - add support for wait parameter for helm uninstall command. (https://github.com/ansible-collections/kubernetes/core/issues/33).
-- helm - support repo location for helm diff (https://github.com/ansible-collections/kubernetes.core/issues/174).
-- helm - when ansible is executed in check mode, return the diff between what's deployed and what will be deployed.
-- helm, helm_plugin, helm_info, helm_plugin_info, kubectl - add support for in-memory kubeconfig. (https://github.com/ansible-collections/kubernetes.core/issues/492).
-- helm_info - add hooks, notes and manifest as part of returned information (https://github.com/ansible-collections/kubernetes.core/pull/546).
-- helm_info - add release state as a module argument (https://github.com/ansible-collections/kubernetes.core/issues/377).
-- helm_info - added possibility to get all values by adding get_all_values parameter (https://github.com/ansible-collections/kubernetes.core/pull/531).
-- helm_plugin - Add plugin_version parameter to the helm_plugin module (https://github.com/ansible-collections/kubernetes.core/issues/157).
-- helm_plugin - Add support for helm plugin update using state=update.
-- helm_repository - Ability to replace (overwrite) the repo if it already exists by forcing (https://github.com/ansible-collections/kubernetes.core/issues/491).
-- helm_repository - add support for pass-credentials cli parameter (https://github.com/ansible-collections/kubernetes.core/pull/282).
-- helm_repository - added support for ``host``, ``api_key``, ``validate_certs``, and ``ca_cert``.
-- helm_repository - mark `pass_credentials` as no_log=True to silence false warning (https://github.com/ansible-collections/kubernetes.core/issues/412).
-- helm_template - add name (NAME of release) and disable_hook as optional module arguments (https://github.com/ansible-collections/kubernetes.core/issues/313).
-- helm_template - add show_only and release_namespace as module arguments (https://github.com/ansible-collections/kubernetes.core/issues/313).
-- helm_template - add support for -set-file, -set-json, -set and -set-string options when running helm template (https://github.com/ansible-collections/kubernetes.core/pull/546).
-- k8s - add no_proxy support to k8s* (https://github.com/ansible-collections/kubernetes.core/pull/272).
-- k8s - add support for server_side_apply. (https://github.com/ansible-collections/kubernetes.core/issues/87).
-- k8s - add support for user impersonation. (https://github.com/ansible-collections/kubernetes/core/issues/40).
-- k8s - allow resource definition using metadata.generateName (https://github.com/ansible-collections/kubernetes.core/issues/35).
-- k8s lookup plugin - Enable turbo mode via environment variable  (https://github.com/ansible-collections/kubernetes.core/issues/291).
-- k8s, k8s_scale, k8s_service - add support for resource definition as manifest via. (https://github.com/ansible-collections/kubernetes.core/issues/451).
-- k8s_cp - remove dependency with 'find' executable on remote pod when state=from_pod (https://github.com/ansible-collections/kubernetes.core/issues/486).
-- k8s_drain - Adds ``delete_emptydir_data`` option to ``k8s_drain.delete_options`` to evict pods with an ``emptyDir`` volume attached (https://github.com/ansible-collections/kubernetes.core/pull/322).
-- k8s_exec - select first container from the pod if none specified (https://github.com/ansible-collections/kubernetes.core/issues/358).
-- k8s_exec - update deprecation warning for `return_code` (https://github.com/ansible-collections/kubernetes.core/issues/417).
-- k8s_json_patch - minor typo fix in the example section (https://github.com/ansible-collections/kubernetes.core/issues/411).
-- k8s_log - add the ``all_containers`` for retrieving all containers' logs in the pod(s).
-- k8s_log - added the `previous` parameter for retrieving the previously terminated pod logs (https://github.com/ansible-collections/kubernetes.core/issues/437).
-- k8s_log - added the `tail_lines` parameter to limit the number of lines to be retrieved from the end of the logs (https://github.com/ansible-collections/kubernetes.core/issues/488).
-- k8s_rollback - add support for check_mode. (https://github.com/ansible-collections/kubernetes/core/issues/243).
-- k8s_scale - add support for check_mode. (https://github.com/ansible-collections/kubernetes/core/issues/244).
-- kubectl - wait for dd command to complete before proceeding (https://github.com/ansible-collections/kubernetes.core/pull/321).
-- kubectl.py - replace distutils.spawn.find_executable with shutil.which in the kubectl connection plugin (https://github.com/ansible-collections/kubernetes.core/pull/456).
-
-Bugfixes
---------
-
-- Fix dry_run logic - Pass the value dry_run=All instead of dry_run=True to the client, add conditional check on kubernetes client version as this feature is supported only for kubernetes >= 18.20.0 (https://github.com/ansible-collections/kubernetes.core/pull/561).
-- Fix kubeconfig parameter when multiple config files are provided (https://github.com/ansible-collections/kubernetes.core/issues/435).
-- Helm - Fix issue with alternative kubeconfig provided with validate_certs=False (https://github.com/ansible-collections/kubernetes.core/issues/538).
-- Various modules and plugins - use vendored version of ``distutils.version`` instead of the deprecated Python standard library ``distutils`` (https://github.com/ansible-collections/kubernetes.core/pull/314).
-- add missing documentation for filter plugin kubernetes.core.k8s_config_resource_name (https://github.com/ansible-collections/kubernetes.core/issues/558).
-- common - Ensure the label_selectors parameter of _wait_for method is optional.
-- common - handle ``aliases`` passed from inventory and lookup plugins.
-- helm_template - evaluate release_values after values_files, insuring highest precedence (now same behavior as in helm module). (https://github.com/ansible-collections/kubernetes.core/pull/348)
-- import exception from ``kubernetes.client.rest``.
-- k8s - Fix issue with check_mode when using server side apply (https://github.com/ansible-collections/kubernetes.core/issues/547).
-- k8s - Fix issue with server side apply with kubernetes release '25.3.0' (https://github.com/ansible-collections/kubernetes.core/issues/548).
-- k8s_cp - add support for check_mode (https://github.com/ansible-collections/kubernetes.core/issues/380).
-- k8s_drain - fix error caused by accessing an undefined variable when pods have local storage (https://github.com/ansible-collections/kubernetes.core/issues/292).
-- k8s_info - don't wait on empty List resources (https://github.com/ansible-collections/kubernetes.core/pull/253).
-- k8s_info - fix issue when module returns successful true after the resource cache has been established during periods where communication to the api-server is not possible (https://github.com/ansible-collections/kubernetes.core/issues/508).
-- k8s_log - Fix module traceback when no resource found (https://github.com/ansible-collections/kubernetes.core/issues/479).
-- k8s_log - fix exception raised when the name is not provided for resources requiring. (https://github.com/ansible-collections/kubernetes.core/issues/514)
-- k8s_scale - fix waiting on statefulset when scaled down to 0 replicas (https://github.com/ansible-collections/kubernetes.core/issues/203).
-- module_utils.common - change default opening mode to read-bytes to avoid bad interpretation of non ascii characters and strings, often present in 3rd party manifests.
-- module_utils/k8s/client.py - fix issue when trying to authenticate with host, client_cert and client_key parameters only.
-- remove binary file from k8s_cp test suite (https://github.com/ansible-collections/kubernetes.core/pull/298).
-- use resource prefix when finding resource and apiVersion is v1 (https://github.com/ansible-collections/kubernetes.core/issues/351).
-
-New Modules
------------
-
-- helm_pull - download a chart from a repository and (optionally) unpack it in local directory.
-
-v2.3.1
-======
-
-Bugfixes
---------
-
-- Catch exception raised when the process is waiting for resources (https://github.com/ansible-collections/kubernetes.core/issues/407).
-- Remove `omit` placeholder when defining resource using template parameter (https://github.com/ansible-collections/kubernetes.core/issues/431).
-- k8s - fix the issue when trying to delete resources using label_selectors options (https://github.com/ansible-collections/kubernetes.core/issues/433).
-- k8s_cp - fix issue when using parameter local_path with file on managed node. (https://github.com/ansible-collections/kubernetes.core/issues/421).
-- k8s_drain - fix error occurring when trying to drain node with disable_eviction set to yes (https://github.com/ansible-collections/kubernetes.core/issues/416).
-
 v2.3.0
 ======
 

Makefile

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

PSF-license.txt

@@ -1,48 +0,0 @@
-PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
---------------------------------------------
-
-1. This LICENSE AGREEMENT is between the Python Software Foundation
-("PSF"), and the Individual or Organization ("Licensee") accessing and
-otherwise using this software ("Python") in source or binary form and
-its associated documentation.
-
-2. Subject to the terms and conditions of this License Agreement, PSF hereby
-grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
-analyze, test, perform and/or display publicly, prepare derivative works,
-distribute, and otherwise use Python alone or in any derivative version,
-provided, however, that PSF's License Agreement and PSF's notice of copyright,
-i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Python Software Foundation;
-All Rights Reserved" are retained in Python alone or in any derivative version
-prepared by Licensee.
-
-3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python or any part thereof, and wants to make
-the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to Python.
-
-4. PSF is making Python available to Licensee on an "AS IS"
-basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-7. Nothing in this License Agreement shall be deemed to create any
-relationship of agency, partnership, or joint venture between PSF and
-Licensee.  This License Agreement does not grant permission to use PSF
-trademarks or trade name in a trademark sense to endorse or promote
-products or services of Licensee, or any third party.
-
-8. By copying, installing or otherwise using Python, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.

README.md

@@ -11,8 +11,6 @@ The collection includes a variety of Ansible content to help automate the manage
 
 This collection has been tested against following Ansible versions: **>=2.9.17**.
 
-For collections that support Ansible 2.9, please ensure you update your `network_os` to use the
-fully qualified collection name (for example, `cisco.ios.ios`).
 Plugins and modules within a collection may be tested with only specific Ansible versions.
 A collection may contain metadata that identifies these versions.
 PEP440 is the schema used to describe the versions of Ansible.
@@ -61,7 +59,6 @@ Name | Description
 [kubernetes.core.helm_info](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.helm_info_module.rst)|Get information from Helm package deployed inside the cluster
 [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_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
@@ -93,7 +90,7 @@ You can also include it in a `requirements.yml` file and install it via `ansible
 ---
 collections:
   - name: kubernetes.core
-    version: 2.4.0
+    version: 2.3.0
 ```
 
 ### Installing the Kubernetes Python Library

bindep.txt

@@ -1,3 +1,2 @@
 kubernetes-client [platform:fedora]
 openshift-clients [platform:rhel-8]
-openshift-clients [platform:rhel-9]

changelogs/changelog.yaml

@@ -568,197 +568,3 @@ releases:
       name: k8s_taint
       namespace: ''
     release_date: '2022-03-11'
-  2.3.1:
-    changes:
-      bugfixes:
-      - Catch expectation raised when the process is waiting for resources (https://github.com/ansible-collections/kubernetes.core/issues/407).
-      - Remove `omit` placeholder when defining resource using template parameter
-        (https://github.com/ansible-collections/kubernetes.core/issues/431).
-      - k8s - fix the issue when trying to delete resources using label_selectors
-        options (https://github.com/ansible-collections/kubernetes.core/issues/433).
-      - k8s_cp - fix issue when using parameter local_path with file on managed node.
-        (https://github.com/ansible-collections/kubernetes.core/issues/421).
-      - k8s_drain - fix error occurring when trying to drain node with disable_eviction
-        set to yes (https://github.com/ansible-collections/kubernetes.core/issues/416).
-    fragments:
-    - 408-fix-wait-on-exception.yml
-    - 417-fix-k8s-drain-delete-options.yaml
-    - 422-k8s_cp-fix-issue-when-issue-local_path.yaml
-    - 432-fix-issue-when-using-template-parameter.yaml
-    - 434-fix-k8s-delete-using-label_selector.yaml
-    release_date: '2022-05-02'
-  2.4.0:
-    changes:
-      bugfixes:
-      - Fix dry_run logic - Pass the value dry_run=All instead of dry_run=True to
-        the client, add conditional check on kubernetes client version as this feature
-        is supported only for kubernetes >= 18.20.0 (https://github.com/ansible-collections/kubernetes.core/pull/561).
-      - Fix kubeconfig parameter when multiple config files are provided (https://github.com/ansible-collections/kubernetes.core/issues/435).
-      - Helm - Fix issue with alternative kubeconfig provided with validate_certs=False
-        (https://github.com/ansible-collections/kubernetes.core/issues/538).
-      - Various modules and plugins - use vendored version of ``distutils.version``
-        instead of the deprecated Python standard library ``distutils`` (https://github.com/ansible-collections/kubernetes.core/pull/314).
-      - add missing documentation for filter plugin kubernetes.core.k8s_config_resource_name
-        (https://github.com/ansible-collections/kubernetes.core/issues/558).
-      - common - Ensure the label_selectors parameter of _wait_for method is optional.
-      - common - handle ``aliases`` passed from inventory and lookup plugins.
-      - helm_template - evaluate release_values after values_files, insuring highest
-        precedence (now same behavior as in helm module). (https://github.com/ansible-collections/kubernetes.core/pull/348)
-      - import exception from ``kubernetes.client.rest``.
-      - k8s - Fix issue with check_mode when using server side apply (https://github.com/ansible-collections/kubernetes.core/issues/547).
-      - k8s - Fix issue with server side apply with kubernetes release '25.3.0' (https://github.com/ansible-collections/kubernetes.core/issues/548).
-      - k8s_cp - add support for check_mode (https://github.com/ansible-collections/kubernetes.core/issues/380).
-      - k8s_drain - fix error caused by accessing an undefined variable when pods
-        have local storage (https://github.com/ansible-collections/kubernetes.core/issues/292).
-      - k8s_info - don't wait on empty List resources (https://github.com/ansible-collections/kubernetes.core/pull/253).
-      - k8s_info - fix issue when module returns successful true after the resource
-        cache has been established during periods where communication to the api-server
-        is not possible (https://github.com/ansible-collections/kubernetes.core/issues/508).
-      - k8s_log - Fix module traceback when no resource found (https://github.com/ansible-collections/kubernetes.core/issues/479).
-      - k8s_log - fix exception raised when the name is not provided for resources
-        requiring. (https://github.com/ansible-collections/kubernetes.core/issues/514)
-      - k8s_scale - fix waiting on statefulset when scaled down to 0 replicas (https://github.com/ansible-collections/kubernetes.core/issues/203).
-      - module_utils.common - change default opening mode to read-bytes to avoid bad
-        interpretation of non ascii characters and strings, often present in 3rd party
-        manifests.
-      - module_utils/k8s/client.py - fix issue when trying to authenticate with host,
-        client_cert and client_key parameters only.
-      - remove binary file from k8s_cp test suite (https://github.com/ansible-collections/kubernetes.core/pull/298).
-      - use resource prefix when finding resource and apiVersion is v1 (https://github.com/ansible-collections/kubernetes.core/issues/351).
-      major_changes:
-      - refactor K8sAnsibleMixin into module_utils/k8s/ (https://github.com/ansible-collections/kubernetes.core/pull/481).
-      minor_changes:
-      - Adjust k8s_user_impersonation tests to be compatible with Kubernetes 1.24
-        (https://github.com/ansible-collections/kubernetes.core/pull/520).
-      - add support for dry run with kubernetes client version >=18.20 (https://github.com/ansible-collections/kubernetes.core/pull/245).
-      - added ignore.txt for Ansible 2.14 devel branch.
-      - fixed module_defaults by removing routing hacks from runtime.yml (https://github.com/ansible-collections/kubernetes.core/pull/347).
-      - helm - add support for -set-file, -set-json, -set and -set-string options
-        when running helm install (https://github.com/ansible-collections/kubernetes.core/issues/533).
-      - helm - add support for helm dependency update (https://github.com/ansible-collections/kubernetes.core/pull/208).
-      - helm - add support for post-renderer flag (https://github.com/ansible-collections/kubernetes.core/issues/30).
-      - helm - add support for timeout cli parameter to allow setting Helm timeout
-        independent of wait (https://github.com/ansible-collections/kubernetes.core/issues/67).
-      - helm - add support for wait parameter for helm uninstall command. (https://github.com/ansible-collections/kubernetes/core/issues/33).
-      - helm - support repo location for helm diff (https://github.com/ansible-collections/kubernetes.core/issues/174).
-      - helm - when ansible is executed in check mode, return the diff between what's
-        deployed and what will be deployed.
-      - helm, helm_plugin, helm_info, helm_plugin_info, kubectl - add support for
-        in-memory kubeconfig. (https://github.com/ansible-collections/kubernetes.core/issues/492).
-      - helm_info - add hooks, notes and manifest as part of returned information
-        (https://github.com/ansible-collections/kubernetes.core/pull/546).
-      - helm_info - add release state as a module argument (https://github.com/ansible-collections/kubernetes.core/issues/377).
-      - helm_info - added possibility to get all values by adding get_all_values parameter
-        (https://github.com/ansible-collections/kubernetes.core/pull/531).
-      - helm_plugin - Add plugin_version parameter to the helm_plugin module (https://github.com/ansible-collections/kubernetes.core/issues/157).
-      - helm_plugin - Add support for helm plugin update using state=update.
-      - helm_repository - Ability to replace (overwrite) the repo if it already exists
-        by forcing (https://github.com/ansible-collections/kubernetes.core/issues/491).
-      - helm_repository - add support for pass-credentials cli parameter (https://github.com/ansible-collections/kubernetes.core/pull/282).
-      - helm_repository - added support for ``host``, ``api_key``, ``validate_certs``,
-        and ``ca_cert``.
-      - helm_repository - mark `pass_credentials` as no_log=True to silence false
-        warning (https://github.com/ansible-collections/kubernetes.core/issues/412).
-      - helm_template - add name (NAME of release) and disable_hook as optional module
-        arguments (https://github.com/ansible-collections/kubernetes.core/issues/313).
-      - helm_template - add show_only and release_namespace as module arguments (https://github.com/ansible-collections/kubernetes.core/issues/313).
-      - helm_template - add support for -set-file, -set-json, -set and -set-string
-        options when running helm template (https://github.com/ansible-collections/kubernetes.core/pull/546).
-      - k8s - add no_proxy support to k8s* (https://github.com/ansible-collections/kubernetes.core/pull/272).
-      - k8s - add support for server_side_apply. (https://github.com/ansible-collections/kubernetes.core/issues/87).
-      - k8s - add support for user impersonation. (https://github.com/ansible-collections/kubernetes/core/issues/40).
-      - k8s - allow resource definition using metadata.generateName (https://github.com/ansible-collections/kubernetes.core/issues/35).
-      - k8s lookup plugin - Enable turbo mode via environment variable  (https://github.com/ansible-collections/kubernetes.core/issues/291).
-      - k8s, k8s_scale, k8s_service - add support for resource definition as manifest
-        via. (https://github.com/ansible-collections/kubernetes.core/issues/451).
-      - k8s_cp - remove dependency with 'find' executable on remote pod when state=from_pod
-        (https://github.com/ansible-collections/kubernetes.core/issues/486).
-      - k8s_drain - Adds ``delete_emptydir_data`` option to ``k8s_drain.delete_options``
-        to evict pods with an ``emptyDir`` volume attached (https://github.com/ansible-collections/kubernetes.core/pull/322).
-      - k8s_exec - select first container from the pod if none specified (https://github.com/ansible-collections/kubernetes.core/issues/358).
-      - k8s_exec - update deprecation warning for `return_code` (https://github.com/ansible-collections/kubernetes.core/issues/417).
-      - k8s_json_patch - minor typo fix in the example section (https://github.com/ansible-collections/kubernetes.core/issues/411).
-      - k8s_log - add the ``all_containers`` for retrieving all containers' logs in
-        the pod(s).
-      - k8s_log - added the `previous` parameter for retrieving the previously terminated
-        pod logs (https://github.com/ansible-collections/kubernetes.core/issues/437).
-      - k8s_log - added the `tail_lines` parameter to limit the number of lines to
-        be retrieved from the end of the logs (https://github.com/ansible-collections/kubernetes.core/issues/488).
-      - k8s_rollback - add support for check_mode. (https://github.com/ansible-collections/kubernetes/core/issues/243).
-      - k8s_scale - add support for check_mode. (https://github.com/ansible-collections/kubernetes/core/issues/244).
-      - kubectl - wait for dd command to complete before proceeding (https://github.com/ansible-collections/kubernetes.core/pull/321).
-      - kubectl.py - replace distutils.spawn.find_executable with shutil.which in
-        the kubectl connection plugin (https://github.com/ansible-collections/kubernetes.core/pull/456).
-    fragments:
-    - 0-copy_ignore_txt.yml
-    - 208-add-dependency-update.yaml
-    - 226-add-version-parameter-to-helm_plugin.yml
-    - 231-helm-add-timeout-parameter.yaml
-    - 238-helm-add-support-for-helm-uninstall-wait.yaml
-    - 238-k8s-add-support-for-generate_name.yml
-    - 245-add-dry-run.yaml
-    - 250-k8s-add-support-for-impersonation.yaml
-    - 253-dont-wait-on-list-resources.yaml
-    - 255-k8s_scale-k8s_rollback-add-support-for-check_mode.yml
-    - 260-k8s-add-support-for-server_side_apply.yml
-    - 272-k8s-add-support-no_proxy.yaml
-    - 282-helm-repository-add-pass-credentials.yaml
-    - 290-returns-diff-in-check-mode.yaml
-    - 295-fix-k8s-drain-variable-declaration.yaml
-    - 298-remove-binary-file.yaml
-    - 30-helm-add-post-renderer-support.yml
-    - 308-fix-for-common-non-ascii-characters-in-resources.yaml
-    - 313-helm-template-add-support-for-name-and-disablehook.yml
-    - 313-helm-template-add-support-for-show-only-and-release-namespace.yml
-    - 321-kubectl_sleep.yml
-    - 322-Add-delete_emptydir_data-to-drain-delete_options.yaml
-    - 335-k8s-lookup-add-support-for-turbo-mode.yml
-    - 347-routing.yml
-    - 348-helm_template-fix-precedence-of-release-values-over-values-files.yaml
-    - 358-k8s_exec.yml
-    - 364-use-resource-prefix.yaml
-    - 377-helm-info-state.yml
-    - 389-helm-add-support-chart_repo_url-on-helm_diff.yml
-    - 391-fix-statefulset-wait.yaml
-    - 411_k8s_json_patch.yml
-    - 412_pass_creds.yml
-    - 417_deprecation.yml
-    - 428-fix-kubeconfig-parameter-with-multiple-config-files.yaml
-    - 437-k8s-add-support-for-previous-logs.yaml
-    - 456-replace-distutils.yml
-    - 478-add-support-for-manifest-url.yaml
-    - 481-refactor-common.yml
-    - 488-add-support-for-tail-logs.yaml
-    - 493-k8s_log-fix-module-when-pod-does-exist.yaml
-    - 497-helm-add-support-for-in-memory-kubeconfig.yml
-    - 498-k8s-honor-aliases.yaml
-    - 505-add-from-yaml-all-example.yml
-    - 509-helm-repo-add-force_update-argument.yaml
-    - 512-k8s_cp-add-support-for-check_mode-update-command-for-listing-files-into-pod.yaml
-    - 515-update-sanity-for-2-15.yml
-    - 522-fix-helm-tests.yml
-    - 523-helm_info-get-all-values.yaml
-    - 528-k8s_log-support-all_containers-options.yml
-    - 532-k8s_crd-fix-integration-test.yml
-    - 546-helm-install-add-support-for-set-options.yaml
-    - 549-fix-server-side-apply.yaml
-    - 552-k8s_cp-fix-issue-when-copying-item-with-space-in-its-name.yml
-    - 561-fix-dry-run.yml
-    - 562-helm-fix-issue-when-alternative-kubeconfig-is-provided.yaml
-    - 571-k8s_info-fix-issue-with-api-server.yaml
-    - _wait_for_label_selector_optional.yaml
-    - disutils.version.yml
-    - exception.yml
-    - fix-ci-unit-tests.yaml
-    - helm_repository.yml
-    - ignore_2.14.yml
-    - k8s_config_resource_name-add-missing-documentation.yml
-    - k8s_rollback_reduce_tmeouts.yaml
-    - k8s_user_impersonation_k8s_1_24.yaml
-    - minor-tests-duration.yaml
-    modules:
-    - description: download a chart from a repository and (optionally) unpack it in
-        local directory.
-      name: helm_pull
-      namespace: ''
-    release_date: '2023-01-24'

docs/kubernetes.core.helm_info_module.rst

@@ -172,6 +172,31 @@ Parameters
                         <div style="font-size: small; color: darkgreen"><br/>aliases: namespace</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>release_state</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">list</span>
+                         / <span style="color: purple">elements=string</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>Show releases as per their states.</div>
+                        <div>Default value is <code>deployed</code> and <code>failed</code>.</div>
+                        <div>If set to <code>all</code>, show all releases without any filter applied.</div>
+                        <div>If set to <code>deployed</code>, show deployed releases.</div>
+                        <div>If set to <code>failed</code>, show failed releases.</div>
+                        <div>If set to <code>pending</code>, show pending releases.</div>
+                        <div>If set to <code>superseded</code>, show superseded releases.</div>
+                        <div>If set to <code>uninstalled</code>, show uninstalled releases, if <code>helm uninstall --keep-history</code> was used.</div>
+                        <div>If set to <code>uninstalling</code>, show releases that are currently being uninstalled.</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -204,11 +229,18 @@ Examples
 
 .. code-block:: yaml
 
-    - name: Deploy latest version of Grafana chart inside monitoring namespace
+    - name: Gather information of Grafana chart inside monitoring namespace
       kubernetes.core.helm_info:
         name: test
         release_namespace: monitoring
 
+    - name: Gather information about test-chart with pending state
+      kubernetes.core.helm_info:
+        name: test-chart
+        release_namespace: testenv
+        release_state:
+        - pending
+
 
 
 Return Values

docs/kubernetes.core.helm_module.rst

@@ -193,30 +193,6 @@ Parameters
                         <div>Create the release namespace if not present.</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>dependency_update</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>Run standelone <code>helm dependency update CHART</code> before the operation.</div>
-                        <div>Run inline <code>--dependency-update</code> with <code>helm install</code> command. This feature is not supported yet with the <code>helm upgrade</code> command.</div>
-                        <div>So we should consider to use <em>dependency_update</em> options with <em>replace</em> option enabled when specifying <em>chart_repo_url</em>.</div>
-                        <div>The <em>dependency_update</em> option require the add of <code>dependencies</code> block in <code>Chart.yaml/requirements.yaml</code> file.</div>
-                        <div>For more information please visit <a href='https://helm.sh/docs/helm/helm_dependency/'>https://helm.sh/docs/helm/helm_dependency/</a></div>
-                        <div style="font-size: small; color: darkgreen"><br/>aliases: dep_up</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -556,6 +532,12 @@ Parameters
     <br/>
 
 
+Notes
+-----
+
+.. note::
+   - The default idempotency check can fail to report changes when ``release_state`` is set to ``present`` and ``chart_repo_url`` is defined. Install helm diff >= 3.4.1 for better results.
+
 
 
 Examples

docs/kubernetes.core.helm_plugin_module.rst

@@ -150,7 +150,7 @@ Parameters
                 </td>
                 <td>
                         <div>Name of Helm plugin.</div>
-                        <div>Required only if <code>state=absent</code>.</div>
+                        <div>Required only if <code>state=absent</code> or <code>state=latest</code>.</div>
                 </td>
             </tr>
             <tr>
@@ -170,6 +170,23 @@ Parameters
                         <div>Required only if <code>state=present</code>.</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>plugin_version</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>Plugin version to install. If this is not specified, the latest version is installed.</div>
+                        <div>Ignored when <code>state=absent</code> or <code>state=latest</code>.</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -183,10 +200,12 @@ Parameters
                         <ul style="margin: 0; padding: 0"><b>Choices:</b>
                                     <li>absent</li>
                                     <li><div style="color: blue"><b>present</b>&nbsp;&larr;</div></li>
+                                    <li>latest</li>
                         </ul>
                 </td>
                 <td>
                         <div>If <code>state=present</code> the Helm plugin will be installed.</div>
+                        <div>If <code>state=latest</code> the Helm plugin will be updated. Added in version 2.3.0.</div>
                         <div>If <code>state=absent</code> the Helm plugin will be removed.</div>
                 </td>
             </tr>
@@ -237,6 +256,17 @@ Examples
         plugin_name: env
         state: absent
 
+    - name: Install Helm plugin with a specific version
+      kubernetes.core.helm_plugin:
+        plugin_version: 2.0.1
+        plugin_path: https://domain/path/to/plugin.tar.gz
+        state: present
+
+    - name: Update Helm plugin
+      kubernetes.core.helm_plugin:
+        plugin_name: secrets
+        state: latest
+
 
 
 Return Values

docs/kubernetes.core.helm_pull_module.rst

@@ -1,467 +0,0 @@
-.. _kubernetes.core.helm_pull_module:
-
-
-*************************
-kubernetes.core.helm_pull
-*************************
-
-**download a chart from a repository and (optionally) unpack it in local directory.**
-
-
-Version added: 2.4.0
-
-.. contents::
-   :local:
-   :depth: 1
-
-
-Synopsis
---------
-- Retrieve a package from a package repository, and download it locally.
-- It can also be used to perform cryptographic verification of a chart without installing the chart.
-- There are options for unpacking the chart after download.
-
-
-
-Requirements
-------------
-The below requirements are needed on the host that executes this module.
-
-- helm >= 3.0 (https://github.com/helm/helm/releases)
-
-
-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>chart_ca_cert</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>Verify certificates of HTTPS-enabled servers using this CA bundle.</div>
-                        <div>Requires helm &gt;= 3.1.0.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>chart_devel</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">boolean</span>
-                    </div>
-                </td>
-                <td>
-                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
-                                    <li>no</li>
-                                    <li>yes</li>
-                        </ul>
-                </td>
-                <td>
-                        <div>Use development versions, too. Equivalent to version &#x27;&gt;0.0.0-0&#x27;.</div>
-                        <div>Mutually exclusive with <code>chart_version</code>.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>chart_ref</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>chart name on chart repository.</div>
-                        <div>absolute URL.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>chart_ssl_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>Identify HTTPS client using this SSL certificate file.</div>
-                        <div>Requires helm &gt;= 3.1.0.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>chart_ssl_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>Identify HTTPS client using this SSL key file</div>
-                        <div>Requires helm &gt;= 3.1.0.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>chart_version</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>Specify a version constraint for the chart version to use.</div>
-                        <div>This constraint can be a specific tag (e.g. 1.1.1) or it may reference a valid range (e.g. ^2.0.0).</div>
-                        <div>Mutually exclusive with <code>chart_devel</code>.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>destination</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">path</span>
-                         / <span style="color: red">required</span>
-                    </div>
-                </td>
-                <td>
-                </td>
-                <td>
-                        <div>location to write the chart.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>pass_credentials</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>Pass credentials to all domains.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>provenance</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>Fetch the provenance file, but don&#x27;t perform verification.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>repo_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>Chart repository password where to locate the requested chart.</div>
-                        <div>Required if <code>repo_username</code> is specified.</div>
-                        <div style="font-size: small; color: darkgreen"><br/>aliases: password, chart_repo_password</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>repo_url</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>chart repository url where to locate the requested chart.</div>
-                        <div style="font-size: small; color: darkgreen"><br/>aliases: url, chart_repo_url</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>repo_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>Chart repository username where to locate the requested chart.</div>
-                        <div>Required if <code>repo_password</code> is specified.</div>
-                        <div style="font-size: small; color: darkgreen"><br/>aliases: username, chart_repo_username</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>skip_tls_certs_check</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>Whether or not to check tls certificate for the chart download.</div>
-                        <div>Requires helm &gt;= 3.3.0.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>untar_chart</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>if set to true, will untar the chart after downloading it.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>verify_chart</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>Verify the package before using it.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>verify_chart_keyring</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>location of public keys used for verification.</div>
-                </td>
-            </tr>
-    </table>
-    <br/>
-
-
-
-
-Examples
---------
-
-.. code-block:: yaml
-
-    - name: Download chart using chart url
-      kubernetes.core.helm_pull:
-        chart_ref: https://github.com/grafana/helm-charts/releases/download/grafana-5.6.0/grafana-5.6.0.tgz
-        destination: /path/to/chart
-
-    - name: Download Chart using chart_name and repo_url
-      kubernetes.core.helm_pull:
-        chart_ref: redis
-        repo_url: https://charts.bitnami.com/bitnami
-        untar_chart: yes
-        destination: /path/to/chart
-
-    - name: Download Chart (skip tls certificate check)
-      kubernetes.core.helm_pull:
-        chart_ref: redis
-        repo_url: https://charts.bitnami.com/bitnami
-        untar_chart: yes
-        destination: /path/to/chart
-        skip_tls_certs_check: yes
-
-    - name: Download Chart using chart registry credentials
-      kubernetes.core.helm_pull:
-        chart_ref: redis
-        repo_url: https://charts.bitnami.com/bitnami
-        untar_chart: yes
-        destination: /path/to/chart
-        username: myuser
-        password: mypassword123
-
-
-
-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 `helm pull` command built by this module, in case you want to re-run the command outside the module or debug a problem.</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;">helm pull --repo test ...</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>rc</b>
-                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
-                    <div style="font-size: small">
-                      <span style="color: purple">integer</span>
-                    </div>
-                </td>
-                <td>always</td>
-                <td>
-                            <div>Helm pull command return code</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;">1</div>
-                </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 `helm pull` 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 `helm pull` command stdout, in case you want to display it or examine the event log</div>
-                    <br/>
-                </td>
-            </tr>
-    </table>
-    <br/><br/>
-
-
-Status
-------
-
-
-Authors
-~~~~~~~
-
-- Aubin Bikouo (@abikouo)

docs/kubernetes.core.helm_repository_module.rst

@@ -40,6 +40,22 @@ Parameters
             <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>api_key</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>Token used to authenticate with the API. Can also be specified via <code>K8S_AUTH_API_KEY</code> environment variable.</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -55,6 +71,59 @@ Parameters
                         <div>The path of a helm binary to use.</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>ca_cert</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">path</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>Path to a CA certificate used to authenticate with the API. The full certificate chain must be provided to avoid certificate validation errors. Can also be specified via <code>K8S_AUTH_SSL_CA_CERT</code> environment variable.</div>
+                        <div style="font-size: small; color: darkgreen"><br/>aliases: ssl_ca_cert</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>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>Provide a URL for accessing the API. Can also be specified via <code>K8S_AUTH_HOST</code> environment variable.</div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>pass_credentials</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 2.3.0</div>
+                </td>
+                <td>
+                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
+                                    <li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
+                                    <li>yes</li>
+                        </ul>
+                </td>
+                <td>
+                        <div>Pass credentials to all domains.</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -142,6 +211,27 @@ Parameters
                         <div style="font-size: small; color: darkgreen"><br/>aliases: username</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>validate_certs</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">boolean</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
+                                    <li>no</li>
+                                    <li><div style="color: blue"><b>yes</b>&nbsp;&larr;</div></li>
+                        </ul>
+                </td>
+                <td>
+                        <div>Whether or not to verify the API server&#x27;s SSL certificates. Can also be specified via <code>K8S_AUTH_VERIFY_SSL</code> environment variable.</div>
+                        <div style="font-size: small; color: darkgreen"><br/>aliases: verify_ssl</div>
+                </td>
+            </tr>
     </table>
     <br/>
 

docs/kubernetes.core.helm_template_module.rst

@@ -96,28 +96,6 @@ Parameters
                         <div>Chart version to use. If this is not specified, the latest version is installed.</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>dependency_update</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>Run helm dependency update before the operation.</div>
-                        <div>The <em>dependency_update</em> option require the add of <code>dependencies</code> block in <code>Chart.yaml/requirements.yaml</code> file.</div>
-                        <div>For more information please visit <a href='https://helm.sh/docs/helm/helm_dependency/'>https://helm.sh/docs/helm/helm_dependency/</a></div>
-                        <div style="font-size: small; color: darkgreen"><br/>aliases: dep_up</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -153,6 +131,22 @@ Parameters
                         <div>If the directory already exists, it will be overwritten.</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>release_namespace</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>namespace scope for this request.</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -170,6 +164,23 @@ Parameters
                         <div style="font-size: small; color: darkgreen"><br/>aliases: values</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="1">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>show_only</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">list</span>
+                         / <span style="color: purple">elements=string</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>Only show manifests rendered from the given templates.</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -235,6 +246,24 @@ Examples
         dest: myfile.yaml
         content: "{{ result.stdout }}"
 
+    - name: Render MutatingWebhooksConfiguration for revision tag "canary", rev "1-13-0"
+      kubernetes.core.helm_template:
+        chart_ref: istio/istiod
+        chart_version: "1.13.0"
+        release_namespace: "istio-system"
+        show_only:
+          - "templates/revision-tags.yaml"
+        release_values:
+          revision: "1-13-0"
+          revisionTags:
+            - "canary"
+      register: result
+
+    - name: Write templates to file
+      copy:
+        dest: myfile.yaml
+        content: "{{ result.stdout }}"
+
 
 
 Return Values

docs/kubernetes.core.k8s_cluster_info_module.rst

@@ -151,7 +151,7 @@ Parameters
                 </td>
                 <td>
                         <div>Group(s) to impersonate for the operation.</div>
-                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: Group1,Group2</div>
+                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: &#x27;Group1,Group2&#x27;</div>
                 </td>
             </tr>
             <tr>
@@ -206,6 +206,25 @@ Parameters
                         <div>The kubernetes configuration can be provided as dictionary. This feature requires a python kubernetes client version &gt;= 17.17.0. Added in version 2.2.0.</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="2">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>no_proxy</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>The comma separated list of hosts/domains/IP/CIDR that shouldn&#x27;t go through proxy. Can also be specified via K8S_AUTH_NO_PROXY environment variable.</div>
+                        <div>Please note that this module does not pick up typical proxy settings from the environment (e.g. NO_PROXY).</div>
+                        <div>This feature requires kubernetes&gt;=19.15.0. When kubernetes library is less than 19.15.0, it fails even no_proxy set in correct.</div>
+                        <div>example value is &quot;localhost,.local,.example.com,127.0.0.1,127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16&quot;</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>

docs/kubernetes.core.k8s_cp_module.rst

@@ -182,7 +182,7 @@ Parameters
                 </td>
                 <td>
                         <div>Group(s) to impersonate for the operation.</div>
-                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: Group1,Group2</div>
+                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: &#x27;Group1,Group2&#x27;</div>
                 </td>
             </tr>
             <tr>
@@ -271,6 +271,25 @@ Parameters
                         <div>This option is ignored when <em>content</em> is set or when <em>state</em> is set to <code>from_pod</code>.</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="2">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>no_proxy</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>The comma separated list of hosts/domains/IP/CIDR that shouldn&#x27;t go through proxy. Can also be specified via K8S_AUTH_NO_PROXY environment variable.</div>
+                        <div>Please note that this module does not pick up typical proxy settings from the environment (e.g. NO_PROXY).</div>
+                        <div>This feature requires kubernetes&gt;=19.15.0. When kubernetes library is less than 19.15.0, it fails even no_proxy set in correct.</div>
+                        <div>example value is &quot;localhost,.local,.example.com,127.0.0.1,127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16&quot;</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>

docs/kubernetes.core.k8s_drain_module.rst

@@ -147,6 +147,7 @@ Parameters
                     <div style="font-size: small">
                         <span style="color: purple">boolean</span>
                     </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
                 </td>
                 <td>
                         <ul style="margin: 0; padding: 0"><b>Choices:</b>
@@ -155,7 +156,7 @@ Parameters
                         </ul>
                 </td>
                 <td>
-                        <div>Continue even if there are pods using emptyDir (local data that will be deleted when the node is drained)</div>
+                        <div>Continue even if there are pods using emptyDir (local data that will be deleted when the node is drained).</div>
                 </td>
             </tr>
             <tr>
@@ -301,7 +302,7 @@ Parameters
                 </td>
                 <td>
                         <div>Group(s) to impersonate for the operation.</div>
-                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: Group1,Group2</div>
+                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: &#x27;Group1,Group2&#x27;</div>
                 </td>
             </tr>
             <tr>
@@ -353,6 +354,25 @@ Parameters
                         <div>The name of the node.</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="2">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>no_proxy</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>The comma separated list of hosts/domains/IP/CIDR that shouldn&#x27;t go through proxy. Can also be specified via K8S_AUTH_NO_PROXY environment variable.</div>
+                        <div>Please note that this module does not pick up typical proxy settings from the environment (e.g. NO_PROXY).</div>
+                        <div>This feature requires kubernetes&gt;=19.15.0. When kubernetes library is less than 19.15.0, it fails even no_proxy set in correct.</div>
+                        <div>example value is &quot;localhost,.local,.example.com,127.0.0.1,127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16&quot;</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>

docs/kubernetes.core.k8s_exec_module.rst

@@ -117,7 +117,7 @@ Parameters
                 <td>
                 </td>
                 <td>
-                        <div>The command to execute</div>
+                        <div>The command to execute.</div>
                 </td>
             </tr>
             <tr>
@@ -134,6 +134,7 @@ Parameters
                 <td>
                         <div>The name of the container in the pod to connect to.</div>
                         <div>Defaults to only container if there is only one container in the pod.</div>
+                        <div>If not specified, will choose the first container from the given pod as kubectl cmdline does.</div>
                 </td>
             </tr>
             <tr>
@@ -181,7 +182,7 @@ Parameters
                 </td>
                 <td>
                         <div>Group(s) to impersonate for the operation.</div>
-                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: Group1,Group2</div>
+                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: &#x27;Group1,Group2&#x27;</div>
                 </td>
             </tr>
             <tr>
@@ -230,7 +231,26 @@ Parameters
                 <td>
                 </td>
                 <td>
-                        <div>The pod namespace name</div>
+                        <div>The pod namespace name.</div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="2">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>no_proxy</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>The comma separated list of hosts/domains/IP/CIDR that shouldn&#x27;t go through proxy. Can also be specified via K8S_AUTH_NO_PROXY environment variable.</div>
+                        <div>Please note that this module does not pick up typical proxy settings from the environment (e.g. NO_PROXY).</div>
+                        <div>This feature requires kubernetes&gt;=19.15.0. When kubernetes library is less than 19.15.0, it fails even no_proxy set in correct.</div>
+                        <div>example value is &quot;localhost,.local,.example.com,127.0.0.1,127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16&quot;</div>
                 </td>
             </tr>
             <tr>
@@ -285,7 +305,7 @@ Parameters
                 <td>
                 </td>
                 <td>
-                        <div>The pod name</div>
+                        <div>The pod name.</div>
                 </td>
             </tr>
             <tr>
@@ -302,7 +322,7 @@ Parameters
                 <td>
                         <div>The URL of an HTTP proxy to use for the connection.</div>
                         <div>Can also be specified via <em>K8S_AUTH_PROXY</em> environment variable.</div>
-                        <div>Please note that this module does not pick up typical proxy settings from the environment (e.g. HTTP_PROXY).</div>
+                        <div>Please note that this module does not pick up typical proxy settings from the environment (for example, HTTP_PROXY).</div>
                 </td>
             </tr>
             <tr>
@@ -449,6 +469,13 @@ Examples
         msg: "cmd failed"
       when: command_status.rc != 0
 
+    - name: Specify a container name to execute the command on
+      kubernetes.core.k8s_exec:
+        namespace: myproject
+        pod: busybox-test
+        container: manager
+        command: echo "hello"
+
 
 
 Return Values

docs/kubernetes.core.k8s_info_module.rst

@@ -188,7 +188,7 @@ Parameters
                 </td>
                 <td>
                         <div>Group(s) to impersonate for the operation.</div>
-                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: Group1,Group2</div>
+                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: &#x27;Group1,Group2&#x27;</div>
                 </td>
             </tr>
             <tr>
@@ -295,6 +295,25 @@ Parameters
                         <div>If <em>resource definition</em> is provided, the <em>metadata.namespace</em> value from the <em>resource_definition</em> will override this option.</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="2">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>no_proxy</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>The comma separated list of hosts/domains/IP/CIDR that shouldn&#x27;t go through proxy. Can also be specified via K8S_AUTH_NO_PROXY environment variable.</div>
+                        <div>Please note that this module does not pick up typical proxy settings from the environment (e.g. NO_PROXY).</div>
+                        <div>This feature requires kubernetes&gt;=19.15.0. When kubernetes library is less than 19.15.0, it fails even no_proxy set in correct.</div>
+                        <div>example value is &quot;localhost,.local,.example.com,127.0.0.1,127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16&quot;</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>

docs/kubernetes.core.k8s_inventory.rst

@@ -351,8 +351,8 @@ Status
 Authors
 ~~~~~~~
 
-- Chris Houseknecht <@chouseknecht>
-- Fabian von Feilitzsch <@fabianvf>
+- Chris Houseknecht (@chouseknecht)
+- Fabian von Feilitzsch (@fabianvf)
 
 
 .. hint::

docs/kubernetes.core.k8s_json_patch_module.rst

@@ -170,7 +170,7 @@ Parameters
                 </td>
                 <td>
                         <div>Group(s) to impersonate for the operation.</div>
-                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: Group1,Group2</div>
+                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: &#x27;Group1,Group2&#x27;</div>
                 </td>
             </tr>
             <tr>
@@ -256,6 +256,25 @@ Parameters
                         <div>Use in conjunction with <em>api_version</em>, <em>kind</em>, and <em>name</em> to identify a specific object.</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="2">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>no_proxy</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>The comma separated list of hosts/domains/IP/CIDR that shouldn&#x27;t go through proxy. Can also be specified via K8S_AUTH_NO_PROXY environment variable.</div>
+                        <div>Please note that this module does not pick up typical proxy settings from the environment (e.g. NO_PROXY).</div>
+                        <div>This feature requires kubernetes&gt;=19.15.0. When kubernetes library is less than 19.15.0, it fails even no_proxy set in correct.</div>
+                        <div>example value is &quot;localhost,.local,.example.com,127.0.0.1,127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16&quot;</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>

docs/kubernetes.core.k8s_log_module.rst

@@ -189,7 +189,7 @@ Parameters
                 </td>
                 <td>
                         <div>Group(s) to impersonate for the operation.</div>
-                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: Group1,Group2</div>
+                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: &#x27;Group1,Group2&#x27;</div>
                 </td>
             </tr>
             <tr>
@@ -295,6 +295,25 @@ Parameters
                         <div>If <em>resource definition</em> is provided, the <em>metadata.namespace</em> value from the <em>resource_definition</em> will override this option.</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="2">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>no_proxy</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>The comma separated list of hosts/domains/IP/CIDR that shouldn&#x27;t go through proxy. Can also be specified via K8S_AUTH_NO_PROXY environment variable.</div>
+                        <div>Please note that this module does not pick up typical proxy settings from the environment (e.g. NO_PROXY).</div>
+                        <div>This feature requires kubernetes&gt;=19.15.0. When kubernetes library is less than 19.15.0, it fails even no_proxy set in correct.</div>
+                        <div>example value is &quot;localhost,.local,.example.com,127.0.0.1,127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16&quot;</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>

docs/kubernetes.core.k8s_lookup.rst

@@ -438,106 +438,28 @@ Common return values are documented `here <https://docs.ansible.com/ansible/late
 
     <table border=0 cellpadding=0 class="documentation-table">
         <tr>
-            <th colspan="2">Key</th>
+            <th colspan="1">Key</th>
             <th>Returned</th>
             <th width="100%">Description</th>
         </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="return-"></div>
                     <b>_list</b>
                     <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
                     <div style="font-size: small">
-                      <span style="color: purple">complex</span>
+                      <span style="color: purple">list</span>
+                       / <span style="color: purple">elements=dictionary</span>
                     </div>
                 </td>
                 <td></td>
                 <td>
                             <div>One ore more object definitions returned from the API.</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;">[{&#x27;kind&#x27;: &#x27;ConfigMap&#x27;, &#x27;apiVersion&#x27;: &#x27;v1&#x27;, &#x27;metadata&#x27;: {&#x27;creationTimestamp&#x27;: &#x27;2022-03-04T13:59:49Z&#x27;, &#x27;name&#x27;: &#x27;my-config-map&#x27;, &#x27;namespace&#x27;: &#x27;default&#x27;, &#x27;resourceVersion&#x27;: &#x27;418&#x27;, &#x27;uid&#x27;: &#x27;5714b011-d090-4eac-8272-a0ea82ec0abd&#x27;}, &#x27;data&#x27;: {&#x27;key1&#x27;: &#x27;val1&#x27;}}]</div>
                 </td>
             </tr>
-                                <tr>
-                    <td class="elbow-placeholder">&nbsp;</td>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>api_version</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>success</td>
-                <td>
-                            <div>The versioned schema of this representation of an object.</div>
-                    <br/>
-                </td>
-            </tr>
-            <tr>
-                    <td class="elbow-placeholder">&nbsp;</td>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>kind</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>success</td>
-                <td>
-                            <div>Represents the REST resource this object represents.</div>
-                    <br/>
-                </td>
-            </tr>
-            <tr>
-                    <td class="elbow-placeholder">&nbsp;</td>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>metadata</b>
-                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
-                    <div style="font-size: small">
-                      <span style="color: purple">complex</span>
-                    </div>
-                </td>
-                <td>success</td>
-                <td>
-                            <div>Standard object metadata. Includes name, namespace, annotations, labels, etc.</div>
-                    <br/>
-                </td>
-            </tr>
-            <tr>
-                    <td class="elbow-placeholder">&nbsp;</td>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>spec</b>
-                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
-                    <div style="font-size: small">
-                      <span style="color: purple">complex</span>
-                    </div>
-                </td>
-                <td>success</td>
-                <td>
-                            <div>Specific attributes of the object. Will vary based on the <em>api_version</em> and <em>kind</em>.</div>
-                    <br/>
-                </td>
-            </tr>
-            <tr>
-                    <td class="elbow-placeholder">&nbsp;</td>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>status</b>
-                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
-                    <div style="font-size: small">
-                      <span style="color: purple">complex</span>
-                    </div>
-                </td>
-                <td>success</td>
-                <td>
-                            <div>Current status details for the object.</div>
-                    <br/>
-                </td>
-            </tr>
-
     </table>
     <br/><br/>
 
@@ -549,8 +471,8 @@ Status
 Authors
 ~~~~~~~
 
-- Chris Houseknecht <@chouseknecht>
-- Fabian von Feilitzsch <@fabianvf>
+- Chris Houseknecht (@chouseknecht)
+- Fabian von Feilitzsch (@fabianvf)
 
 
 .. hint::

docs/kubernetes.core.k8s_module.rst

@@ -336,6 +336,26 @@ Parameters
                         <div>If set to <code>yes</code>, and <em>state</em> is <code>present</code>, an existing object will be replaced.</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="3">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>generate_name</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>Use to specify the basis of an object name and random characters will be added automatically on server to generate a unique name.</div>
+                        <div>This option is ignored when <em>state</em> is not set to <code>present</code> or when <em>apply</em> is set to <code>yes</code>.</div>
+                        <div>If <em>resource definition</em> is provided, the <em>metadata.generateName</em> value from the <em>resource_definition</em> will override this option.</div>
+                        <div>If <em>resource definition</em> is provided, and contains <em>metadata.name</em>, this option is ignored.</div>
+                        <div>mutually exclusive with <code>name</code>.</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="3">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -366,7 +386,7 @@ Parameters
                 </td>
                 <td>
                         <div>Group(s) to impersonate for the operation.</div>
-                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: Group1,Group2</div>
+                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: &#x27;Group1,Group2&#x27;</div>
                 </td>
             </tr>
             <tr>
@@ -499,6 +519,25 @@ Parameters
                         <div>If <em>resource definition</em> is provided, the <em>metadata.namespace</em> value from the <em>resource_definition</em> will override this option.</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="3">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>no_proxy</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>The comma separated list of hosts/domains/IP/CIDR that shouldn&#x27;t go through proxy. Can also be specified via K8S_AUTH_NO_PROXY environment variable.</div>
+                        <div>Please note that this module does not pick up typical proxy settings from the environment (e.g. NO_PROXY).</div>
+                        <div>This feature requires kubernetes&gt;=19.15.0. When kubernetes library is less than 19.15.0, it fails even no_proxy set in correct.</div>
+                        <div>example value is &quot;localhost,.local,.example.com,127.0.0.1,127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16&quot;</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="3">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -640,6 +679,63 @@ Parameters
                         <div style="font-size: small; color: darkgreen"><br/>aliases: definition, inline</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="3">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>server_side_apply</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">dictionary</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>When this option is set, apply runs in the server instead of the client.</div>
+                        <div>Ignored if <code>apply</code> is not set or is set to False.</div>
+                        <div>This option requires &quot;kubernetes &gt;= 19.15.0&quot;.</div>
+                </td>
+            </tr>
+                                <tr>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="2">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>field_manager</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>Name of the manager used to track field ownership.</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="2">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>force_conflicts</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>A conflict is a special status error that occurs when an Server Side Apply operation tries to change a field, which another user also claims to manage.</div>
+                        <div>When set to True, server-side apply will force the changes against conflicts.</div>
+                </td>
+            </tr>
+
             <tr>
                 <td colspan="3">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -654,7 +750,7 @@ Parameters
                 <td>
                         <div>Provide a path to a file containing a valid YAML definition of an object or objects to be created or updated. Mutually exclusive with <em>resource_definition</em>. NOTE: <em>kind</em>, <em>api_version</em>, <em>name</em>, and <em>namespace</em> will be overwritten by corresponding values found in the configuration read in from the <em>src</em> file.</div>
                         <div>Reads from the local file system. To read from the Ansible controller&#x27;s file system, including vaulted files, use the file lookup plugin or template lookup plugin, combined with the from_yaml filter, and pass the result to <em>resource_definition</em>. See Examples below.</div>
-                        <div>Mutually exclusive with <em>template</em> in case of <span class='module'>k8s</span> module.</div>
+                        <div>Mutually exclusive with <em>template</em> in case of <span class='module'>kubernetes.core.k8s</span> module.</div>
                 </td>
             </tr>
             <tr>
@@ -1093,6 +1189,33 @@ Examples
             labels:
               support: patch
 
+    # Create object using generateName
+    - name: create resource using name generated by the server
+      kubernetes.core.k8s:
+        state: present
+        generate_name: pod-
+        definition:
+          apiVersion: v1
+          kind: Pod
+          spec:
+            containers:
+            - name: py
+              image: python:3.7-alpine
+              imagePullPolicy: IfNotPresent
+
+    # Server side apply
+    - name: Create configmap using server side apply
+      kubernetes.core.k8s:
+        namespace: testing
+        definition:
+          apiVersion: v1
+          kind: ConfigMap
+          metadata:
+            name: my-configmap
+        apply: yes
+        server_side_apply:
+          field_manager: ansible
+
 
 
 Return Values

docs/kubernetes.core.k8s_rollback_module.rst

@@ -187,7 +187,7 @@ Parameters
                 </td>
                 <td>
                         <div>Group(s) to impersonate for the operation.</div>
-                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: Group1,Group2</div>
+                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: &#x27;Group1,Group2&#x27;</div>
                 </td>
             </tr>
             <tr>
@@ -293,6 +293,25 @@ Parameters
                         <div>If <em>resource definition</em> is provided, the <em>metadata.namespace</em> value from the <em>resource_definition</em> will override this option.</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="2">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>no_proxy</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>The comma separated list of hosts/domains/IP/CIDR that shouldn&#x27;t go through proxy. Can also be specified via K8S_AUTH_NO_PROXY environment variable.</div>
+                        <div>Please note that this module does not pick up typical proxy settings from the environment (e.g. NO_PROXY).</div>
+                        <div>This feature requires kubernetes&gt;=19.15.0. When kubernetes library is less than 19.15.0, it fails even no_proxy set in correct.</div>
+                        <div>example value is &quot;localhost,.local,.example.com,127.0.0.1,127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16&quot;</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>

docs/kubernetes.core.k8s_scale_module.rst

@@ -204,7 +204,7 @@ Parameters
                 </td>
                 <td>
                         <div>Group(s) to impersonate for the operation.</div>
-                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: Group1,Group2</div>
+                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: &#x27;Group1,Group2&#x27;</div>
                 </td>
             </tr>
             <tr>
@@ -311,6 +311,25 @@ Parameters
                         <div>If <em>resource definition</em> is provided, the <em>metadata.namespace</em> value from the <em>resource_definition</em> will override this option.</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="2">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>no_proxy</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>The comma separated list of hosts/domains/IP/CIDR that shouldn&#x27;t go through proxy. Can also be specified via K8S_AUTH_NO_PROXY environment variable.</div>
+                        <div>Please note that this module does not pick up typical proxy settings from the environment (e.g. NO_PROXY).</div>
+                        <div>This feature requires kubernetes&gt;=19.15.0. When kubernetes library is less than 19.15.0, it fails even no_proxy set in correct.</div>
+                        <div>example value is &quot;localhost,.local,.example.com,127.0.0.1,127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16&quot;</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -497,7 +516,7 @@ Parameters
                 <td>
                         <div>Provide a path to a file containing a valid YAML definition of an object or objects to be created or updated. Mutually exclusive with <em>resource_definition</em>. NOTE: <em>kind</em>, <em>api_version</em>, <em>name</em>, and <em>namespace</em> will be overwritten by corresponding values found in the configuration read in from the <em>src</em> file.</div>
                         <div>Reads from the local file system. To read from the Ansible controller&#x27;s file system, including vaulted files, use the file lookup plugin or template lookup plugin, combined with the from_yaml filter, and pass the result to <em>resource_definition</em>. See Examples below.</div>
-                        <div>Mutually exclusive with <em>template</em> in case of <span class='module'>k8s</span> module.</div>
+                        <div>Mutually exclusive with <em>template</em> in case of <span class='module'>kubernetes.core.k8s</span> module.</div>
                 </td>
             </tr>
             <tr>

docs/kubernetes.core.k8s_service_module.rst

@@ -187,7 +187,7 @@ Parameters
                 </td>
                 <td>
                         <div>Group(s) to impersonate for the operation.</div>
-                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: Group1,Group2</div>
+                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: &#x27;Group1,Group2&#x27;</div>
                 </td>
             </tr>
             <tr>
@@ -280,6 +280,25 @@ Parameters
                         <div>Use to specify a Service object namespace.</div>
                 </td>
             </tr>
+            <tr>
+                <td colspan="2">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>no_proxy</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.3.0</div>
+                </td>
+                <td>
+                </td>
+                <td>
+                        <div>The comma separated list of hosts/domains/IP/CIDR that shouldn&#x27;t go through proxy. Can also be specified via K8S_AUTH_NO_PROXY environment variable.</div>
+                        <div>Please note that this module does not pick up typical proxy settings from the environment (e.g. NO_PROXY).</div>
+                        <div>This feature requires kubernetes&gt;=19.15.0. When kubernetes library is less than 19.15.0, it fails even no_proxy set in correct.</div>
+                        <div>example value is &quot;localhost,.local,.example.com,127.0.0.1,127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16&quot;</div>
+                </td>
+            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -468,7 +487,7 @@ Parameters
                 <td>
                         <div>Provide a path to a file containing a valid YAML definition of an object or objects to be created or updated. Mutually exclusive with <em>resource_definition</em>. NOTE: <em>kind</em>, <em>api_version</em>, <em>name</em>, and <em>namespace</em> will be overwritten by corresponding values found in the configuration read in from the <em>src</em> file.</div>
                         <div>Reads from the local file system. To read from the Ansible controller&#x27;s file system, including vaulted files, use the file lookup plugin or template lookup plugin, combined with the from_yaml filter, and pass the result to <em>resource_definition</em>. See Examples below.</div>
-                        <div>Mutually exclusive with <em>template</em> in case of <span class='module'>k8s</span> module.</div>
+                        <div>Mutually exclusive with <em>template</em> in case of <span class='module'>kubernetes.core.k8s</span> module.</div>
                 </td>
             </tr>
             <tr>

docs/kubernetes.core.k8s_taint_module.rst

@@ -149,7 +149,7 @@ Parameters
                 </td>
                 <td>
                         <div>Group(s) to impersonate for the operation.</div>
-                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: Group1,Group2</div>
+                        <div>Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: &#x27;Group1,Group2&#x27;</div>
                 </td>
             </tr>
             <tr>

docs/kubernetes.core.kubectl_connection.rst

@@ -354,7 +354,7 @@ Status
 Authors
 ~~~~~~~
 
-- xuxinkun
+- xuxinkun (@xuxinkun)
 
 
 .. hint::

docs/kubernetes.core.kustomize_lookup.rst

@@ -133,106 +133,27 @@ Common return values are documented `here <https://docs.ansible.com/ansible/late
 
     <table border=0 cellpadding=0 class="documentation-table">
         <tr>
-            <th colspan="2">Key</th>
+            <th colspan="1">Key</th>
             <th>Returned</th>
             <th width="100%">Description</th>
         </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="return-"></div>
                     <b>_list</b>
                     <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
                     <div style="font-size: small">
-                      <span style="color: purple">complex</span>
+                      <span style="color: purple">string</span>
                     </div>
                 </td>
                 <td></td>
                 <td>
-                            <div>One ore more object definitions returned from the tool execution.</div>
+                            <div>YAML string for the object definitions returned from the tool execution.</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;">{&#x27;kind&#x27;: &#x27;ConfigMap&#x27;, &#x27;apiVersion&#x27;: &#x27;v1&#x27;, &#x27;metadata&#x27;: {&#x27;name&#x27;: &#x27;my-config-map&#x27;, &#x27;namespace&#x27;: &#x27;default&#x27;}, &#x27;data&#x27;: {&#x27;key1&#x27;: &#x27;val1&#x27;}}</div>
                 </td>
             </tr>
-                                <tr>
-                    <td class="elbow-placeholder">&nbsp;</td>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>api_version</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>success</td>
-                <td>
-                            <div>The versioned schema of this representation of an object.</div>
-                    <br/>
-                </td>
-            </tr>
-            <tr>
-                    <td class="elbow-placeholder">&nbsp;</td>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>kind</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>success</td>
-                <td>
-                            <div>Represents the REST resource this object represents.</div>
-                    <br/>
-                </td>
-            </tr>
-            <tr>
-                    <td class="elbow-placeholder">&nbsp;</td>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>metadata</b>
-                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
-                    <div style="font-size: small">
-                      <span style="color: purple">complex</span>
-                    </div>
-                </td>
-                <td>success</td>
-                <td>
-                            <div>Standard object metadata. Includes name, namespace, annotations, labels, etc.</div>
-                    <br/>
-                </td>
-            </tr>
-            <tr>
-                    <td class="elbow-placeholder">&nbsp;</td>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>spec</b>
-                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
-                    <div style="font-size: small">
-                      <span style="color: purple">complex</span>
-                    </div>
-                </td>
-                <td>success</td>
-                <td>
-                            <div>Specific attributes of the object. Will vary based on the <em>api_version</em> and <em>kind</em>.</div>
-                    <br/>
-                </td>
-            </tr>
-            <tr>
-                    <td class="elbow-placeholder">&nbsp;</td>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>status</b>
-                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
-                    <div style="font-size: small">
-                      <span style="color: purple">complex</span>
-                    </div>
-                </td>
-                <td>success</td>
-                <td>
-                            <div>Current status details for the object.</div>
-                    <br/>
-                </td>
-            </tr>
-
     </table>
     <br/><br/>
 
@@ -244,7 +165,7 @@ Status
 Authors
 ~~~~~~~
 
-- Aubin Bikouo <@abikouo>
+- Aubin Bikouo (@abikouo)
 
 
 .. hint::

galaxy.yml

@@ -25,7 +25,7 @@ tags:
   - openshift
   - okd
   - cluster
-version: 2.4.0
+version: 2.3.0
 build_ignore:
   - .DS_Store
   - '*.tar.gz'

plugins/action/k8s_info.py

@@ -11,7 +11,7 @@ import copy
 import traceback
 import os
 from contextlib import contextmanager
-import platform
+
 
 from ansible.config.manager import ensure_type
 from ansible.errors import (
@@ -26,34 +26,6 @@ from ansible.module_utils._text import to_text, to_bytes, to_native
 from ansible.plugins.action import ActionBase
 
 
-class RemoveOmit(object):
-    def __init__(self, buffer, omit_value):
-        try:
-            import yaml
-        except ImportError:
-            raise AnsibleError("Failed to import the required Python library (PyYAML).")
-        self.data = yaml.safe_load_all(buffer)
-        self.omit = omit_value
-
-    def remove_omit(self, data):
-        if isinstance(data, dict):
-            result = dict()
-            for key, value in iteritems(data):
-                if value == self.omit:
-                    continue
-                result[key] = self.remove_omit(value)
-            return result
-        if isinstance(data, list):
-            return [self.remove_omit(v) for v in data if v != self.omit]
-        return data
-
-    def output(self):
-        return [self.remove_omit(d) for d in self.data]
-
-
-ENV_KUBECONFIG_PATH_SEPARATOR = ";" if platform.system() == "Windows" else ":"
-
-
 class ActionModule(ActionBase):
 
     TRANSFERS_FILES = True
@@ -208,7 +180,6 @@ class ActionModule(ActionBase):
                 "'template' is only a supported parameter for the 'k8s' module."
             )
 
-        omit_value = task_vars.get("omit")
         template_params = []
         if isinstance(template, string_types) or isinstance(template, dict):
             template_params.append(self.get_template_args(template))
@@ -274,10 +245,7 @@ class ActionModule(ActionBase):
                     preserve_trailing_newlines=True,
                     escape_backslashes=False,
                 )
-                if omit_value is not None:
-                    result_template.extend(RemoveOmit(result, omit_value).output())
-                else:
-                    result_template.append(result)
+                result_template.append(result)
         self._templar.available_variables = old_vars
         resource_definition = self._task.args.get("definition", None)
         if not resource_definition:
@@ -312,15 +280,11 @@ class ActionModule(ActionBase):
             if not remote_transport:
                 # kubeconfig is local
                 # find in expected paths
-                configs = []
-                for config in kubeconfig.split(ENV_KUBECONFIG_PATH_SEPARATOR):
-                    config = self._find_needle("files", config)
+                kubeconfig = self._find_needle("files", kubeconfig)
 
-                    # decrypt kubeconfig found
-                    configs.append(self._loader.get_real_file(config, decrypt=True))
-                new_module_args["kubeconfig"] = ENV_KUBECONFIG_PATH_SEPARATOR.join(
-                    configs
-                )
+                # decrypt kubeconfig found
+                actual_file = self._loader.get_real_file(kubeconfig, decrypt=True)
+                new_module_args["kubeconfig"] = actual_file
 
         elif isinstance(kubeconfig, dict):
             new_module_args["kubeconfig"] = kubeconfig
@@ -331,7 +295,7 @@ class ActionModule(ActionBase):
             )
 
     def run(self, tmp=None, task_vars=None):
-        """handler for k8s options"""
+        """ handler for k8s options """
         if task_vars is None:
             task_vars = dict()
 
@@ -359,7 +323,7 @@ class ActionModule(ActionBase):
         # find the file in the expected search path
         src = self._task.args.get("src", None)
 
-        if src and not src.startswith(("http://", "https://", "ftp://")):
+        if src:
             if remote_transport:
                 # src is on remote node
                 result.update(
@@ -388,7 +352,7 @@ class ActionModule(ActionBase):
 
         local_path = self._task.args.get("local_path")
         state = self._task.args.get("state", None)
-        if local_path and state == "to_pod" and not remote_transport:
+        if local_path and state == "to_pod":
             new_module_args["local_path"] = self.get_file_realpath(local_path)
 
         # Execute the k8s_* module.

plugins/connection/kubectl.py

@@ -75,7 +75,6 @@ DOCUMENTATION = r"""
       kubectl_kubeconfig:
         description:
           - Path to a kubectl config file. Defaults to I(~/.kube/config)
-          - The configuration can be provided as dictionary. Added in version 2.4.0.
         default: ''
         vars:
           - name: ansible_kubectl_kubeconfig
@@ -172,12 +171,10 @@ DOCUMENTATION = r"""
         aliases: [ kubectl_verify_ssl ]
 """
 
+import distutils.spawn
 import os
 import os.path
-import shutil
 import subprocess
-import tempfile
-import json
 
 from ansible.parsing.yaml.loader import AnsibleLoader
 from ansible.errors import AnsibleError, AnsibleFileNotFound
@@ -208,7 +205,7 @@ CONNECTION_OPTIONS = {
 
 
 class Connection(ConnectionBase):
-    """Local kubectl based connections"""
+    """ Local kubectl based connections """
 
     transport = CONNECTION_TRANSPORT
     connection_options = CONNECTION_OPTIONS
@@ -222,15 +219,14 @@ class Connection(ConnectionBase):
         # Note: kubectl runs commands as the user that started the container.
         # It is impossible to set the remote user for a kubectl connection.
         cmd_arg = "{0}_command".format(self.transport)
-        self.transport_cmd = kwargs.get(cmd_arg, shutil.which(self.transport))
-        if not self.transport_cmd:
-            raise AnsibleError("{0} command not found in PATH".format(self.transport))
-        self._file_to_delete = None
-
-    def delete_temporary_file(self):
-        if self._file_to_delete is not None:
-            os.remove(self._file_to_delete)
-            self._file_to_delete = None
+        if cmd_arg in kwargs:
+            self.transport_cmd = kwargs[cmd_arg]
+        else:
+            self.transport_cmd = distutils.spawn.find_executable(self.transport)
+            if not self.transport_cmd:
+                raise AnsibleError(
+                    "{0} command not found in PATH".format(self.transport)
+                )
 
     def _build_exec_cmd(self, cmd):
         """Build the local kubectl exec command to run cmd on remote_host"""
@@ -244,27 +240,15 @@ class Connection(ConnectionBase):
                 # Translate verify_ssl to skip_verify_ssl, and output as string
                 skip_verify_ssl = not self.get_option(key)
                 local_cmd.append(
-                    "{0}={1}".format(
+                    u"{0}={1}".format(
                         self.connection_options[key], str(skip_verify_ssl).lower()
                     )
                 )
                 censored_local_cmd.append(
-                    "{0}={1}".format(
+                    u"{0}={1}".format(
                         self.connection_options[key], str(skip_verify_ssl).lower()
                     )
                 )
-            elif key.endswith("kubeconfig") and self.get_option(key) != "":
-                kubeconfig_path = self.get_option(key)
-                if isinstance(kubeconfig_path, dict):
-                    fd, tmpfile = tempfile.mkstemp()
-                    with os.fdopen(fd, "w") as fp:
-                        json.dump(kubeconfig_path, fp)
-                    kubeconfig_path = tmpfile
-                    self._file_to_delete = tmpfile
-
-                cmd_arg = self.connection_options[key]
-                local_cmd += [cmd_arg, kubeconfig_path]
-                censored_local_cmd += [cmd_arg, kubeconfig_path]
             elif (
                 not key.endswith("container")
                 and self.get_option(key)
@@ -278,12 +262,12 @@ class Connection(ConnectionBase):
                 else:
                     censored_local_cmd += [cmd_arg, self.get_option(key)]
 
-        extra_args_name = "{0}_extra_args".format(self.transport)
+        extra_args_name = u"{0}_extra_args".format(self.transport)
         if self.get_option(extra_args_name):
             local_cmd += self.get_option(extra_args_name).split(" ")
             censored_local_cmd += self.get_option(extra_args_name).split(" ")
 
-        pod = self.get_option("{0}_pod".format(self.transport))
+        pod = self.get_option(u"{0}_pod".format(self.transport))
         if not pod:
             pod = self._play_context.remote_addr
         # -i is needed to keep stdin open which allows pipelining to work
@@ -291,7 +275,7 @@ class Connection(ConnectionBase):
         censored_local_cmd += ["exec", "-i", pod]
 
         # if the pod has more than one container, then container is required
-        container_arg_name = "{0}_container".format(self.transport)
+        container_arg_name = u"{0}_container".format(self.transport)
         if self.get_option(container_arg_name):
             local_cmd += ["-c", self.get_option(container_arg_name)]
             censored_local_cmd += ["-c", self.get_option(container_arg_name)]
@@ -302,17 +286,17 @@ class Connection(ConnectionBase):
         return local_cmd, censored_local_cmd
 
     def _connect(self, port=None):
-        """Connect to the container. Nothing to do"""
+        """ Connect to the container. Nothing to do """
         super(Connection, self)._connect()
         if not self._connected:
             display.vvv(
-                "ESTABLISH {0} CONNECTION".format(self.transport),
+                u"ESTABLISH {0} CONNECTION".format(self.transport),
                 host=self._play_context.remote_addr,
             )
             self._connected = True
 
     def exec_command(self, cmd, in_data=None, sudoable=False):
-        """Run a command in the container"""
+        """ Run a command in the container """
         super(Connection, self).exec_command(cmd, in_data=in_data, sudoable=sudoable)
 
         local_cmd, censored_local_cmd = self._build_exec_cmd(
@@ -332,7 +316,6 @@ class Connection(ConnectionBase):
         )
 
         stdout, stderr = p.communicate(in_data)
-        self.delete_temporary_file()
         return (p.returncode, stdout, stderr)
 
     def _prefix_login_path(self, remote_path):
@@ -350,7 +333,7 @@ class Connection(ConnectionBase):
         return os.path.normpath(remote_path)
 
     def put_file(self, in_path, out_path):
-        """Transfer a file from local to the container"""
+        """ Transfer a file from local to the container """
         super(Connection, self).put_file(in_path, out_path)
         display.vvv(
             "PUT %s TO %s" % (in_path, out_path), host=self._play_context.remote_addr
@@ -385,7 +368,6 @@ class Connection(ConnectionBase):
                     "kubectl connection requires dd command in the container to put files"
                 )
             stdout, stderr = p.communicate()
-            self.delete_temporary_file()
 
             if p.returncode != 0:
                 raise AnsibleError(
@@ -394,7 +376,7 @@ class Connection(ConnectionBase):
                 )
 
     def fetch_file(self, in_path, out_path):
-        """Fetch a file from container to local."""
+        """ Fetch a file from container to local. """
         super(Connection, self).fetch_file(in_path, out_path)
         display.vvv(
             "FETCH %s TO %s" % (in_path, out_path), host=self._play_context.remote_addr
@@ -424,7 +406,6 @@ class Connection(ConnectionBase):
                     )
                 )
             stdout, stderr = p.communicate()
-            self.delete_temporary_file()
 
             if p.returncode != 0:
                 raise AnsibleError(
@@ -439,6 +420,6 @@ class Connection(ConnectionBase):
             )
 
     def close(self):
-        """Terminate the connection. Nothing to do for kubectl"""
+        """ Terminate the connection. Nothing to do for kubectl"""
         super(Connection, self).close()
         self._connected = False

plugins/doc_fragments/helm_common_options.py

@@ -30,8 +30,7 @@ options:
     description:
       - Helm option to specify kubeconfig path to use.
       - If the value is not specified in the task, the value of environment variable C(K8S_AUTH_KUBECONFIG) will be used instead.
-      - The configuration can be provided as dictionary. Added in version 2.4.0.
-    type: raw
+    type: path
     aliases: [ kubeconfig_path ]
   host:
     description:

plugins/doc_fragments/k8s_auth_options.py

@@ -28,7 +28,6 @@ options:
       options are provided, the Kubernetes client will attempt to load the default
       configuration file from I(~/.kube/config). Can also be specified via K8S_AUTH_KUBECONFIG environment
       variable.
-    - Multiple Kubernetes config file can be provided using separator ';' for Windows platform or ':' for others platforms.
     - The kubernetes configuration can be provided as dictionary. This feature requires a python kubernetes client version >= 17.17.0. Added in version 2.2.0.
     type: raw
   context:
@@ -129,7 +128,7 @@ options:
   impersonate_groups:
     description:
     - Group(s) to impersonate for the operation.
-    - "Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: Group1,Group2"
+    - "Can also be specified via K8S_AUTH_IMPERSONATE_GROUPS environment. Example: 'Group1,Group2'"
     type: list
     elements: str
     version_added: 2.3.0

plugins/doc_fragments/k8s_resource_options.py

@@ -29,7 +29,6 @@ options:
     - Reads from the local file system. To read from the Ansible controller's file system, including vaulted files, use the file lookup
       plugin or template lookup plugin, combined with the from_yaml filter, and pass the result to
       I(resource_definition). See Examples below.
-    - The URL to manifest files that can be used to create the resource. Added in version 2.4.0.
     - Mutually exclusive with I(template) in case of M(kubernetes.core.k8s) module.
     type: path
 """

plugins/filter/k8s_config_resource_name.yml

@@ -1,36 +0,0 @@
----
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-DOCUMENTATION:
-  name: k8s_config_resource_name
-  short_description: Generate resource name for the given resource of type ConfigMap, Secret
-  description:
-    - Generate resource name for the given resource of type ConfigMap, Secret.
-    - Resource must have a C(metadata.name) key to generate a resource name
-  options:
-    _input:
-      description:
-        - A valid YAML definition for a ConfigMap or a Secret.
-      type: dict
-      required: true
-  author:
-    - ansible cloud team
-
-EXAMPLES: |
-  # Dump generated name for a configmap into a variable
-  - set_fact:
-      generated_name: '{{ definition | kubernetes.core.k8s_config_resource_name }}'
-    vars:
-      definition:
-        apiVersion: v1
-        kind: ConfigMap
-        metadata:
-          name: myconfigmap
-          namespace: mynamespace
-
-RETURN:
-  _value:
-    description: Generated resource name.
-    type: str

plugins/inventory/k8s.py

@@ -118,10 +118,9 @@ import json
 
 from ansible.errors import AnsibleError
 from ansible_collections.kubernetes.core.plugins.module_utils.common import (
+    K8sAnsibleMixin,
     HAS_K8S_MODULE_HELPER,
     k8s_import_exception,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
     get_api_client,
 )
 from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable
@@ -147,7 +146,7 @@ class K8sInventoryException(Exception):
     pass
 
 
-class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
+class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable, K8sAnsibleMixin):
     NAME = "kubernetes.core.k8s"
 
     connection_plugin = "kubernetes.core.kubectl"

plugins/lookup/k8s.py

@@ -180,12 +180,10 @@ from ansible.errors import AnsibleError
 from ansible.module_utils.common._collections_compat import KeysView
 from ansible.module_utils.common.validation import check_type_bool
 
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
+from ansible_collections.kubernetes.core.plugins.module_utils.common import (
+    K8sAnsibleMixin,
     get_api_client,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.resource import (
-    create_definitions,
-)
 
 try:
     enable_turbo_mode = check_type_bool(os.environ.get("ENABLE_TURBO_MODE"))
@@ -212,7 +210,7 @@ except ImportError as e:
     k8s_import_exception = e
 
 
-class KubernetesLookup(object):
+class KubernetesLookup(K8sAnsibleMixin):
     def __init__(self):
 
         if not HAS_K8S_MODULE_HELPER:
@@ -242,7 +240,7 @@ class KubernetesLookup(object):
 
         cluster_info = kwargs.get("cluster_info")
         if cluster_info == "version":
-            return [self.client.client.version]
+            return [self.client.version]
         if cluster_info == "api_groups":
             if isinstance(self.client.resources.api_groups, KeysView):
                 return [list(self.client.resources.api_groups)]
@@ -259,12 +257,7 @@ class KubernetesLookup(object):
         resource_definition = kwargs.get("resource_definition")
         src = kwargs.get("src")
         if src:
-            definitions = create_definitions(params=dict(src=src))
-            if definitions:
-                self.kind = definitions[0].kind
-                self.name = definitions[0].name
-                self.namespace = definitions[0].namespace
-                self.api_version = definitions[0].api_version or "v1"
+            resource_definition = self.load_resource_definitions(src)[0]
         if resource_definition:
             self.kind = resource_definition.get("kind", self.kind)
             self.api_version = resource_definition.get("apiVersion", self.api_version)
@@ -279,15 +272,14 @@ class KubernetesLookup(object):
                 "using the 'resource_definition' parameter."
             )
 
-        resource = self.client.resource(self.kind, self.api_version)
+        resource = self.find_resource(self.kind, self.api_version, fail=True)
         try:
-            params = dict(
+            k8s_obj = resource.get(
                 name=self.name,
                 namespace=self.namespace,
                 label_selector=self.label_selector,
                 field_selector=self.field_selector,
             )
-            k8s_obj = self.client.get(resource, **params)
         except NotFoundError:
             return []
 

plugins/module_utils/_version.py

@@ -3,7 +3,7 @@
 # Implements multiple version numbering conventions for the
 # Python Module Distribution Utilities.
 #
-# PSF License (see PSF-license.txt or https://opensource.org/licenses/Python-2.0)
+# PSF License (see licenses/PSF-license.txt or https://opensource.org/licenses/Python-2.0)
 #
 
 """Provides classes to represent module version numbers (one class for

plugins/module_utils/apply.py

@@ -24,13 +24,6 @@ from ansible.module_utils.common.dict_transformations import dict_merge
 from ansible_collections.kubernetes.core.plugins.module_utils.exceptions import (
     ApplyException,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.core import (
-    gather_versions,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.version import (
-    LooseVersion,
-)
-
 
 try:
     from kubernetes.dynamic.exceptions import NotFoundError
@@ -138,10 +131,7 @@ def k8s_apply(resource, definition, **kwargs):
     existing, desired = apply_object(resource, definition)
     server_side = kwargs.get("server_side", False)
     if server_side:
-        versions = gather_versions()
-        body = definition
-        if LooseVersion(versions["kubernetes"]) < LooseVersion("25.0.0"):
-            body = json.dumps(definition).encode()
+        body = json.dumps(definition).encode()
         # server_side_apply is forces content_type to 'application/apply-patch+yaml'
         return resource.server_side_apply(
             body=body,
@@ -149,7 +139,6 @@ def k8s_apply(resource, definition, **kwargs):
             namespace=definition["metadata"].get("namespace"),
             force_conflicts=kwargs.get("force_conflicts"),
             field_manager=kwargs.get("field_manager"),
-            dry_run=kwargs.get("dry_run"),
         )
     if not existing:
         return resource.create(

plugins/module_utils/client/discovery.py

@@ -96,7 +96,7 @@ class Discoverer(kubernetes.dynamic.discovery.Discoverer):
             self._write_cache()
 
     def get_resources_for_api_version(self, prefix, group, version, preferred):
-        """returns a dictionary of resources associated with provided (prefix, group, version)"""
+        """ returns a dictionary of resources associated with provided (prefix, group, version)"""
 
         resources = defaultdict(list)
         subresources = defaultdict(dict)

plugins/module_utils/common.py

@@ -26,7 +26,6 @@ import traceback
 import sys
 import hashlib
 from datetime import datetime
-from tempfile import NamedTemporaryFile
 
 from ansible_collections.kubernetes.core.plugins.module_utils.version import (
     LooseVersion,
@@ -48,7 +47,6 @@ from ansible.module_utils.six import iteritems, string_types
 from ansible.module_utils._text import to_native, to_bytes, to_text
 from ansible.module_utils.common.dict_transformations import dict_merge
 from ansible.module_utils.parsing.convert_bool import boolean
-from ansible.module_utils.urls import Request
 
 K8S_IMP_ERR = None
 try:
@@ -132,7 +130,6 @@ except ImportError as e:
 
 
 def configuration_digest(configuration, **kwargs):
-    """This function has been deprecated and will be removed in version 4.0.0."""
     m = hashlib.sha256()
     for k in AUTH_ARG_MAP:
         if not hasattr(configuration, k):
@@ -153,8 +150,6 @@ def configuration_digest(configuration, **kwargs):
 
 
 class unique_string(str):
-    """This function has been deprecated and will be removed in version 4.0.0."""
-
     _low = None
 
     def __hash__(self):
@@ -174,7 +169,6 @@ class unique_string(str):
 
 
 def get_api_client(module=None, **kwargs):
-    """This function has been deprecated and will be removed in version 4.0.0. Please use module_utils.k8s.client.get_api_client() instead."""
     auth = {}
 
     def _raise_or_fail(exc, msg):
@@ -344,35 +338,8 @@ def get_api_client(module=None, **kwargs):
 get_api_client._pool = {}
 
 
-def fetch_file_from_url(module, url):
-    # Download file
-    bufsize = 65536
-    file_name, file_ext = os.path.splitext(str(url.rsplit("/", 1)[1]))
-    temp_file = NamedTemporaryFile(
-        dir=module.tmpdir, prefix=file_name, suffix=file_ext, delete=False
-    )
-    module.add_cleanup_file(temp_file.name)
-    try:
-        rsp = Request().open("GET", url)
-        if not rsp:
-            module.fail_json(msg="Failure downloading %s" % url)
-        data = rsp.read(bufsize)
-        while data:
-            temp_file.write(data)
-            data = rsp.read(bufsize)
-        temp_file.close()
-    except Exception as e:
-        module.fail_json(msg="Failure downloading %s, %s" % (url, to_native(e)))
-    return temp_file.name
-
-
 class K8sAnsibleMixin(object):
     def __init__(self, module, pyyaml_required=True, *args, **kwargs):
-        module.deprecate(
-            msg="The K8sAnsibleMixin class has been deprecated and refactored into the module_utils/k8s/ directory.",
-            version="4.0.0",
-            collection_name="kubernetes.core",
-        )
         if not HAS_K8S_MODULE_HELPER:
             module.fail_json(
                 msg=missing_required_lib("kubernetes"),
@@ -454,25 +421,18 @@ class K8sAnsibleMixin(object):
             field_selectors = []
 
         result = None
-        params = dict(
-            name=name,
-            namespace=namespace,
-            label_selector=",".join(label_selectors),
-            field_selector=",".join(field_selectors),
-        )
         try:
-            result = resource.get(**params)
+            result = resource.get(
+                name=name,
+                namespace=namespace,
+                label_selector=",".join(label_selectors),
+                field_selector=",".join(field_selectors),
+            )
         except BadRequestError:
             return dict(resources=[], api_found=True)
         except NotFoundError:
             if not wait or name is None:
                 return dict(resources=[], api_found=True)
-        except Exception as e:
-            if not wait or name is None:
-                err = "Exception '{0}' raised while trying to get resource using {1}".format(
-                    e, params
-                )
-                return dict(resources=[], msg=err, api_found=True)
 
         if not wait:
             result = result.to_dict()
@@ -492,27 +452,21 @@ class K8sAnsibleMixin(object):
                 and not result.get("items")
             )
 
-        last_exception = None
         while result_empty(result) and _elapsed() < wait_timeout:
             try:
-                result = resource.get(**params)
+                result = resource.get(
+                    name=name,
+                    namespace=namespace,
+                    label_selector=",".join(label_selectors),
+                    field_selector=",".join(field_selectors),
+                )
             except NotFoundError:
                 pass
-            except Exception as e:
-                last_exception = e
             if not result_empty(result):
                 break
             time.sleep(wait_sleep)
         if result_empty(result):
-            res = dict(resources=[], api_found=True)
-            if last_exception is not None:
-                res[
-                    "msg"
-                ] = "Exception '%s' raised while trying to get resource using %s" % (
-                    last_exception,
-                    params,
-                )
-            return res
+            return dict(resources=[], api_found=True)
 
         if isinstance(result, ResourceInstance):
             satisfied_by = []
@@ -553,15 +507,8 @@ class K8sAnsibleMixin(object):
                     if alias in self.params:
                         self.params.pop(alias)
 
-    def load_resource_definitions(self, src, module=None):
+    def load_resource_definitions(self, src):
         """Load the requested src path"""
-        if module and (
-            src.startswith("https://")
-            or src.startswith("http://")
-            or src.startswith("ftp://")
-        ):
-            src = fetch_file_from_url(module, src)
-
         result = None
         path = os.path.normpath(src)
         if not os.path.exists(path):
@@ -636,8 +583,6 @@ class K8sAnsibleMixin(object):
             except NotFoundError:
                 if state == "absent":
                     return True, {}, _wait_for_elapsed()
-            except Exception:
-                pass
         if response:
             response = response.to_dict()
         return False, response, _wait_for_elapsed()
@@ -776,7 +721,7 @@ class K8sAnsibleMixin(object):
 
         src = module.params.get("src")
         if src:
-            self.resource_definitions = self.load_resource_definitions(src, module)
+            self.resource_definitions = self.load_resource_definitions(src)
         try:
             self.resource_definitions = [
                 item for item in self.resource_definitions if item
@@ -884,9 +829,9 @@ class K8sAnsibleMixin(object):
         definition["apiVersion"] = resource.group_version
         metadata = definition.get("metadata", {})
         if not metadata.get("name") and not metadata.get("generateName"):
-            if hasattr(self, "name") and self.name:
+            if self.name:
                 metadata["name"] = self.name
-            elif hasattr(self, "generate_name") and self.generate_name:
+            elif self.generate_name:
                 metadata["generateName"] = self.generate_name
         if resource.namespaced and self.namespace and not metadata.get("namespace"):
             metadata["namespace"] = self.namespace
@@ -1035,7 +980,6 @@ class K8sAnsibleMixin(object):
                 if self.check_mode and not self.supports_dry_run:
                     return result
                 else:
-                    params = {"namespace": namespace}
                     if delete_options:
                         body = {
                             "apiVersion": "v1",
@@ -1046,18 +990,8 @@ class K8sAnsibleMixin(object):
                     if self.check_mode:
                         params["dry_run"] = "All"
                     try:
-                        if existing.kind.endswith("List"):
-                            result["result"] = []
-                            for item in existing.items:
-                                origin_name = item.metadata.name
-                                params["name"] = origin_name
-                                k8s_obj = resource.delete(**params)
-                                result["result"].append(k8s_obj.to_dict())
-                        else:
-                            origin_name = existing.metadata.name
-                            params["name"] = origin_name
-                            k8s_obj = resource.delete(**params)
-                            result["result"] = k8s_obj.to_dict()
+                        k8s_obj = resource.delete(**params)
+                        result["result"] = k8s_obj.to_dict()
                     except DynamicApiError as exc:
                         msg = "Failed to delete object: {0}".format(exc.body)
                         if continue_on_error:

plugins/module_utils/copy.py

@@ -24,9 +24,6 @@ from abc import ABCMeta, abstractmethod
 import tarfile
 
 # from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import AnsibleModule
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions import (
-    CoreException,
-)
 from ansible.module_utils._text import to_native
 
 try:
@@ -64,51 +61,6 @@ class K8SCopy(metaclass=ABCMeta):
         self.container_arg = {}
         if module.params.get("container"):
             self.container_arg["container"] = module.params.get("container")
-        self.check_mode = self.module.check_mode
-
-    def _run_from_pod(self, cmd):
-        try:
-            resp = stream(
-                self.api_instance.connect_get_namespaced_pod_exec,
-                self.name,
-                self.namespace,
-                command=cmd,
-                async_req=False,
-                stderr=True,
-                stdin=False,
-                stdout=True,
-                tty=False,
-                _preload_content=False,
-                **self.container_arg,
-            )
-
-            stderr, stdout = [], []
-            while resp.is_open():
-                resp.update(timeout=1)
-                if resp.peek_stdout():
-                    stdout.extend(resp.read_stdout().rstrip("\n").split("\n"))
-                if resp.peek_stderr():
-                    stderr.extend(resp.read_stderr().rstrip("\n").split("\n"))
-            error = resp.read_channel(ERROR_CHANNEL)
-            resp.close()
-            error = yaml.safe_load(error)
-            return error, stdout, stderr
-        except Exception as e:
-            self.module.fail_json(
-                msg="Error while running/parsing from pod {1}/{2} command='{0}' : {3}".format(
-                    self.namespace, self.name, cmd, to_native(e)
-                )
-            )
-
-    def is_directory_path_from_pod(self, file_path, failed_if_not_exists=True):
-        # check if file exists
-        error, out, err = self._run_from_pod(cmd=["test", "-e", file_path])
-        if error.get("status") != "Success":
-            if failed_if_not_exists:
-                return None, "%s does not exist in remote pod filesystem" % file_path
-            return False, None
-        error, out, err = self._run_from_pod(cmd=["test", "-d", file_path])
-        return error.get("status") == "Success", None
 
     @abstractmethod
     def run(self):
@@ -123,80 +75,56 @@ class K8SCopyFromPod(K8SCopy):
     def __init__(self, module, client):
         super(K8SCopyFromPod, self).__init__(module, client)
         self.is_remote_path_dir = None
-        self.files_to_copy = []
-        self._shellname = None
-
-    @property
-    def pod_shell(self):
-        if self._shellname is None:
-            for s in ("/bin/sh", "/bin/bash"):
-                error, out, err = self._run_from_pod(s)
-                if error.get("status") == "Success":
-                    self._shellname = s
-                    break
-        return self._shellname
-
-    def listfiles_with_find(self, path):
-        find_cmd = ["find", path, "-type", "f"]
-        error, files, err = self._run_from_pod(cmd=find_cmd)
-        if error.get("status") != "Success":
-            self.module.fail_json(msg=error.get("message"))
-        return files
-
-    def listfile_with_echo(self, path):
-        echo_cmd = [
-            self.pod_shell,
-            "-c",
-            "echo {path}/* {path}/.*".format(
-                path=path.translate(str.maketrans({" ": r"\ "}))
-            ),
-        ]
-        error, out, err = self._run_from_pod(cmd=echo_cmd)
-        if error.get("status") != "Success":
-            self.module.fail_json(msg=error.get("message"))
-
-        files = []
-        if out:
-            output = out[0] + " "
-            files = [
-                os.path.join(path, p[:-1])
-                for p in output.split(f"{path}/")
-                if p and p[:-1] not in (".", "..")
-            ]
-
-        result = []
-        for f in files:
-            is_dir, err = self.is_directory_path_from_pod(f)
-            if err:
-                continue
-            if not is_dir:
-                result.append(f)
-                continue
-            result += self.listfile_with_echo(f)
-        return result
+        self.files_to_copy = list()
 
     def list_remote_files(self):
         """
         This method will check if the remote path is a dir or file
         if it is a directory the file list will be updated accordingly
         """
-        # check is remote path exists and is a file or directory
-        is_dir, error = self.is_directory_path_from_pod(self.remote_path)
-        if error:
-            self.module.fail_json(msg=error)
-
-        if not is_dir:
-            return [self.remote_path]
-        else:
-            # find executable to list dir with
-            executables = dict(
-                find=self.listfiles_with_find,
-                echo=self.listfile_with_echo,
+        try:
+            find_cmd = ["find", self.remote_path, "-type", "f", "-name", "*"]
+            response = stream(
+                self.api_instance.connect_get_namespaced_pod_exec,
+                self.name,
+                self.namespace,
+                command=find_cmd,
+                stdout=True,
+                stderr=True,
+                stdin=False,
+                tty=False,
+                _preload_content=False,
+                **self.container_arg
+            )
+        except Exception as e:
+            self.module.fail_json(
+                msg="Failed to execute on pod {0}/{1} due to : {2}".format(
+                    self.namespace, self.name, to_native(e)
+                )
+            )
+        stderr = []
+        while response.is_open():
+            response.update(timeout=1)
+            if response.peek_stdout():
+                self.files_to_copy.extend(
+                    response.read_stdout().rstrip("\n").split("\n")
+                )
+            if response.peek_stderr():
+                err = response.read_stderr()
+                if "No such file or directory" in err:
+                    self.module.fail_json(
+                        msg="{0} does not exist in remote pod filesystem".format(
+                            self.remote_path
+                        )
+                    )
+                stderr.append(err)
+        error = response.read_channel(ERROR_CHANNEL)
+        response.close()
+        error = yaml.safe_load(error)
+        if error["status"] != "Success":
+            self.module.fail_json(
+                msg="Failed to execute on Pod due to: {0}".format(error)
             )
-            for item in executables:
-                error, out, err = self._run_from_pod(item)
-                if error.get("status") == "Success":
-                    return executables.get(item)(self.remote_path)
 
     def read(self):
         self.stdout = None
@@ -231,42 +159,40 @@ class K8SCopyFromPod(K8SCopy):
         if is_remote_path_dir and os.path.isdir(self.local_path):
             relpath_start = os.path.dirname(self.remote_path)
 
-        if not self.check_mode:
-            for remote_file in self.files_to_copy:
-                dest_file = self.local_path
-                if is_remote_path_dir:
-                    dest_file = os.path.join(
-                        self.local_path,
-                        os.path.relpath(remote_file, start=relpath_start),
-                    )
-                    # create directory to copy file in
-                    os.makedirs(os.path.dirname(dest_file), exist_ok=True)
-
-                pod_command = ["cat", remote_file]
-                self.response = stream(
-                    self.api_instance.connect_get_namespaced_pod_exec,
-                    self.name,
-                    self.namespace,
-                    command=pod_command,
-                    stderr=True,
-                    stdin=True,
-                    stdout=True,
-                    tty=False,
-                    _preload_content=False,
-                    **self.container_arg,
+        for remote_file in self.files_to_copy:
+            dest_file = self.local_path
+            if is_remote_path_dir:
+                dest_file = os.path.join(
+                    self.local_path, os.path.relpath(remote_file, start=relpath_start)
+                )
+                # create directory to copy file in
+                os.makedirs(os.path.dirname(dest_file), exist_ok=True)
+
+            pod_command = ["cat", remote_file]
+            self.response = stream(
+                self.api_instance.connect_get_namespaced_pod_exec,
+                self.name,
+                self.namespace,
+                command=pod_command,
+                stderr=True,
+                stdin=True,
+                stdout=True,
+                tty=False,
+                _preload_content=False,
+                **self.container_arg
+            )
+            errors = []
+            with open(dest_file, "wb") as fh:
+                while self.response._connected:
+                    self.read()
+                    if self.stdout:
+                        fh.write(self.stdout)
+                    if self.stderr:
+                        errors.append(self.stderr)
+            if errors:
+                self.module.fail_json(
+                    msg="Failed to copy file from Pod: {0}".format("".join(errors))
                 )
-                errors = []
-                with open(dest_file, "wb") as fh:
-                    while self.response._connected:
-                        self.read()
-                        if self.stdout:
-                            fh.write(self.stdout)
-                        if self.stderr:
-                            errors.append(self.stderr)
-                if errors:
-                    self.module.fail_json(
-                        msg="Failed to copy file from Pod: {0}".format("".join(errors))
-                    )
         self.module.exit_json(
             changed=True,
             result="{0} successfully copied locally into {1}".format(
@@ -275,7 +201,7 @@ class K8SCopyFromPod(K8SCopy):
         )
 
     def run(self):
-        self.files_to_copy = self.list_remote_files()
+        self.list_remote_files()
         if self.files_to_copy == []:
             self.module.exit_json(
                 changed=False,
@@ -295,6 +221,56 @@ class K8SCopyToPod(K8SCopy):
         super(K8SCopyToPod, self).__init__(module, client)
         self.files_to_copy = list()
 
+    def run_from_pod(self, command):
+        response = stream(
+            self.api_instance.connect_get_namespaced_pod_exec,
+            self.name,
+            self.namespace,
+            command=command,
+            stderr=True,
+            stdin=False,
+            stdout=True,
+            tty=False,
+            _preload_content=False,
+            **self.container_arg
+        )
+        errors = []
+        while response.is_open():
+            response.update(timeout=1)
+            if response.peek_stderr():
+                errors.append(response.read_stderr())
+        response.close()
+        err = response.read_channel(ERROR_CHANNEL)
+        err = yaml.safe_load(err)
+        response.close()
+        if err["status"] != "Success":
+            self.module.fail_json(
+                msg="Failed to run {0} on Pod.".format(command), errors=errors
+            )
+
+    def is_remote_path_dir(self):
+        pod_command = ["test", "-d", self.remote_path]
+        response = stream(
+            self.api_instance.connect_get_namespaced_pod_exec,
+            self.name,
+            self.namespace,
+            command=pod_command,
+            stdout=True,
+            stderr=True,
+            stdin=False,
+            tty=False,
+            _preload_content=False,
+            **self.container_arg
+        )
+        while response.is_open():
+            response.update(timeout=1)
+        err = response.read_channel(ERROR_CHANNEL)
+        err = yaml.safe_load(err)
+        response.close()
+        if err["status"] == "Success":
+            return True
+        return False
+
     def close_temp_file(self):
         if self.named_temp_file:
             self.named_temp_file.close()
@@ -317,12 +293,7 @@ class K8SCopyToPod(K8SCopy):
             if not os.access(self.local_path, os.R_OK):
                 self.module.fail_json(msg="{0} not readable".format(self.local_path))
 
-        is_dir, err = self.is_directory_path_from_pod(
-            self.remote_path, failed_if_not_exists=False
-        )
-        if err:
-            self.module.fail_json(msg=err)
-        if is_dir:
+        if self.is_remote_path_dir():
             if self.content:
                 self.module.fail_json(
                     msg="When content is specified, remote path should not be an existing directory"
@@ -330,67 +301,66 @@ class K8SCopyToPod(K8SCopy):
             else:
                 dest_file = os.path.join(dest_file, os.path.basename(src_file))
 
-        if not self.check_mode:
-            if self.no_preserve:
-                tar_command = [
-                    "tar",
-                    "--no-same-permissions",
-                    "--no-same-owner",
-                    "-xmf",
-                    "-",
-                ]
-            else:
-                tar_command = ["tar", "-xmf", "-"]
+        if self.no_preserve:
+            tar_command = [
+                "tar",
+                "--no-same-permissions",
+                "--no-same-owner",
+                "-xmf",
+                "-",
+            ]
+        else:
+            tar_command = ["tar", "-xmf", "-"]
 
-            if dest_file.startswith("/"):
-                tar_command.extend(["-C", "/"])
+        if dest_file.startswith("/"):
+            tar_command.extend(["-C", "/"])
 
-            response = stream(
-                self.api_instance.connect_get_namespaced_pod_exec,
-                self.name,
-                self.namespace,
-                command=tar_command,
-                stderr=True,
-                stdin=True,
-                stdout=True,
-                tty=False,
-                _preload_content=False,
-                **self.container_arg,
-            )
-            with TemporaryFile() as tar_buffer:
-                with tarfile.open(fileobj=tar_buffer, mode="w") as tar:
-                    tar.add(src_file, dest_file)
-                tar_buffer.seek(0)
-                commands = []
-                # push command in chunk mode
-                size = 1024 * 1024
-                while True:
-                    data = tar_buffer.read(size)
-                    if not data:
-                        break
-                    commands.append(data)
+        response = stream(
+            self.api_instance.connect_get_namespaced_pod_exec,
+            self.name,
+            self.namespace,
+            command=tar_command,
+            stderr=True,
+            stdin=True,
+            stdout=True,
+            tty=False,
+            _preload_content=False,
+            **self.container_arg
+        )
+        with TemporaryFile() as tar_buffer:
+            with tarfile.open(fileobj=tar_buffer, mode="w") as tar:
+                tar.add(src_file, dest_file)
+            tar_buffer.seek(0)
+            commands = []
+            # push command in chunk mode
+            size = 1024 * 1024
+            while True:
+                data = tar_buffer.read(size)
+                if not data:
+                    break
+                commands.append(data)
 
-                stderr, stdout = [], []
-                while response.is_open():
-                    if response.peek_stdout():
-                        stdout.append(response.read_stdout().rstrip("\n"))
-                    if response.peek_stderr():
-                        stderr.append(response.read_stderr().rstrip("\n"))
-                    if commands:
-                        cmd = commands.pop(0)
-                        response.write_stdin(cmd)
-                    else:
-                        break
-                response.close()
-                if stderr:
-                    self.close_temp_file()
-                    self.module.fail_json(
-                        command=tar_command,
-                        msg="Failed to copy local file/directory into Pod due to: {0}".format(
-                            "".join(stderr)
-                        ),
-                    )
-            self.close_temp_file()
+            stderr, stdout = [], []
+            while response.is_open():
+                if response.peek_stdout():
+                    stdout.append(response.read_stdout().rstrip("\n"))
+                if response.peek_stderr():
+                    stderr.append(response.read_stderr().rstrip("\n"))
+                if commands:
+                    cmd = commands.pop(0)
+                    response.write_stdin(cmd)
+                else:
+                    break
+            response.close()
+            if stderr:
+                self.close_temp_file()
+                self.module.fail_json(
+                    command=tar_command,
+                    msg="Failed to copy local file/directory into Pod due to: {0}".format(
+                        "".join(stderr)
+                    ),
+                )
+        self.close_temp_file()
         if self.content:
             self.module.exit_json(
                 changed=True,
@@ -406,24 +376,17 @@ class K8SCopyToPod(K8SCopy):
         )
 
 
-def check_pod(svc):
-    module = svc.module
+def check_pod(k8s_ansible_mixin, module):
+    resource = k8s_ansible_mixin.find_resource("Pod", None, True)
     namespace = module.params.get("namespace")
     name = module.params.get("pod")
     container = module.params.get("container")
 
-    try:
-        resource = svc.find_resource("Pod", None, True)
-    except CoreException as e:
-        module.fail_json(msg=to_native(e))
-
     def _fail(exc):
         arg = {}
         if hasattr(exc, "body"):
-            msg = (
-                "Namespace={0} Kind=Pod Name={1}: Failed requested object: {2}".format(
-                    namespace, name, exc.body
-                )
+            msg = "Namespace={0} Kind=Pod Name={1}: Failed requested object: {2}".format(
+                namespace, name, exc.body
             )
         else:
             msg = to_native(exc)
@@ -433,7 +396,7 @@ def check_pod(svc):
         module.fail_json(msg=msg, **arg)
 
     try:
-        result = svc.client.get(resource, name=name, namespace=namespace)
+        result = resource.get(name=name, namespace=namespace)
         containers = [
             c["name"] for c in result.to_dict()["status"]["containerStatuses"]
         ]

plugins/module_utils/exceptions.py

@@ -19,4 +19,4 @@ __metaclass__ = type
 
 
 class ApplyException(Exception):
-    """Could not apply patch"""
+    """ Could not apply patch """

plugins/module_utils/helm.py

@@ -7,31 +7,131 @@ from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
 
+from contextlib import contextmanager
 import os
 import tempfile
 import traceback
 import re
-import json
-import copy
 
 from ansible.module_utils.basic import missing_required_lib
-from ansible.module_utils.six import string_types
-from ansible_collections.kubernetes.core.plugins.module_utils.version import (
-    LooseVersion,
-)
-from ansible.module_utils.basic import AnsibleModule
+
 
 try:
     import yaml
 
     HAS_YAML = True
-    YAML_IMP_ERR = None
 except ImportError:
     YAML_IMP_ERR = traceback.format_exc()
     HAS_YAML = False
 
 
-def parse_helm_plugin_list(output=None):
+@contextmanager
+def prepare_helm_environ_update(module):
+    environ_update = {}
+    file_to_cleam_up = None
+    kubeconfig_path = module.params.get("kubeconfig")
+    if module.params.get("context") is not None:
+        environ_update["HELM_KUBECONTEXT"] = module.params.get("context")
+    if module.params.get("release_namespace"):
+        environ_update["HELM_NAMESPACE"] = module.params.get("release_namespace")
+    if module.params.get("api_key"):
+        environ_update["HELM_KUBETOKEN"] = module.params["api_key"]
+    if module.params.get("host"):
+        environ_update["HELM_KUBEAPISERVER"] = module.params["host"]
+    if module.params.get("validate_certs") is False or module.params.get("ca_cert"):
+        kubeconfig_path = write_temp_kubeconfig(
+            module.params["host"],
+            validate_certs=module.params["validate_certs"],
+            ca_cert=module.params["ca_cert"],
+        )
+        file_to_cleam_up = kubeconfig_path
+    if kubeconfig_path is not None:
+        environ_update["KUBECONFIG"] = kubeconfig_path
+
+    try:
+        yield environ_update
+    finally:
+        if file_to_cleam_up:
+            os.remove(file_to_cleam_up)
+
+
+def run_helm(module, command, fails_on_error=True):
+    if not HAS_YAML:
+        module.fail_json(msg=missing_required_lib("PyYAML"), exception=YAML_IMP_ERR)
+
+    with prepare_helm_environ_update(module) as environ_update:
+        rc, out, err = module.run_command(command, environ_update=environ_update)
+    if fails_on_error and rc != 0:
+        module.fail_json(
+            msg="Failure when executing Helm command. Exited {0}.\nstdout: {1}\nstderr: {2}".format(
+                rc, out, err
+            ),
+            stdout=out,
+            stderr=err,
+            command=command,
+        )
+    return rc, out, err
+
+
+def get_values(module, command, release_name):
+    """
+    Get Values from deployed release
+    """
+    if not HAS_YAML:
+        module.fail_json(msg=missing_required_lib("PyYAML"), exception=YAML_IMP_ERR)
+
+    get_command = command + " get values --output=yaml " + release_name
+
+    rc, out, err = run_helm(module, get_command)
+    # Helm 3 return "null" string when no values are set
+    if out.rstrip("\n") == "null":
+        return {}
+    return yaml.safe_load(out)
+
+
+def write_temp_kubeconfig(server, validate_certs=True, ca_cert=None):
+    # Workaround until https://github.com/helm/helm/pull/8622 is merged
+    content = {
+        "apiVersion": "v1",
+        "kind": "Config",
+        "clusters": [{"cluster": {"server": server}, "name": "generated-cluster"}],
+        "contexts": [
+            {"context": {"cluster": "generated-cluster"}, "name": "generated-context"}
+        ],
+        "current-context": "generated-context",
+    }
+
+    if not validate_certs:
+        content["clusters"][0]["cluster"]["insecure-skip-tls-verify"] = True
+    if ca_cert:
+        content["clusters"][0]["cluster"]["certificate-authority"] = ca_cert
+
+    _fd, file_name = tempfile.mkstemp()
+    with os.fdopen(_fd, "w") as fp:
+        yaml.dump(content, fp)
+    return file_name
+
+
+def get_helm_plugin_list(module, helm_bin=None):
+    """
+    Return `helm plugin list`
+    """
+    if not helm_bin:
+        return []
+    helm_plugin_list = helm_bin + " list"
+    rc, out, err = run_helm(module, helm_plugin_list)
+    if rc != 0 or (out == "" and err == ""):
+        module.fail_json(
+            msg="Failed to get Helm plugin info",
+            command=helm_plugin_list,
+            stdout=out,
+            stderr=err,
+            rc=rc,
+        )
+    return (rc, out, err)
+
+
+def parse_helm_plugin_list(module, output=None):
     """
     Parse `helm plugin list`, return list of plugins
     """
@@ -53,251 +153,12 @@ def parse_helm_plugin_list(output=None):
     return ret
 
 
-def write_temp_kubeconfig(server, validate_certs=True, ca_cert=None, kubeconfig=None):
-    # Workaround until https://github.com/helm/helm/pull/8622 is merged
-    content = {
-        "apiVersion": "v1",
-        "kind": "Config",
-        "clusters": [{"cluster": {"server": server}, "name": "generated-cluster"}],
-        "contexts": [
-            {"context": {"cluster": "generated-cluster"}, "name": "generated-context"}
-        ],
-        "current-context": "generated-context",
-    }
-    if kubeconfig:
-        content = copy.deepcopy(kubeconfig)
+def get_helm_version(module, helm_bin):
 
-    for cluster in content["clusters"]:
-        if server:
-            cluster["cluster"]["server"] = server
-        if not validate_certs:
-            cluster["cluster"]["insecure-skip-tls-verify"] = True
-        if ca_cert:
-            cluster["cluster"]["certificate-authority"] = ca_cert
-    return content
-
-
-class AnsibleHelmModule(object):
-
-    """
-    An Ansible module class for Kubernetes.core helm modules
-    """
-
-    def __init__(self, **kwargs):
-
-        self._module = None
-        if "module" in kwargs:
-            self._module = kwargs.get("module")
-        else:
-            self._module = AnsibleModule(**kwargs)
-
-        self.helm_env = None
-
-    def __getattr__(self, name):
-        return getattr(self._module, name)
-
-    @property
-    def params(self):
-        return self._module.params
-
-    def _prepare_helm_environment(self):
-        param_to_env_mapping = [
-            ("context", "HELM_KUBECONTEXT"),
-            ("release_namespace", "HELM_NAMESPACE"),
-            ("api_key", "HELM_KUBETOKEN"),
-            ("host", "HELM_KUBEAPISERVER"),
-        ]
-
-        env_update = {}
-        for p, env in param_to_env_mapping:
-            if self.params.get(p):
-                env_update[env] = self.params.get(p)
-
-        kubeconfig_content = None
-        kubeconfig = self.params.get("kubeconfig")
-        if kubeconfig:
-            if isinstance(kubeconfig, string_types):
-                with open(kubeconfig) as fd:
-                    kubeconfig_content = yaml.safe_load(fd)
-            elif isinstance(kubeconfig, dict):
-                kubeconfig_content = kubeconfig
-
-        if self.params.get("ca_cert"):
-            ca_cert = self.params.get("ca_cert")
-            if LooseVersion(self.get_helm_version()) < LooseVersion("3.5.0"):
-                # update certs from kubeconfig
-                kubeconfig_content = write_temp_kubeconfig(
-                    server=self.params.get("host"),
-                    ca_cert=ca_cert,
-                    kubeconfig=kubeconfig_content,
-                )
-            else:
-                env_update["HELM_KUBECAFILE"] = ca_cert
-
-        if self.params.get("validate_certs") is False:
-            validate_certs = self.params.get("validate_certs")
-            if LooseVersion(self.get_helm_version()) < LooseVersion("3.10.0"):
-                # update certs from kubeconfig
-                kubeconfig_content = write_temp_kubeconfig(
-                    server=self.params.get("host"),
-                    validate_certs=validate_certs,
-                    kubeconfig=kubeconfig_content,
-                )
-            else:
-                env_update["HELM_KUBEINSECURE_SKIP_TLS_VERIFY"] = "true"
-
-        if kubeconfig_content:
-            fd, kubeconfig_path = tempfile.mkstemp()
-            with os.fdopen(fd, "w") as fp:
-                json.dump(kubeconfig_content, fp)
-
-            env_update["KUBECONFIG"] = kubeconfig_path
-            self.add_cleanup_file(kubeconfig_path)
-
-        return env_update
-
-    @property
-    def env_update(self):
-        if self.helm_env is None:
-            self.helm_env = self._prepare_helm_environment()
-        return self.helm_env
-
-    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)
-        if fails_on_error and rc != 0:
-            self.fail_json(
-                msg="Failure when executing Helm command. Exited {0}.\nstdout: {1}\nstderr: {2}".format(
-                    rc, out, err
-                ),
-                stdout=out,
-                stderr=err,
-                command=command,
-            )
-        return rc, out, err
-
-    def get_helm_binary(self):
-        return self.params.get("binary_path") or self.get_bin_path(
-            "helm", required=True
-        )
-
-    def get_helm_version(self):
-
-        command = self.get_helm_binary() + " version"
-        rc, out, err = self.run_command(command)
+    helm_version_command = helm_bin + " version"
+    rc, out, err = module.run_command(helm_version_command)
+    if rc == 0:
         m = re.match(r'version.BuildInfo{Version:"v([0-9\.]*)",', out)
         if m:
             return m.group(1)
-        m = re.match(r'Client: &version.Version{SemVer:"v([0-9\.]*)", ', out)
-        if m:
-            return m.group(1)
-        return None
-
-    def get_values(self, release_name, get_all=False):
-        """
-        Get Values from deployed release
-        """
-        if not HAS_YAML:
-            self.fail_json(msg=missing_required_lib("PyYAML"), exception=YAML_IMP_ERR)
-
-        get_command = (
-            self.get_helm_binary() + " get values --output=yaml " + release_name
-        )
-
-        if get_all:
-            get_command += " -a"
-
-        rc, out, err = self.run_helm_command(get_command)
-        # Helm 3 return "null" string when no values are set
-        if out.rstrip("\n") == "null":
-            return {}
-        return yaml.safe_load(out)
-
-    def parse_yaml_content(self, content):
-
-        if not HAS_YAML:
-            self.fail_json(msg=missing_required_lib("yaml"), exception=HAS_YAML)
-
-        try:
-            return list(yaml.safe_load_all(content))
-        except (IOError, yaml.YAMLError) as exc:
-            self.fail_json(
-                msg="Error parsing YAML content: {0}".format(exc), raw_data=content
-            )
-
-    def get_manifest(self, release_name):
-
-        command = [
-            self.get_helm_binary(),
-            "get",
-            "manifest",
-            release_name,
-        ]
-        rc, out, err = self.run_helm_command(" ".join(command))
-        if rc != 0:
-            self.fail_json(msg=err)
-        return self.parse_yaml_content(out)
-
-    def get_notes(self, release_name):
-
-        command = [
-            self.get_helm_binary(),
-            "get",
-            "notes",
-            release_name,
-        ]
-        rc, out, err = self.run_helm_command(" ".join(command))
-        if rc != 0:
-            self.fail_json(msg=err)
-        return out
-
-    def get_hooks(self, release_name):
-        command = [
-            self.get_helm_binary(),
-            "get",
-            "hooks",
-            release_name,
-        ]
-        rc, out, err = self.run_helm_command(" ".join(command))
-        if rc != 0:
-            self.fail_json(msg=err)
-        return self.parse_yaml_content(out)
-
-    def get_helm_plugin_list(self):
-        """
-        Return `helm plugin list`
-        """
-        helm_plugin_list = self.get_helm_binary() + " plugin list"
-        rc, out, err = self.run_helm_command(helm_plugin_list)
-        if rc != 0 or (out == "" and err == ""):
-            self.fail_json(
-                msg="Failed to get Helm plugin info",
-                command=helm_plugin_list,
-                stdout=out,
-                stderr=err,
-                rc=rc,
-            )
-        return (rc, out, err, helm_plugin_list)
-
-    def get_helm_set_values_args(self, set_values):
-        if any(v.get("value_type") == "json" for v in set_values):
-            if LooseVersion(self.get_helm_version()) < LooseVersion("3.10.0"):
-                self.fail_json(
-                    msg="This module requires helm >= 3.10.0, to use set_values parameter with value type set to 'json'. current version is {0}".format(
-                        self.get_helm_version()
-                    )
-                )
-
-        options = []
-        for opt in set_values:
-            value_type = opt.get("value_type", "raw")
-            value = opt.get("value")
-
-            if value_type == "raw":
-                options.append("--set " + value)
-            else:
-                options.append("--set-{0} '{1}'".format(value_type, value))
-
-        return " ".join(options)
+    return None

plugins/module_utils/helm_args_common.py

@@ -1,42 +0,0 @@
-from __future__ import absolute_import, division, print_function
-
-from ansible.module_utils.basic import env_fallback
-
-__metaclass__ = type
-
-
-HELM_AUTH_ARG_SPEC = dict(
-    binary_path=dict(type="path"),
-    context=dict(
-        type="str",
-        aliases=["kube_context"],
-        fallback=(env_fallback, ["K8S_AUTH_CONTEXT"]),
-    ),
-    kubeconfig=dict(
-        type="raw",
-        aliases=["kubeconfig_path"],
-        fallback=(env_fallback, ["K8S_AUTH_KUBECONFIG"]),
-    ),
-    host=dict(type="str", fallback=(env_fallback, ["K8S_AUTH_HOST"])),
-    ca_cert=dict(
-        type="path",
-        aliases=["ssl_ca_cert"],
-        fallback=(env_fallback, ["K8S_AUTH_SSL_CA_CERT"]),
-    ),
-    validate_certs=dict(
-        type="bool",
-        default=True,
-        aliases=["verify_ssl"],
-        fallback=(env_fallback, ["K8S_AUTH_VERIFY_SSL"]),
-    ),
-    api_key=dict(
-        type="str",
-        no_log=True,
-        fallback=(env_fallback, ["K8S_AUTH_API_KEY"]),
-    ),
-)
-
-HELM_AUTH_MUTUALLY_EXCLUSIVE = [
-    ("context", "ca_cert"),
-    ("context", "validate_certs"),
-]

plugins/module_utils/k8s/client.py

@@ -1,368 +0,0 @@
-# Copyright: (c) 2021, Red Hat | Ansible
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-import os
-import hashlib
-from typing import Any, Dict, List, Optional
-
-from ansible.module_utils.six import iteritems, string_types
-
-from ansible_collections.kubernetes.core.plugins.module_utils.args_common import (
-    AUTH_ARG_MAP,
-    AUTH_ARG_SPEC,
-    AUTH_PROXY_HEADERS_SPEC,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.core import (
-    requires as _requires,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions import (
-    CoreException,
-)
-
-try:
-    from ansible_collections.kubernetes.core.plugins.module_utils import (
-        k8sdynamicclient,
-    )
-    from ansible_collections.kubernetes.core.plugins.module_utils.client.discovery import (
-        LazyDiscoverer,
-    )
-except ImportError:
-    # Handled in module setup
-    pass
-
-try:
-    import kubernetes
-    from kubernetes.dynamic.exceptions import (
-        ResourceNotFoundError,
-        ResourceNotUniqueError,
-    )
-    from kubernetes.dynamic.resource import Resource
-except ImportError:
-    # kubernetes import error is handled in module setup
-    # This is defined only for the sake of Ansible's checked import requirement
-    Resource = Any  # type: ignore
-
-try:
-    import urllib3
-
-    urllib3.disable_warnings()
-except ImportError:
-    # Handled in module setup
-    pass
-
-
-_pool = {}
-
-
-class unique_string(str):
-    _low = None
-
-    def __hash__(self):
-        return id(self)
-
-    def __eq__(self, other):
-        return self is other
-
-    def lower(self):
-        if self._low is None:
-            lower = str.lower(self)
-            if str.__eq__(lower, self):
-                self._low = self
-            else:
-                self._low = unique_string(lower)
-        return self._low
-
-
-def _create_auth_spec(module=None, **kwargs) -> Dict:
-    auth: Dict = {}
-    # If authorization variables aren't defined, look for them in environment variables
-    for true_name, arg_name in AUTH_ARG_MAP.items():
-        if module and module.params.get(arg_name) is not None:
-            auth[true_name] = module.params.get(arg_name)
-        elif arg_name in kwargs and kwargs.get(arg_name) is not None:
-            auth[true_name] = kwargs.get(arg_name)
-        elif true_name in kwargs and kwargs.get(true_name) is not None:
-            # Aliases in kwargs
-            auth[true_name] = kwargs.get(true_name)
-        elif arg_name == "proxy_headers":
-            # specific case for 'proxy_headers' which is a dictionary
-            proxy_headers = {}
-            for key in AUTH_PROXY_HEADERS_SPEC.keys():
-                env_value = os.getenv(
-                    "K8S_AUTH_PROXY_HEADERS_{0}".format(key.upper()), None
-                )
-                if env_value is not None:
-                    if AUTH_PROXY_HEADERS_SPEC[key].get("type") == "bool":
-                        env_value = env_value.lower() not in ["0", "false", "no"]
-                    proxy_headers[key] = env_value
-            if proxy_headers is not {}:
-                auth[true_name] = proxy_headers
-        else:
-            env_value = os.getenv(
-                "K8S_AUTH_{0}".format(arg_name.upper()), None
-            ) or os.getenv("K8S_AUTH_{0}".format(true_name.upper()), None)
-            if env_value is not None:
-                if AUTH_ARG_SPEC[arg_name].get("type") == "bool":
-                    env_value = env_value.lower() not in ["0", "false", "no"]
-                auth[true_name] = env_value
-
-    return auth
-
-
-def _load_config(auth: Dict) -> None:
-    kubeconfig = auth.get("kubeconfig")
-    optional_arg = {
-        "context": auth.get("context"),
-        "persist_config": auth.get("persist_config"),
-    }
-    if kubeconfig:
-        if isinstance(kubeconfig, string_types):
-            kubernetes.config.load_kube_config(config_file=kubeconfig, **optional_arg)
-        elif isinstance(kubeconfig, dict):
-            kubernetes.config.load_kube_config_from_dict(
-                config_dict=kubeconfig, **optional_arg
-            )
-    else:
-        kubernetes.config.load_kube_config(config_file=None, **optional_arg)
-
-
-def _create_configuration(auth: Dict):
-    def auth_set(*names: list) -> bool:
-        return all(auth.get(name) for name in names)
-
-    if auth_set("host"):
-        # Removing trailing slashes if any from hostname
-        auth["host"] = auth.get("host").rstrip("/")
-
-    if (
-        auth_set("username", "password", "host")
-        or auth_set("api_key", "host")
-        or auth_set("cert_file", "key_file", "host")
-    ):
-        # We have enough in the parameters to authenticate, no need to load incluster or kubeconfig
-        pass
-    elif auth_set("kubeconfig") or auth_set("context"):
-        try:
-            _load_config(auth)
-        except Exception as err:
-            raise err
-
-    else:
-        # First try to do incluster config, then kubeconfig
-        try:
-            kubernetes.config.load_incluster_config()
-        except kubernetes.config.ConfigException:
-            try:
-                _load_config(auth)
-            except Exception as err:
-                raise err
-
-    # Override any values in the default configuration with Ansible parameters
-    # As of kubernetes-client v12.0.0, get_default_copy() is required here
-    try:
-        configuration = kubernetes.client.Configuration().get_default_copy()
-    except AttributeError:
-        configuration = kubernetes.client.Configuration()
-
-    for key, value in iteritems(auth):
-        if key in AUTH_ARG_MAP.keys() and value is not None:
-            if key == "api_key":
-                setattr(
-                    configuration, key, {"authorization": "Bearer {0}".format(value)}
-                )
-            elif key == "proxy_headers":
-                headers = urllib3.util.make_headers(**value)
-                setattr(configuration, key, headers)
-            else:
-                setattr(configuration, key, value)
-
-    return configuration
-
-
-def _create_headers(module=None, **kwargs):
-    header_map = {
-        "impersonate_user": "Impersonate-User",
-        "impersonate_groups": "Impersonate-Group",
-    }
-
-    headers = {}
-    for arg_name, header_name in header_map.items():
-        value = None
-        if module and module.params.get(arg_name) is not None:
-            value = module.params.get(arg_name)
-        elif arg_name in kwargs and kwargs.get(arg_name) is not None:
-            value = kwargs.get(arg_name)
-        else:
-            value = os.getenv("K8S_AUTH_{0}".format(arg_name.upper()), None)
-            if value is not None:
-                if AUTH_ARG_SPEC[arg_name].get("type") == "list":
-                    value = [x for x in value.split(",") if x != ""]
-        if value:
-            headers[header_name] = value
-    return headers
-
-
-def _configuration_digest(configuration, **kwargs) -> str:
-    m = hashlib.sha256()
-    for k in AUTH_ARG_MAP:
-        if not hasattr(configuration, k):
-            v = None
-        else:
-            v = getattr(configuration, k)
-        if v and k in ["ssl_ca_cert", "cert_file", "key_file"]:
-            with open(str(v), "r") as fd:
-                content = fd.read()
-                m.update(content.encode())
-        else:
-            m.update(str(v).encode())
-    for k, v in kwargs.items():
-        content = "{0}: {1}".format(k, v)
-        m.update(content.encode())
-    digest = m.hexdigest()
-
-    return digest
-
-
-def _set_header(client, header, value):
-    if isinstance(value, list):
-        for v in value:
-            client.set_default_header(header_name=unique_string(header), header_value=v)
-    else:
-        client.set_default_header(header_name=header, header_value=value)
-
-
-def cache(func):
-    def wrapper(*args, **kwargs):
-        client = None
-        hashable_kwargs = {}
-        for k, v in kwargs.items():
-            if isinstance(v, list):
-                hashable_kwargs[k] = ",".join(sorted(v))
-            else:
-                hashable_kwargs[k] = v
-        digest = _configuration_digest(*args, **hashable_kwargs)
-        if digest in _pool:
-            client = _pool[digest]
-        else:
-            client = func(*args, **kwargs)
-            _pool[digest] = client
-
-        return client
-
-    return wrapper
-
-
-@cache
-def create_api_client(configuration, **headers):
-    client = kubernetes.client.ApiClient(configuration)
-    for header, value in headers.items():
-        _set_header(client, header, value)
-    return k8sdynamicclient.K8SDynamicClient(client, discoverer=LazyDiscoverer)
-
-
-class K8SClient:
-    """A Client class for K8S modules.
-
-    This class has the primary purpose to proxy the kubernetes client and resource objects.
-    If there is a need for other methods or attributes to be proxied, they can be added here.
-    """
-
-    K8S_SERVER_DRY_RUN = "All"
-
-    def __init__(self, configuration, client, dry_run: bool = False) -> None:
-        self.configuration = configuration
-        self.client = client
-        self.dry_run = dry_run
-
-    @property
-    def resources(self) -> List[Any]:
-        return self.client.resources
-
-    def _find_resource_with_prefix(
-        self, prefix: str, kind: str, api_version: str
-    ) -> Resource:
-        for attribute in ["kind", "name", "singular_name"]:
-            try:
-                return self.client.resources.get(
-                    **{"prefix": prefix, "api_version": api_version, attribute: kind}
-                )
-            except (ResourceNotFoundError, ResourceNotUniqueError):
-                pass
-        return self.client.resources.get(
-            prefix=prefix, api_version=api_version, short_names=[kind]
-        )
-
-    def resource(self, kind: str, api_version: str) -> Resource:
-        """Fetch a kubernetes client resource.
-
-        This will attempt to find a kubernetes resource trying, in order, kind,
-        name, singular_name and short_names.
-        """
-        try:
-            if api_version == "v1":
-                return self._find_resource_with_prefix("api", kind, api_version)
-        except ResourceNotFoundError:
-            pass
-        return self._find_resource_with_prefix(None, kind, api_version)
-
-    def _ensure_dry_run(self, params: Dict) -> Dict:
-        if self.dry_run:
-            params["dry_run"] = self.K8S_SERVER_DRY_RUN
-        return params
-
-    def validate(
-        self, resource, version: Optional[str] = None, strict: Optional[bool] = False
-    ):
-        return self.client.validate(resource, version, strict)
-
-    def get(self, resource, **params):
-        return resource.get(**params)
-
-    def delete(self, resource, **params):
-        return resource.delete(**self._ensure_dry_run(params))
-
-    def apply(self, resource, definition, namespace, **params):
-        return resource.apply(
-            definition, namespace=namespace, **self._ensure_dry_run(params)
-        )
-
-    def create(self, resource, definition, **params):
-        return resource.create(definition, **self._ensure_dry_run(params))
-
-    def replace(self, resource, definition, **params):
-        return resource.replace(definition, **self._ensure_dry_run(params))
-
-    def patch(self, resource, definition, **params):
-        return resource.patch(definition, **self._ensure_dry_run(params))
-
-
-def get_api_client(module=None, **kwargs: Optional[Any]) -> K8SClient:
-    auth_spec = _create_auth_spec(module, **kwargs)
-    if module:
-        requires = module.requires
-    else:
-        requires = _requires
-    if isinstance(auth_spec.get("kubeconfig"), dict):
-        requires("kubernetes", "17.17.0", "to use in-memory config")
-    if auth_spec.get("no_proxy"):
-        requires("kubernetes", "19.15.0", "to use the no_proxy feature")
-
-    try:
-        configuration = _create_configuration(auth_spec)
-        headers = _create_headers(module, **kwargs)
-        client = create_api_client(configuration, **headers)
-    except kubernetes.config.ConfigException as e:
-        msg = "Could not create API client: {0}".format(e)
-        raise CoreException(msg) from e
-
-    dry_run = False
-    if module and module.server_side_dry_run:
-        dry_run = True
-
-    k8s_client = K8SClient(
-        configuration=configuration,
-        client=client,
-        dry_run=dry_run,
-    )
-
-    return k8s_client

plugins/module_utils/k8s/core.py

@@ -1,175 +0,0 @@
-import traceback
-
-from typing import Optional
-
-from ansible_collections.kubernetes.core.plugins.module_utils.version import (
-    LooseVersion,
-)
-
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.basic import missing_required_lib
-from ansible.module_utils.common.text.converters import to_text
-
-
-class AnsibleK8SModule:
-    """A base module class for K8S modules.
-
-    This class should be used instead of directly using AnsibleModule. If there
-    is a need for other methods or attributes to be proxied, they can be added
-    here.
-    """
-
-    default_settings = {
-        "check_k8s": True,
-        "check_pyyaml": True,
-        "module_class": AnsibleModule,
-    }
-
-    def __init__(self, **kwargs) -> None:
-        local_settings = {}
-        for key in AnsibleK8SModule.default_settings:
-            try:
-                local_settings[key] = kwargs.pop(key)
-            except KeyError:
-                local_settings[key] = AnsibleK8SModule.default_settings[key]
-        self.settings = local_settings
-
-        self._module = self.settings["module_class"](**kwargs)
-
-        if self.settings["check_k8s"]:
-            self.requires("kubernetes")
-            self.has_at_least("kubernetes", "12.0.0", warn=True)
-
-        if self.settings["check_pyyaml"]:
-            self.requires("pyyaml")
-
-    @property
-    def check_mode(self):
-        return self._module.check_mode
-
-    @property
-    def server_side_dry_run(self):
-        return self.check_mode and self.has_at_least("kubernetes", "18.20.0")
-
-    @property
-    def _diff(self):
-        return self._module._diff
-
-    @property
-    def _name(self):
-        return self._module._name
-
-    @property
-    def params(self):
-        return self._module.params
-
-    def warn(self, *args, **kwargs):
-        return self._module.warn(*args, **kwargs)
-
-    def deprecate(self, *args, **kwargs):
-        return self._module.deprecate(*args, **kwargs)
-
-    def debug(self, *args, **kwargs):
-        return self._module.debug(*args, **kwargs)
-
-    def exit_json(self, *args, **kwargs):
-        return self._module.exit_json(*args, **kwargs)
-
-    def fail_json(self, *args, **kwargs):
-        return self._module.fail_json(*args, **kwargs)
-
-    def fail_from_exception(self, exception):
-        msg = to_text(exception)
-        tb = "".join(
-            traceback.format_exception(None, exception, exception.__traceback__)
-        )
-        return self.fail_json(msg=msg, exception=tb)
-
-    def has_at_least(
-        self, dependency: str, minimum: Optional[str] = None, warn: bool = False
-    ) -> bool:
-        supported = has_at_least(dependency, minimum)
-        if not supported and warn:
-            self.warn(
-                "{0}<{1} is not supported or tested. Some features may not work.".format(
-                    dependency, minimum
-                )
-            )
-        return supported
-
-    def requires(
-        self,
-        dependency: str,
-        minimum: Optional[str] = None,
-        reason: Optional[str] = None,
-    ) -> None:
-        try:
-            requires(dependency, minimum, reason=reason)
-        except Exception as e:
-            self.fail_json(msg=to_text(e))
-
-
-def gather_versions() -> dict:
-    versions = {}
-    try:
-        import jsonpatch
-
-        versions["jsonpatch"] = jsonpatch.__version__
-    except ImportError:
-        pass
-
-    try:
-        import kubernetes
-
-        versions["kubernetes"] = kubernetes.__version__
-    except ImportError:
-        pass
-
-    try:
-        import kubernetes_validate
-
-        versions["kubernetes-validate"] = kubernetes_validate.__version__
-    except ImportError:
-        pass
-
-    try:
-        import yaml
-
-        versions["pyyaml"] = yaml.__version__
-    except ImportError:
-        pass
-
-    return versions
-
-
-def has_at_least(dependency: str, minimum: Optional[str] = None) -> bool:
-    """Check if a specific dependency is present at a minimum version.
-
-    If a minimum version is not specified it will check only that the
-    dependency is present.
-    """
-    dependencies = gather_versions()
-    current = dependencies.get(dependency)
-    if current is not None:
-        if minimum is None:
-            return True
-        supported = LooseVersion(current) >= LooseVersion(minimum)
-        return supported
-    return False
-
-
-def requires(
-    dependency: str, minimum: Optional[str] = None, reason: Optional[str] = None
-) -> None:
-    """Fail if a specific dependency is not present at a minimum version.
-
-    If a minimum version is not specified it will require only that the
-    dependency is present. This function raises an exception when the
-    dependency is not found at the required version.
-    """
-    if not has_at_least(dependency, minimum):
-        if minimum is not None:
-            lib = "{0}>={1}".format(dependency, minimum)
-        else:
-            lib = dependency
-        raise Exception(missing_required_lib(lib, reason=reason))

plugins/module_utils/k8s/exceptions.py

@@ -1,12 +0,0 @@
-# Copyright: (c) 2021, Red Hat | Ansible
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-
-class CoreException(Exception):
-    pass
-
-
-class ResourceTimeout(CoreException):
-    def __init__(self, message="", result=None):
-        self.result = result or {}
-        super().__init__(message)

plugins/module_utils/k8s/resource.py

@@ -1,134 +0,0 @@
-# Copyright: (c) 2021, Red Hat | Ansible
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-import os
-from typing import cast, Dict, Iterable, List, Optional, Union
-
-from ansible.module_utils.six import string_types
-from ansible.module_utils.urls import Request
-
-try:
-    import yaml
-except ImportError:
-    # Handled in module setup
-    pass
-
-
-class ResourceDefinition(dict):
-    """Representation of a resource definition.
-
-    This is a thin wrapper around a dictionary representation of a resource
-    definition, with a few properties defined for conveniently accessing the
-    commonly used fields.
-    """
-
-    @property
-    def kind(self) -> Optional[str]:
-        return self.get("kind")
-
-    @property
-    def api_version(self) -> Optional[str]:
-        return self.get("apiVersion")
-
-    @property
-    def namespace(self) -> Optional[str]:
-        metadata = self.get("metadata", {})
-        return metadata.get("namespace")
-
-    @property
-    def name(self) -> Optional[str]:
-        metadata = self.get("metadata", {})
-        return metadata.get("name")
-
-
-def create_definitions(params: Dict) -> List[ResourceDefinition]:
-    """Create a list of ResourceDefinitions from module inputs.
-
-    This will take the module's inputs and return a list of ResourceDefintion
-    objects. The resource definitions returned by this function should be as
-    complete a definition as we can create based on the input. Any *List kinds
-    will be removed and replaced by the resources contained in it.
-    """
-    if params.get("resource_definition"):
-        d = cast(Union[str, List, Dict], params.get("resource_definition"))
-        definitions = from_yaml(d)
-    elif params.get("src"):
-        d = cast(str, params.get("src"))
-        if hasattr(d, "startswith") and d.startswith(("https://", "http://", "ftp://")):
-            data = Request().open("GET", d).read().decode("utf8")
-            definitions = from_yaml(data)
-        else:
-            definitions = from_file(d)
-    else:
-        # We'll create an empty definition and let merge_params set values
-        # from the module parameters.
-        definitions = [{}]
-
-    resource_definitions: List[Dict] = []
-    for definition in definitions:
-        merge_params(definition, params)
-        kind = cast(Optional[str], definition.get("kind"))
-        if kind and kind.endswith("List"):
-            resource_definitions += flatten_list_kind(definition, params)
-        else:
-            resource_definitions.append(definition)
-    return list(map(ResourceDefinition, resource_definitions))
-
-
-def from_yaml(definition: Union[str, List, Dict]) -> Iterable[Dict]:
-    """Load resource definitions from a yaml definition."""
-    definitions: List[Dict] = []
-    if isinstance(definition, string_types):
-        definitions += yaml.safe_load_all(definition)
-    elif isinstance(definition, list):
-        for item in definition:
-            if isinstance(item, string_types):
-                definitions += yaml.safe_load_all(item)
-            else:
-                definitions.append(item)
-    else:
-        definition = cast(Dict, definition)
-        definitions.append(definition)
-    return filter(None, definitions)
-
-
-def from_file(filepath: str) -> Iterable[Dict]:
-    """Load resource definitions from a path to a yaml file."""
-    path = os.path.normpath(filepath)
-    with open(path, "rb") as f:
-        definitions = list(yaml.safe_load_all(f))
-    return filter(None, definitions)
-
-
-def merge_params(definition: Dict, params: Dict) -> Dict:
-    """Merge module parameters with the resource definition.
-
-    Fields in the resource definition take precedence over module parameters.
-    """
-    definition.setdefault("kind", params.get("kind"))
-    definition.setdefault("apiVersion", params.get("api_version"))
-    metadata = definition.setdefault("metadata", {})
-    # The following should only be set if we have values for them
-    if params.get("namespace"):
-        metadata.setdefault("namespace", params.get("namespace"))
-    if params.get("name"):
-        metadata.setdefault("name", params.get("name"))
-    if params.get("generate_name"):
-        metadata.setdefault("generateName", params.get("generate_name"))
-    return definition
-
-
-def flatten_list_kind(definition: Dict, params: Dict) -> List[Dict]:
-    """Replace *List kind with the items it contains.
-
-    This will take a definition for a *List resource and return a list of
-    definitions for the items contained within the List.
-    """
-    items = []
-    kind = cast(str, definition.get("kind"))[:-4]
-    api_version = definition.get("apiVersion")
-    for item in definition.get("items", []):
-        item.setdefault("kind", kind)
-        item.setdefault("apiVersion", api_version)
-        items.append(merge_params(item, params))
-    return items

plugins/module_utils/k8s/runner.py

@@ -1,199 +0,0 @@
-# Copyright: (c) 2021, Red Hat | Ansible
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from typing import Dict
-
-from ansible.module_utils._text import to_native
-
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
-    get_api_client,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions import (
-    CoreException,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.resource import (
-    create_definitions,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.service import (
-    K8sService,
-    diff_objects,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions import (
-    ResourceTimeout,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.waiter import exists
-from ansible_collections.kubernetes.core.plugins.module_utils.selector import (
-    LabelSelectorFilter,
-)
-
-
-def validate(client, module, resource):
-    def _prepend_resource_info(resource, msg):
-        return "%s %s: %s" % (resource["kind"], resource["metadata"]["name"], msg)
-
-    module.requires("kubernetes-validate")
-
-    warnings, errors = client.validate(
-        resource,
-        module.params["validate"].get("version"),
-        module.params["validate"].get("strict"),
-    )
-
-    if errors and module.params["validate"]["fail_on_error"]:
-        module.fail_json(
-            msg="\n".join([_prepend_resource_info(resource, error) for error in errors])
-        )
-    return [_prepend_resource_info(resource, msg) for msg in warnings + errors]
-
-
-def run_module(module) -> None:
-    results = []
-    changed = False
-    client = get_api_client(module)
-    svc = K8sService(client, module)
-    try:
-        definitions = create_definitions(module.params)
-    except Exception as e:
-        msg = "Failed to load resource definition: {0}".format(e)
-        raise CoreException(msg) from e
-
-    for definition in definitions:
-        result = {"changed": False, "result": {}}
-        warnings = []
-
-        if module.params.get("validate") is not None:
-            warnings = validate(client, module, definition)
-
-        try:
-            result = perform_action(svc, definition, module.params)
-        except Exception as e:
-            try:
-                error = e.result
-            except AttributeError:
-                error = {}
-            try:
-                error["reason"] = e.__cause__.reason
-            except AttributeError:
-                pass
-            error["msg"] = to_native(e)
-            if warnings:
-                error.setdefault("warnings", []).extend(warnings)
-
-            if module.params.get("continue_on_error"):
-                result["error"] = error
-            else:
-                module.fail_json(**error)
-
-        if warnings:
-            result.setdefault("warnings", []).extend(warnings)
-        changed |= result["changed"]
-        results.append(result)
-
-    if len(results) == 1:
-        module.exit_json(**results[0])
-
-    module.exit_json(**{"changed": changed, "result": {"results": results}})
-
-
-def perform_action(svc, definition: Dict, params: Dict) -> Dict:
-    origin_name = definition["metadata"].get("name")
-    namespace = definition["metadata"].get("namespace")
-    label_selectors = params.get("label_selectors")
-    state = params.get("state", None)
-    kind = definition.get("kind")
-    api_version = definition.get("apiVersion")
-
-    result = {"changed": False, "result": {}}
-    instance = {}
-
-    resource = svc.find_resource(kind, api_version, fail=True)
-    definition["kind"] = resource.kind
-    definition["apiVersion"] = resource.group_version
-    existing = svc.retrieve(resource, definition)
-
-    if state == "absent":
-        if exists(existing) and existing.kind.endswith("List"):
-            instance = []
-            for item in existing.items:
-                r = svc.delete(resource, item, existing)
-                instance.append(r)
-        else:
-            instance = svc.delete(resource, definition, existing)
-        result["method"] = "delete"
-        if exists(existing):
-            result["changed"] = True
-    else:
-        if label_selectors:
-            filter_selector = LabelSelectorFilter(label_selectors)
-            if not filter_selector.isMatching(definition):
-                result["changed"] = False
-                result["msg"] = (
-                    "resource 'kind={kind},name={name},namespace={namespace}' "
-                    "filtered by label_selectors.".format(
-                        kind=kind,
-                        name=origin_name,
-                        namespace=namespace,
-                    )
-                )
-                return result
-
-        if params.get("apply"):
-            instance = svc.apply(resource, definition, existing)
-            result["method"] = "apply"
-        elif not existing:
-            if state == "patched":
-                result.setdefault("warnings", []).append(
-                    "resource 'kind={kind},name={name}' was not found but will not be "
-                    "created as 'state' parameter has been set to '{state}'".format(
-                        kind=kind, name=definition["metadata"].get("name"), state=state
-                    )
-                )
-                return result
-            instance = svc.create(resource, definition)
-            result["method"] = "create"
-            result["changed"] = True
-        elif params.get("force", False):
-            instance = svc.replace(resource, definition, existing)
-            result["method"] = "replace"
-        else:
-            instance = svc.update(resource, definition, existing)
-            result["method"] = "update"
-
-    # If needed, wait and/or create diff
-    success = True
-
-    if result["method"] == "delete":
-        # wait logic is a bit different for delete as `instance` may be a status object
-        if params.get("wait") and not svc.module.check_mode:
-            success, waited, duration = svc.wait(resource, definition)
-            result["duration"] = duration
-    else:
-        if params.get("wait") and not svc.module.check_mode:
-            success, instance, duration = svc.wait(resource, instance)
-            result["duration"] = duration
-
-    if result["method"] not in ("create", "delete"):
-        if existing:
-            existing = existing.to_dict()
-        else:
-            existing = {}
-        match, diffs = diff_objects(existing, instance)
-        if match and diffs:
-            result.setdefault("warnings", []).append(
-                "No meaningful diff was generated, but the API may not be idempotent "
-                "(only metadata.generation or metadata.resourceVersion were changed)"
-            )
-        result["changed"] = not match
-        if svc.module._diff:
-            result["diff"] = diffs
-
-    result["result"] = instance
-    if not success:
-        raise ResourceTimeout(
-            '"{0}" "{1}": Timed out waiting on resource'.format(
-                definition["kind"], origin_name
-            ),
-            result,
-        )
-
-    return result

plugins/module_utils/k8s/service.py

@@ -1,496 +0,0 @@
-# Copyright: (c) 2021, Red Hat | Ansible
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from typing import Any, Dict, List, Optional, Tuple
-
-from ansible_collections.kubernetes.core.plugins.module_utils.hashes import (
-    generate_hash,
-)
-
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.waiter import (
-    Waiter,
-    exists,
-    resource_absent,
-    get_waiter,
-)
-
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.core import (
-    requires,
-)
-
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions import (
-    CoreException,
-)
-
-from ansible.module_utils.common.dict_transformations import dict_merge
-
-try:
-    from kubernetes.dynamic.exceptions import (
-        NotFoundError,
-        ResourceNotFoundError,
-        ResourceNotUniqueError,
-        ConflictError,
-        ForbiddenError,
-        MethodNotAllowedError,
-        BadRequestError,
-    )
-except ImportError:
-    # Handled in module setup
-    pass
-
-try:
-    from kubernetes.dynamic.resource import Resource, ResourceInstance
-except ImportError:
-    # These are defined only for the sake of Ansible's checked import requirement
-    Resource = Any  # type: ignore
-    ResourceInstance = Any  # type: ignore
-
-try:
-    from ansible_collections.kubernetes.core.plugins.module_utils.apply import (
-        apply_object,
-    )
-except ImportError:
-    # Handled in module setup
-    pass
-
-try:
-    from ansible_collections.kubernetes.core.plugins.module_utils.apply import (
-        recursive_diff,
-    )
-except ImportError:
-    from ansible.module_utils.common.dict_transformations import recursive_diff
-
-
-try:
-    from ansible_collections.kubernetes.core.plugins.module_utils.common import (
-        _encode_stringdata,
-    )
-except ImportError:
-    # Handled in module setup
-    pass
-
-
-class K8sService:
-    """A Service class for K8S modules.
-    This class has the primary purpose is to perform work on the cluster (e.g., create, apply, replace, update, delete).
-    """
-
-    def __init__(self, client, module) -> None:
-        self.client = client
-        self.module = module
-
-    @property
-    def _client_side_dry_run(self):
-        return self.module.check_mode and not self.client.dry_run
-
-    def find_resource(
-        self, kind: str, api_version: str, fail: bool = False
-    ) -> Optional[Resource]:
-        try:
-            return self.client.resource(kind, api_version)
-        except (ResourceNotFoundError, ResourceNotUniqueError):
-            if fail:
-                raise CoreException(
-                    "Failed to find exact match for %s.%s by [kind, name, singularName, shortNames]"
-                    % (api_version, kind)
-                )
-
-    def wait(
-        self, resource: Resource, instance: Dict
-    ) -> Tuple[bool, Optional[Dict], int]:
-        wait_sleep = self.module.params.get("wait_sleep")
-        wait_timeout = self.module.params.get("wait_timeout")
-        wait_condition = None
-        if self.module.params.get("wait_condition") and self.module.params[
-            "wait_condition"
-        ].get("type"):
-            wait_condition = self.module.params["wait_condition"]
-        state = "present"
-        if self.module.params.get("state") == "absent":
-            state = "absent"
-        label_selectors = self.module.params.get("label_selectors")
-
-        waiter = get_waiter(
-            self.client, resource, condition=wait_condition, state=state
-        )
-        return waiter.wait(
-            timeout=wait_timeout,
-            sleep=wait_sleep,
-            name=instance["metadata"].get("name"),
-            namespace=instance["metadata"].get("namespace"),
-            label_selectors=label_selectors,
-        )
-
-    def create_project_request(self, definition: Dict) -> Dict:
-        definition["kind"] = "ProjectRequest"
-        results = {"changed": False, "result": {}}
-        resource = self.find_resource(
-            "ProjectRequest", definition["apiVersion"], fail=True
-        )
-        if not self.module.check_mode:
-            try:
-                k8s_obj = self.client.create(resource, definition)
-                results["result"] = k8s_obj.to_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
-
-        results["changed"] = True
-
-        return results
-
-    def patch_resource(
-        self,
-        resource: Resource,
-        definition: Dict,
-        name: str,
-        namespace: str,
-        merge_type: str = None,
-    ) -> 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="3.0.0",
-                collection_name="kubernetes.core",
-            )
-        try:
-            params = dict(name=name, namespace=namespace)
-            if merge_type:
-                params["content_type"] = "application/{0}-patch+json".format(merge_type)
-            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)
-            raise CoreException(msg) from e
-
-    def retrieve(self, resource: Resource, definition: Dict) -> ResourceInstance:
-        state = self.module.params.get("state", None)
-        append_hash = self.module.params.get("append_hash", False)
-        name = definition["metadata"].get("name")
-        generate_name = definition["metadata"].get("generateName")
-        namespace = definition["metadata"].get("namespace")
-        label_selectors = self.module.params.get("label_selectors")
-        existing: ResourceInstance = None
-
-        try:
-            # ignore append_hash for resources other than ConfigMap and Secret
-            if append_hash and definition["kind"] in ["ConfigMap", "Secret"]:
-                if name:
-                    name = "%s-%s" % (name, generate_hash(definition))
-                    definition["metadata"]["name"] = name
-                elif generate_name:
-                    definition["metadata"]["generateName"] = "%s-%s" % (
-                        generate_name,
-                        generate_hash(definition),
-                    )
-            params = {}
-            if name:
-                params["name"] = name
-            if namespace:
-                params["namespace"] = namespace
-            if label_selectors:
-                params["label_selector"] = ",".join(label_selectors)
-            if "name" in params or "label_selector" in params:
-                existing = self.client.get(resource, **params)
-        except (NotFoundError, MethodNotAllowedError):
-            pass
-        except ForbiddenError as e:
-            if (
-                definition["kind"] in ["Project", "ProjectRequest"]
-                and state != "absent"
-            ):
-                return self.create_project_request(definition)
-            reason = e.body if hasattr(e, "body") else e
-            msg = "Failed to retrieve requested object: {0}".format(reason)
-            raise CoreException(msg) from e
-        except Exception as e:
-            reason = e.body if hasattr(e, "body") else e
-            msg = "Failed to retrieve requested object: {0}".format(reason)
-            raise CoreException(msg) from e
-
-        return existing
-
-    def find(
-        self,
-        kind: str,
-        api_version: str,
-        name: str = None,
-        namespace: Optional[str] = None,
-        label_selectors: Optional[List[str]] = None,
-        field_selectors: Optional[List[str]] = None,
-        wait: Optional[bool] = False,
-        wait_sleep: Optional[int] = 5,
-        wait_timeout: Optional[int] = 120,
-        state: Optional[str] = "present",
-        condition: Optional[Dict] = None,
-    ) -> Dict:
-        resource = self.find_resource(kind, api_version)
-        api_found = bool(resource)
-        if not api_found:
-            return dict(
-                resources=[],
-                msg='Failed to find API for resource with apiVersion "{0}" and kind "{1}"'.format(
-                    api_version, kind
-                ),
-                api_found=False,
-            )
-
-        if not label_selectors:
-            label_selectors = []
-        if not field_selectors:
-            field_selectors = []
-
-        result = {"resources": [], "api_found": True}
-
-        # With a timeout of 0 the waiter will do a single check and return, effectively not waiting.
-        if not wait:
-            wait_timeout = 0
-
-        if state == "present":
-            predicate = exists
-        else:
-            predicate = resource_absent
-
-        waiter = Waiter(self.client, resource, predicate)
-
-        # This is an initial check to get the resource or resources that we then need to wait on individually.
-        try:
-            success, resources, duration = waiter.wait(
-                timeout=wait_timeout,
-                sleep=wait_sleep,
-                name=name,
-                namespace=namespace,
-                label_selectors=label_selectors,
-                field_selectors=field_selectors,
-            )
-        except BadRequestError:
-            return result
-        except CoreException as e:
-            raise e
-        except Exception as e:
-            raise CoreException(
-                "Exception '{0}' raised while trying to get resource using (name={1}, namespace={2}, label_selectors={3}, field_selectors={4})".format(
-                    e, name, namespace, label_selectors, field_selectors
-                )
-            )
-
-        # There is either no result or there is a List resource with no items
-        if (
-            not resources
-            or resources["kind"].endswith("List")
-            and not resources.get("items")
-        ):
-            return result
-
-        instances = resources.get("items") or [resources]
-
-        if not wait:
-            result["resources"] = instances
-            return result
-
-        # Now wait for the specified state of any resource instances we have found.
-        waiter = get_waiter(self.client, resource, state=state, condition=condition)
-        for instance in instances:
-            name = instance["metadata"].get("name")
-            namespace = instance["metadata"].get("namespace")
-            success, res, duration = waiter.wait(
-                timeout=wait_timeout,
-                sleep=wait_sleep,
-                name=name,
-                namespace=namespace,
-            )
-            if not success:
-                raise CoreException(
-                    "Failed to gather information about %s(s) even"
-                    " after waiting for %s seconds" % (res.get("kind"), duration)
-                )
-            result["resources"].append(res)
-        return result
-
-    def create(self, resource: Resource, definition: Dict) -> Dict:
-        namespace = definition["metadata"].get("namespace")
-        name = definition["metadata"].get("name")
-
-        if self._client_side_dry_run:
-            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
-                    )
-                )
-                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,
-    ) -> 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:
-                k8s_obj = dict_merge(existing.to_dict(), patch)
-            else:
-                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,
-    ) -> 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:
-            k8s_obj = _encode_stringdata(definition)
-        else:
-            try:
-                k8s_obj = self.client.replace(
-                    resource,
-                    definition,
-                    name=name,
-                    namespace=namespace,
-                    append_hash=append_hash,
-                ).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
-    ) -> Dict:
-        name = definition["metadata"].get("name")
-        namespace = definition["metadata"].get("namespace")
-
-        if self._client_side_dry_run:
-            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,
-        resource: Resource,
-        definition: Dict,
-        existing: Optional[ResourceInstance] = None,
-    ) -> Dict:
-        delete_options = self.module.params.get("delete_options")
-        label_selectors = self.module.params.get("label_selectors")
-        name = definition["metadata"].get("name")
-        namespace = definition["metadata"].get("namespace")
-        params = {}
-
-        if not exists(existing):
-            return {}
-
-        # Delete the object
-        if self._client_side_dry_run:
-            return {}
-
-        if name:
-            params["name"] = name
-
-        if namespace:
-            params["namespace"] = namespace
-
-        if label_selectors:
-            params["label_selector"] = ",".join(label_selectors)
-
-        if delete_options:
-            body = {
-                "apiVersion": "v1",
-                "kind": "DeleteOptions",
-            }
-            body.update(delete_options)
-            params["body"] = body
-
-        try:
-            k8s_obj = self.client.delete(resource, **params).to_dict()
-        except Exception as e:
-            reason = e.body if hasattr(e, "body") else e
-            msg = "Failed to delete object: {0}".format(reason)
-            raise CoreException(msg) from e
-        return k8s_obj
-
-
-def diff_objects(existing: Dict, new: Dict) -> Tuple[bool, Dict]:
-    result = {}
-    diff = recursive_diff(existing, new)
-    if not diff:
-        return True, result
-
-    result["before"] = diff[0]
-    result["after"] = diff[1]
-
-    if list(result["after"].keys()) != ["metadata"] or list(
-        result["before"].keys()
-    ) != ["metadata"]:
-        return False, result
-
-    # If only metadata.generation and metadata.resourceVersion changed, ignore it
-    ignored_keys = set(["generation", "resourceVersion"])
-
-    if not set(result["after"]["metadata"].keys()).issubset(ignored_keys):
-        return False, result
-    if not set(result["before"]["metadata"].keys()).issubset(ignored_keys):
-        return False, result
-
-    return True, result

plugins/module_utils/k8s/waiter.py

@@ -1,238 +0,0 @@
-import time
-from functools import partial
-from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Union
-
-from ansible.module_utils.parsing.convert_bool import boolean
-
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions import (
-    CoreException,
-)
-
-try:
-    from kubernetes.dynamic.exceptions import NotFoundError
-    from kubernetes.dynamic.resource import Resource, ResourceField, ResourceInstance
-except ImportError:
-    # These are defined only for the sake of Ansible's checked import requirement
-    Resource = Any  # type: ignore
-    ResourceInstance = Any  # type: ignore
-    pass
-
-try:
-    from urllib3.exceptions import HTTPError
-except ImportError:
-    # Handled during module setup
-    pass
-
-
-def deployment_ready(deployment: ResourceInstance) -> bool:
-    # FIXME: frustratingly bool(deployment.status) is True even if status is empty
-    # Furthermore deployment.status.availableReplicas == deployment.status.replicas == None if status is empty
-    # deployment.status.replicas is None is perfectly ok if desired replicas == 0
-    # Scaling up means that we also need to check that we're not in a
-    # situation where status.replicas == status.availableReplicas
-    # but spec.replicas != status.replicas
-    return bool(
-        deployment.status
-        and deployment.spec.replicas == (deployment.status.replicas or 0)
-        and deployment.status.availableReplicas == deployment.status.replicas
-        and deployment.status.observedGeneration == deployment.metadata.generation
-        and not deployment.status.unavailableReplicas
-    )
-
-
-def pod_ready(pod: ResourceInstance) -> bool:
-    return bool(
-        pod.status
-        and pod.status.containerStatuses is not None
-        and all(container.ready for container in pod.status.containerStatuses)
-    )
-
-
-def daemonset_ready(daemonset: ResourceInstance) -> bool:
-    return bool(
-        daemonset.status
-        and daemonset.status.desiredNumberScheduled is not None
-        and daemonset.status.updatedNumberScheduled
-        == daemonset.status.desiredNumberScheduled
-        and daemonset.status.numberReady == daemonset.status.desiredNumberScheduled
-        and daemonset.status.observedGeneration == daemonset.metadata.generation
-        and not daemonset.status.unavailableReplicas
-    )
-
-
-def statefulset_ready(statefulset: ResourceInstance) -> bool:
-    # These may be None
-    updated_replicas = statefulset.status.updatedReplicas or 0
-    ready_replicas = statefulset.status.readyReplicas or 0
-    return bool(
-        statefulset.status
-        and statefulset.spec.updateStrategy.type == "RollingUpdate"
-        and statefulset.status.observedGeneration
-        == (statefulset.metadata.generation or 0)
-        and statefulset.status.updateRevision == statefulset.status.currentRevision
-        and updated_replicas == statefulset.spec.replicas
-        and ready_replicas == statefulset.spec.replicas
-        and statefulset.status.replicas == statefulset.spec.replicas
-    )
-
-
-def custom_condition(condition: Dict, resource: ResourceInstance) -> bool:
-    if not resource.status or not resource.status.conditions:
-        return False
-    matches = [x for x in resource.status.conditions if x.type == condition["type"]]
-    if not matches:
-        return False
-    # There should never be more than one condition of a specific type
-    match: ResourceField = matches[0]
-    if match.status == "Unknown":
-        if match.status == condition["status"]:
-            if "reason" not in condition:
-                return True
-            if condition["reason"]:
-                return match.reason == condition["reason"]
-        return False
-    status = True if match.status == "True" else False
-    if status == boolean(condition["status"], strict=False):
-        if condition.get("reason"):
-            return match.reason == condition["reason"]
-        return True
-    return False
-
-
-def resource_absent(resource: ResourceInstance) -> bool:
-    return not exists(resource)
-
-
-def exists(resource: Optional[ResourceInstance]) -> bool:
-    """Simple predicate to check for existence of a resource.
-
-    While a List type resource technically always exists, this will only return
-    true if the List contains items."""
-    return bool(resource) and not empty_list(resource)
-
-
-RESOURCE_PREDICATES = {
-    "DaemonSet": daemonset_ready,
-    "Deployment": deployment_ready,
-    "Pod": pod_ready,
-    "StatefulSet": statefulset_ready,
-}
-
-
-def empty_list(resource: ResourceInstance) -> bool:
-    return resource["kind"].endswith("List") and not resource.get("items")
-
-
-def clock(total: int, interval: int) -> Iterator[int]:
-    start = time.monotonic()
-    yield 0
-    while (time.monotonic() - start) < total:
-        time.sleep(interval)
-        yield int(time.monotonic() - start)
-
-
-class Waiter:
-    def __init__(
-        self, client, resource: Resource, predicate: Callable[[ResourceInstance], bool]
-    ):
-        self.client = client
-        self.resource = resource
-        self.predicate = predicate
-
-    def wait(
-        self,
-        timeout: int,
-        sleep: int,
-        name: Optional[str] = None,
-        namespace: Optional[str] = None,
-        label_selectors: Optional[List[str]] = None,
-        field_selectors: Optional[List[str]] = None,
-    ) -> Tuple[bool, Dict, int]:
-        params = {}
-
-        if name:
-            params["name"] = name
-
-        if namespace:
-            params["namespace"] = namespace
-
-        if label_selectors:
-            params["label_selector"] = ",".join(label_selectors)
-
-        if field_selectors:
-            params["field_selector"] = ",".join(field_selectors)
-
-        instance = {}
-        response = None
-        elapsed = 0
-        for i in clock(timeout, sleep):
-            exception = None
-            elapsed = i
-            try:
-                response = self.client.get(self.resource, **params)
-            except NotFoundError:
-                response = None
-            # Retry connection errors as it may be intermittent network issues
-            except HTTPError as e:
-                exception = e
-            if self.predicate(response):
-                break
-        if exception:
-            msg = (
-                "Exception '{0}' raised while trying to get resource using {1}".format(
-                    exception, params
-                )
-            )
-            raise CoreException(msg) from exception
-        if response:
-            instance = response.to_dict()
-        return self.predicate(response), instance, elapsed
-
-
-class DummyWaiter:
-    """A no-op waiter that simply returns the item being waited on.
-
-    No API call will be made with this waiter; the function returns
-    immediately. This waiter is useful for waiting on resource instances in
-    check mode, for example.
-    """
-
-    def wait(
-        self,
-        definition: Dict,
-        timeout: int,
-        sleep: int,
-        label_selectors: Optional[List[str]] = None,
-    ) -> Tuple[bool, Optional[Dict], int]:
-        return True, definition, 0
-
-
-# The better solution would be typing.Protocol, but this is only in 3.8+
-SupportsWait = Union[Waiter, DummyWaiter]
-
-
-def get_waiter(
-    client,
-    resource: Resource,
-    state: str = "present",
-    condition: Optional[Dict] = None,
-    check_mode: Optional[bool] = False,
-) -> SupportsWait:
-    """Create a Waiter object based on the specified resource.
-
-    This is a convenience method for creating a waiter from a resource.
-    Based on the arguments and the kind of resource, an appropriate waiter
-    will be returned. A waiter can also be created directly, of course.
-    """
-    if check_mode:
-        return DummyWaiter()
-    if state == "present":
-        if condition:
-            predicate: Callable[[ResourceInstance], bool] = partial(
-                custom_condition, condition
-            )
-        else:
-            predicate = RESOURCE_PREDICATES.get(resource.kind, exists)
-    else:
-        predicate = resource_absent
-    return Waiter(client, resource, predicate)

plugins/modules/helm.py

@@ -51,17 +51,6 @@ options:
       - Chart version to install. If this is not specified, the latest version is installed.
     required: false
     type: str
-  dependency_update:
-    description:
-      - Run standalone C(helm dependency update CHART) before the operation.
-      - Run inline C(--dependency-update) with C(helm install) command. This feature is not supported yet with the C(helm upgrade) command.
-      - So we should consider to use I(dependency_update) options with I(replace) option enabled when specifying I(chart_repo_url).
-      - The I(dependency_update) option require the add of C(dependencies) block in C(Chart.yaml/requirements.yaml) file.
-      - For more information please visit U(https://helm.sh/docs/helm/helm_dependency/)
-    default: false
-    type: bool
-    aliases: [ dep_up ]
-    version_added: "2.4.0"
   release_name:
     description:
       - Release name to manage.
@@ -105,31 +94,6 @@ options:
       - Run C(helm repo update) before the operation. Can be run as part of the package installation or as a separate step (see Examples).
     default: false
     type: bool
-  set_values:
-    description:
-      - Values to pass to chart configuration
-    required: false
-    type: list
-    elements: dict
-    suboptions:
-      value:
-        description:
-          - Value to pass to chart configuration (e.g phase=prod).
-        type: str
-        required: true
-      value_type:
-        description:
-          - Use C(raw) set individual value.
-          - Use C(string) to force a string for an individual value.
-          - Use C(file) to set individual values from a file when the value itself is too long for the command line or is dynamically generated.
-          - Use C(json) to set json values (scalars/objects/arrays). This feature requires helm>=3.10.0.
-        default: raw
-        choices:
-          - raw
-          - string
-          - json
-          - file
-    version_added: '2.4.0'
 
 #Helm options
   disable_hook:
@@ -178,11 +142,6 @@ options:
     type: bool
     default: False
     version_added: "0.11.1"
-  post_renderer:
-    description:
-      - Path to an executable to be used for post rendering.
-    type: str
-    version_added: "2.4.0"
   replace:
     description:
       - Reuse the given name, only if that name is a deleted release which remains in the history.
@@ -257,15 +216,6 @@ EXAMPLES = r"""
     state: absent
     update_repo_cache: true
 
-- name: Deploy Grafana chart using set values on target
-  kubernetes.core.helm:
-    name: test
-    chart_ref: stable/grafana
-    release_namespace: monitoring
-    set_values:
-      - value: phase=prod
-        value_type: string
-
 # From git
 - name: Git clone stable repo on HEAD
   ansible.builtin.git:
@@ -367,10 +317,8 @@ command:
   sample: helm upgrade ...
 """
 
-import re
 import tempfile
 import traceback
-import copy
 from ansible_collections.kubernetes.core.plugins.module_utils.version import (
     LooseVersion,
 )
@@ -379,18 +327,17 @@ try:
     import yaml
 
     IMP_YAML = True
-    IMP_YAML_ERR = None
 except ImportError:
     IMP_YAML_ERR = traceback.format_exc()
     IMP_YAML = False
 
-from ansible.module_utils.basic import missing_required_lib
+from ansible.module_utils.basic import AnsibleModule, missing_required_lib, env_fallback
 from ansible_collections.kubernetes.core.plugins.module_utils.helm import (
-    AnsibleHelmModule,
+    run_helm,
+    get_values,
+    get_helm_plugin_list,
     parse_helm_plugin_list,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.helm_args_common import (
-    HELM_AUTH_ARG_SPEC,
+    get_helm_version,
 )
 
 
@@ -406,41 +353,31 @@ def get_release(state, release_name):
     return None
 
 
-def get_release_status(module, release_name):
+def get_release_status(module, command, release_name):
     """
     Get Release state from deployed release
     """
 
-    list_command = (
-        module.get_helm_binary() + " list --output=yaml --filter " + release_name
-    )
+    list_command = command + " list --output=yaml --filter " + release_name
 
-    rc, out, err = module.run_helm_command(list_command)
+    rc, out, err = run_helm(module, list_command)
 
     release = get_release(yaml.safe_load(out), release_name)
 
     if release is None:  # not install
         return None
 
-    release["values"] = module.get_values(release_name)
+    release["values"] = get_values(module, command, release_name)
 
     return release
 
 
-def run_repo_update(module):
+def run_repo_update(module, command):
     """
     Run Repo update
     """
-    repo_update_command = module.get_helm_binary() + " repo update"
-    rc, out, err = module.run_helm_command(repo_update_command)
-
-
-def run_dep_update(module, chart_ref):
-    """
-    Run dependency update
-    """
-    dep_update = module.get_helm_binary() + " dependency update " + chart_ref
-    rc, out, err = module.run_helm_command(dep_update)
+    repo_update_command = command + " repo update"
+    rc, out, err = run_helm(module, repo_update_command)
 
 
 def fetch_chart_info(module, command, chart_ref):
@@ -449,7 +386,7 @@ def fetch_chart_info(module, command, chart_ref):
     """
     inspect_command = command + " show chart " + chart_ref
 
-    rc, out, err = module.run_helm_command(inspect_command)
+    rc, out, err = run_helm(module, inspect_command)
 
     return yaml.safe_load(out)
 
@@ -468,11 +405,8 @@ def deploy(
     atomic=False,
     create_namespace=False,
     replace=False,
-    post_renderer=None,
     skip_crds=False,
     timeout=None,
-    dependency_update=None,
-    set_value_args=None,
 ):
     """
     Install/upgrade/rollback release chart
@@ -480,8 +414,6 @@ def deploy(
     if replace:
         # '--replace' is not supported by 'upgrade -i'
         deploy_command = command + " install"
-        if dependency_update:
-            deploy_command += " --dependency-update"
     else:
         deploy_command = command + " upgrade -i"  # install/upgrade
 
@@ -521,18 +453,12 @@ def deploy(
             yaml.dump(release_values, yaml_file, default_flow_style=False)
         deploy_command += " -f=" + path
 
-    if post_renderer:
-        deploy_command = " --post-renderer=" + post_renderer
-
     if skip_crds:
         deploy_command += " --skip-crds"
 
     if history_max is not None:
         deploy_command += " --history-max=%s" % str(history_max)
 
-    if set_value_args:
-        deploy_command += " " + set_value_args
-
     deploy_command += " " + release_name + " " + chart_name
     return deploy_command
 
@@ -573,13 +499,14 @@ def load_values_files(values_files):
     return values
 
 
-def get_plugin_version(plugin):
+def get_plugin_version(command, plugin):
     """
     Check if helm plugin is installed and return corresponding version
     """
 
-    rc, output, err, command = module.get_helm_plugin_list()
-    out = parse_helm_plugin_list(output=output.splitlines())
+    cmd = command + " plugin"
+    rc, output, err = get_helm_plugin_list(module, helm_bin=cmd)
+    out = parse_helm_plugin_list(module, output=output.splitlines())
 
     if not out:
         return None
@@ -592,6 +519,7 @@ def get_plugin_version(plugin):
 
 def helmdiff_check(
     module,
+    helm_cmd,
     release_name,
     chart_ref,
     release_values,
@@ -603,7 +531,7 @@ def helmdiff_check(
     """
     Use helm diff to determine if a release would change by upgrading a chart.
     """
-    cmd = module.get_helm_binary() + " diff upgrade"
+    cmd = helm_cmd + " diff upgrade"
     cmd += " " + release_name
     cmd += " " + chart_ref
 
@@ -619,13 +547,12 @@ def helmdiff_check(
         with open(path, "w") as yaml_file:
             yaml.dump(release_values, yaml_file, default_flow_style=False)
         cmd += " -f=" + path
-        module.add_cleanup_file(path)
 
     if values_files:
         for values_file in values_files:
             cmd += " -f=" + values_file
 
-    rc, out, err = module.run_helm_command(cmd)
+    rc, out, err = run_helm(module, cmd)
     return (len(out.strip()) > 0, out.strip())
 
 
@@ -653,14 +580,14 @@ def default_check(release_status, chart_info, values=None, values_files=None):
     )
 
 
-def argument_spec():
-    arg_spec = copy.deepcopy(HELM_AUTH_ARG_SPEC)
-    arg_spec.update(
-        dict(
+def main():
+    global module
+    module = AnsibleModule(
+        argument_spec=dict(
+            binary_path=dict(type="path"),
             chart_ref=dict(type="path"),
             chart_repo_url=dict(type="str"),
             chart_version=dict(type="str"),
-            dependency_update=dict(type="bool", default=False, aliases=["dep_up"]),
             release_name=dict(type="str", required=True, aliases=["name"]),
             release_namespace=dict(type="str", required=True, aliases=["namespace"]),
             release_state=dict(
@@ -669,34 +596,52 @@ def argument_spec():
             release_values=dict(type="dict", default={}, aliases=["values"]),
             values_files=dict(type="list", default=[], elements="str"),
             update_repo_cache=dict(type="bool", default=False),
+            # Helm options
             disable_hook=dict(type="bool", default=False),
             force=dict(type="bool", default=False),
+            context=dict(
+                type="str",
+                aliases=["kube_context"],
+                fallback=(env_fallback, ["K8S_AUTH_CONTEXT"]),
+            ),
+            kubeconfig=dict(
+                type="path",
+                aliases=["kubeconfig_path"],
+                fallback=(env_fallback, ["K8S_AUTH_KUBECONFIG"]),
+            ),
             purge=dict(type="bool", default=True),
             wait=dict(type="bool", default=False),
             wait_timeout=dict(type="str"),
             timeout=dict(type="str"),
             atomic=dict(type="bool", default=False),
             create_namespace=dict(type="bool", default=False),
-            post_renderer=dict(type="str"),
             replace=dict(type="bool", default=False),
             skip_crds=dict(type="bool", default=False),
             history_max=dict(type="int"),
-            set_values=dict(type="list", elements="dict"),
-        )
-    )
-    return arg_spec
-
-
-def main():
-    global module
-    module = AnsibleHelmModule(
-        argument_spec=argument_spec(),
+            # Generic auth key
+            host=dict(type="str", fallback=(env_fallback, ["K8S_AUTH_HOST"])),
+            ca_cert=dict(
+                type="path",
+                aliases=["ssl_ca_cert"],
+                fallback=(env_fallback, ["K8S_AUTH_SSL_CA_CERT"]),
+            ),
+            validate_certs=dict(
+                type="bool",
+                default=True,
+                aliases=["verify_ssl"],
+                fallback=(env_fallback, ["K8S_AUTH_VERIFY_SSL"]),
+            ),
+            api_key=dict(
+                type="str", no_log=True, fallback=(env_fallback, ["K8S_AUTH_API_KEY"])
+            ),
+        ),
         required_if=[
             ("release_state", "present", ["release_name", "chart_ref"]),
             ("release_state", "absent", ["release_name"]),
         ],
         mutually_exclusive=[
             ("context", "ca_cert"),
+            ("kubeconfig", "ca_cert"),
             ("replace", "history_max"),
             ("wait_timeout", "timeout"),
         ],
@@ -708,10 +653,10 @@ def main():
 
     changed = False
 
+    bin_path = module.params.get("binary_path")
     chart_ref = module.params.get("chart_ref")
     chart_repo_url = module.params.get("chart_repo_url")
     chart_version = module.params.get("chart_version")
-    dependency_update = module.params.get("dependency_update")
     release_name = module.params.get("release_name")
     release_state = module.params.get("release_state")
     release_values = module.params.get("release_values")
@@ -726,27 +671,31 @@ def main():
     wait_timeout = module.params.get("wait_timeout")
     atomic = module.params.get("atomic")
     create_namespace = module.params.get("create_namespace")
-    post_renderer = module.params.get("post_renderer")
     replace = module.params.get("replace")
     skip_crds = module.params.get("skip_crds")
     history_max = module.params.get("history_max")
     timeout = module.params.get("timeout")
-    set_values = module.params.get("set_values")
+
+    if bin_path is not None:
+        helm_cmd_common = bin_path
+    else:
+        helm_cmd_common = module.get_bin_path("helm", required=True)
 
     if update_repo_cache:
-        run_repo_update(module)
+        run_repo_update(module, helm_cmd_common)
 
     # Get real/deployed release status
-    release_status = get_release_status(module, release_name)
+    release_status = get_release_status(module, helm_cmd_common, release_name)
 
-    helm_cmd = module.get_helm_binary()
+    # keep helm_cmd_common for get_release_status in module_exit_json
+    helm_cmd = helm_cmd_common
     opt_result = {}
     if release_state == "absent" and release_status is not None:
         if replace:
             module.fail_json(msg="replace is not applicable when state is absent")
 
         if wait:
-            helm_version = module.get_helm_version()
+            helm_version = get_helm_version(module, helm_cmd_common)
             if LooseVersion(helm_version) < LooseVersion("3.7.0"):
                 opt_result["warnings"] = []
                 opt_result["warnings"].append(
@@ -769,41 +718,7 @@ def main():
         # Fetch chart info to have real version and real name for chart_ref from archive, folder or url
         chart_info = fetch_chart_info(module, helm_cmd, chart_ref)
 
-        if dependency_update:
-            if chart_info.get("dependencies"):
-                # Can't use '--dependency-update' with 'helm upgrade' that is the
-                # default chart install method, so if chart_repo_url is defined
-                # we can't use the dependency update command. But, in the near future
-                # we can get rid of this method and use only '--dependency-update'
-                # option. Please see https://github.com/helm/helm/pull/8810
-                if not chart_repo_url and not re.fullmatch(
-                    r"^http[s]*://[\w.:/?&=-]+$", chart_ref
-                ):
-                    run_dep_update(module, chart_ref)
-
-                    # To not add --dependency-update option in the deploy function
-                    dependency_update = False
-                else:
-                    module.warn(
-                        "This is a not stable feature with 'chart_repo_url'. Please consider to use dependency update with on-disk charts"
-                    )
-                    if not replace:
-                        msg_fail = (
-                            "'--dependency-update' hasn't been supported yet with 'helm upgrade'. "
-                            "Please use 'helm install' instead by adding 'replace' option"
-                        )
-                        module.fail_json(msg=msg_fail)
-            else:
-                module.warn(
-                    "There is no dependencies block defined in Chart.yaml. Dependency update will not be performed. "
-                    "Please consider add dependencies block or disable dependency_update to remove this warning."
-                )
-
         if release_status is None:  # Not installed
-            set_value_args = None
-            if set_values:
-                set_value_args = module.get_helm_set_values_args(set_values)
-
             helm_cmd = deploy(
                 helm_cmd,
                 release_name,
@@ -816,19 +731,16 @@ def main():
                 values_files=values_files,
                 atomic=atomic,
                 create_namespace=create_namespace,
-                post_renderer=post_renderer,
                 replace=replace,
-                dependency_update=dependency_update,
                 skip_crds=skip_crds,
                 history_max=history_max,
                 timeout=timeout,
-                set_value_args=set_value_args,
             )
             changed = True
 
         else:
 
-            helm_diff_version = get_plugin_version("diff")
+            helm_diff_version = get_plugin_version(helm_cmd_common, "diff")
             if helm_diff_version and (
                 not chart_repo_url
                 or (
@@ -838,6 +750,7 @@ def main():
             ):
                 (would_change, prepared) = helmdiff_check(
                     module,
+                    helm_cmd_common,
                     release_name,
                     chart_ref,
                     release_values,
@@ -858,10 +771,6 @@ def main():
                 )
 
             if force or would_change:
-                set_value_args = None
-                if set_values:
-                    set_value_args = module.get_helm_set_values_args(set_values)
-
                 helm_cmd = deploy(
                     helm_cmd,
                     release_name,
@@ -874,13 +783,10 @@ def main():
                     values_files=values_files,
                     atomic=atomic,
                     create_namespace=create_namespace,
-                    post_renderer=post_renderer,
                     replace=replace,
                     skip_crds=skip_crds,
                     history_max=history_max,
                     timeout=timeout,
-                    dependency_update=dependency_update,
-                    set_value_args=set_value_args,
                 )
                 changed = True
 
@@ -908,13 +814,13 @@ def main():
             **opt_result,
         )
 
-    rc, out, err = module.run_helm_command(helm_cmd)
+    rc, out, err = run_helm(module, helm_cmd)
 
     module.exit_json(
         changed=changed,
         stdout=out,
         stderr=err,
-        status=get_release_status(module, release_name),
+        status=get_release_status(module, helm_cmd_common, release_name),
         command=helm_cmd,
         **opt_result,
     )

plugins/modules/helm_info.py

@@ -53,14 +53,6 @@ options:
     type: list
     elements: str
     version_added: "2.3.0"
-  get_all_values:
-    description:
-      - Set to C(True) if you want to get all (computed) values of the release.
-      - When C(False) (default), only user supplied values are returned.
-    required: false
-    default: false
-    type: bool
-    version_added: "2.4.0"
 extends_documentation_fragment:
   - kubernetes.core.helm_common_options
 """
@@ -117,44 +109,22 @@ status:
       type: str
       returned: always
       description: Dict of Values used to deploy
-    hooks:
-      type: list
-      elements: dict
-      description: Hooks of the release
-      returned: always
-      version_added: "2.4.0"
-    notes:
-      type: str
-      description: Notes of the release
-      returned: always
-      version_added: "2.4.0"
-    manifest:
-      type: list
-      elements: dict
-      description: Manifest of the release
-      returned: always
-      version_added: "2.4.0"
 """
 
 import traceback
-import copy
 
 try:
     import yaml
 
     IMP_YAML = True
-    IMP_YAML_ERR = None
 except ImportError:
     IMP_YAML_ERR = traceback.format_exc()
     IMP_YAML = False
 
-from ansible.module_utils.basic import missing_required_lib
+from ansible.module_utils.basic import AnsibleModule, missing_required_lib, env_fallback
 from ansible_collections.kubernetes.core.plugins.module_utils.helm import (
-    AnsibleHelmModule,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.helm_args_common import (
-    HELM_AUTH_ARG_SPEC,
-    HELM_AUTH_MUTUALLY_EXCLUSIVE,
+    run_helm,
+    get_values,
 )
 
 
@@ -168,8 +138,8 @@ def get_release(state, release_name):
 
 
 # Get Release state from deployed release
-def get_release_status(module, release_name, release_state, get_all_values=False):
-    list_command = module.get_helm_binary() + " list --output=yaml"
+def get_release_status(module, command, release_name, release_state):
+    list_command = command + " list --output=yaml"
 
     valid_release_states = [
         "all",
@@ -186,7 +156,7 @@ def get_release_status(module, release_name, release_state, get_all_values=False
             list_command += " --%s" % local_release_state
 
     list_command += " --filter " + release_name
-    rc, out, err = module.run_helm_command(list_command)
+    rc, out, err = run_helm(module, list_command)
 
     if rc != 0:
         module.fail_json(
@@ -201,45 +171,71 @@ def get_release_status(module, release_name, release_state, get_all_values=False
     if release is None:  # not install
         return None
 
-    release["values"] = module.get_values(release_name, get_all_values)
-    release["manifest"] = module.get_manifest(release_name)
-    release["notes"] = module.get_notes(release_name)
-    release["hooks"] = module.get_hooks(release_name)
+    release["values"] = get_values(module, command, release_name)
 
     return release
 
 
-def argument_spec():
-    arg_spec = copy.deepcopy(HELM_AUTH_ARG_SPEC)
-    arg_spec.update(
-        dict(
-            release_name=dict(type="str", required=True, aliases=["name"]),
-            release_namespace=dict(type="str", required=True, aliases=["namespace"]),
-            release_state=dict(type="list", default=[], elements="str"),
-            get_all_values=dict(type="bool", required=False, default=False),
-        )
-    )
-    return arg_spec
-
-
 def main():
     global module
 
-    module = AnsibleHelmModule(
-        argument_spec=argument_spec(),
-        mutually_exclusive=HELM_AUTH_MUTUALLY_EXCLUSIVE,
+    module = AnsibleModule(
+        argument_spec=dict(
+            binary_path=dict(type="path"),
+            release_name=dict(type="str", required=True, aliases=["name"]),
+            release_namespace=dict(type="str", required=True, aliases=["namespace"]),
+            # Helm options
+            context=dict(
+                type="str",
+                aliases=["kube_context"],
+                fallback=(env_fallback, ["K8S_AUTH_CONTEXT"]),
+            ),
+            kubeconfig=dict(
+                type="path",
+                aliases=["kubeconfig_path"],
+                fallback=(env_fallback, ["K8S_AUTH_KUBECONFIG"]),
+            ),
+            # Generic auth key
+            host=dict(type="str", fallback=(env_fallback, ["K8S_AUTH_HOST"])),
+            ca_cert=dict(
+                type="path",
+                aliases=["ssl_ca_cert"],
+                fallback=(env_fallback, ["K8S_AUTH_SSL_CA_CERT"]),
+            ),
+            validate_certs=dict(
+                type="bool",
+                default=True,
+                aliases=["verify_ssl"],
+                fallback=(env_fallback, ["K8S_AUTH_VERIFY_SSL"]),
+            ),
+            api_key=dict(
+                type="str", no_log=True, fallback=(env_fallback, ["K8S_AUTH_API_KEY"])
+            ),
+            release_state=dict(type="list", default=[], elements="str"),
+        ),
+        mutually_exclusive=[
+            ("context", "ca_cert"),
+            ("context", "validate_certs"),
+            ("kubeconfig", "ca_cert"),
+            ("kubeconfig", "validate_certs"),
+        ],
         supports_check_mode=True,
     )
 
     if not IMP_YAML:
         module.fail_json(msg=missing_required_lib("yaml"), exception=IMP_YAML_ERR)
 
+    bin_path = module.params.get("binary_path")
     release_name = module.params.get("release_name")
     release_state = module.params.get("release_state")
-    get_all_values = module.params.get("get_all_values")
+
+    if bin_path is not None:
+        helm_cmd_common = bin_path
+    else:
+        helm_cmd_common = module.get_bin_path("helm", required=True)
 
     release_status = get_release_status(
-        module, release_name, release_state, get_all_values
+        module, helm_cmd_common, release_name, release_state
     )
 
     if release_status is not None:

plugins/modules/helm_plugin.py

@@ -108,61 +108,78 @@ rc:
   sample: 1
 """
 
-import copy
+from ansible.module_utils.basic import AnsibleModule, env_fallback
 from ansible_collections.kubernetes.core.plugins.module_utils.helm import (
-    AnsibleHelmModule,
+    run_helm,
+    get_helm_plugin_list,
     parse_helm_plugin_list,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.helm_args_common import (
-    HELM_AUTH_ARG_SPEC,
-    HELM_AUTH_MUTUALLY_EXCLUSIVE,
-)
-
-
-def argument_spec():
-    arg_spec = copy.deepcopy(HELM_AUTH_ARG_SPEC)
-    arg_spec.update(
-        dict(
-            plugin_path=dict(
-                type="str",
-            ),
-            plugin_name=dict(
-                type="str",
-            ),
-            plugin_version=dict(
-                type="str",
-            ),
-            state=dict(
-                type="str",
-                default="present",
-                choices=["present", "absent", "latest"],
-            ),
-        )
-    )
-    return arg_spec
-
-
-def mutually_exclusive():
-    mutually_ex = copy.deepcopy(HELM_AUTH_MUTUALLY_EXCLUSIVE)
-    mutually_ex.append(("plugin_name", "plugin_path"))
-    return mutually_ex
 
 
 def main():
-    module = AnsibleHelmModule(
-        argument_spec=argument_spec(),
+    module = AnsibleModule(
+        argument_spec=dict(
+            binary_path=dict(type="path"),
+            state=dict(
+                type="str", default="present", choices=["present", "absent", "latest"]
+            ),
+            plugin_path=dict(type="str",),
+            plugin_name=dict(type="str",),
+            plugin_version=dict(type="str",),
+            # Helm options
+            context=dict(
+                type="str",
+                aliases=["kube_context"],
+                fallback=(env_fallback, ["K8S_AUTH_CONTEXT"]),
+            ),
+            kubeconfig=dict(
+                type="path",
+                aliases=["kubeconfig_path"],
+                fallback=(env_fallback, ["K8S_AUTH_KUBECONFIG"]),
+            ),
+            # Generic auth key
+            host=dict(type="str", fallback=(env_fallback, ["K8S_AUTH_HOST"])),
+            ca_cert=dict(
+                type="path",
+                aliases=["ssl_ca_cert"],
+                fallback=(env_fallback, ["K8S_AUTH_SSL_CA_CERT"]),
+            ),
+            validate_certs=dict(
+                type="bool",
+                default=True,
+                aliases=["verify_ssl"],
+                fallback=(env_fallback, ["K8S_AUTH_VERIFY_SSL"]),
+            ),
+            api_key=dict(
+                type="str", no_log=True, fallback=(env_fallback, ["K8S_AUTH_API_KEY"])
+            ),
+        ),
         supports_check_mode=True,
         required_if=[
             ("state", "present", ("plugin_path",)),
             ("state", "absent", ("plugin_name",)),
             ("state", "latest", ("plugin_name",)),
         ],
-        mutually_exclusive=mutually_exclusive(),
+        mutually_exclusive=[
+            ("plugin_name", "plugin_path"),
+            ("context", "ca_cert"),
+            ("context", "validate_certs"),
+            ("kubeconfig", "ca_cert"),
+            ("kubeconfig", "validate_certs"),
+        ],
     )
 
+    bin_path = module.params.get("binary_path")
     state = module.params.get("state")
 
-    helm_cmd_common = module.get_helm_binary() + " plugin"
+    if bin_path is not None:
+        helm_cmd_common = bin_path
+    else:
+        helm_cmd_common = "helm"
+
+    helm_cmd_common = module.get_bin_path(helm_cmd_common, required=True)
+
+    helm_cmd_common += " plugin"
 
     if state == "present":
         helm_cmd_common += " install %s" % module.params.get("plugin_path")
@@ -170,9 +187,7 @@ def main():
         if plugin_version is not None:
             helm_cmd_common += " --version=%s" % plugin_version
         if not module.check_mode:
-            rc, out, err = module.run_helm_command(
-                helm_cmd_common, fails_on_error=False
-            )
+            rc, out, err = run_helm(module, helm_cmd_common, fails_on_error=False)
         else:
             rc, out, err = (0, "", "")
 
@@ -206,15 +221,15 @@ def main():
             )
     elif state == "absent":
         plugin_name = module.params.get("plugin_name")
-        rc, output, err, command = module.get_helm_plugin_list()
-        out = parse_helm_plugin_list(output=output.splitlines())
+        rc, output, err = get_helm_plugin_list(module, helm_bin=helm_cmd_common)
+        out = parse_helm_plugin_list(module, output=output.splitlines())
 
         if not out:
             module.exit_json(
                 failed=False,
                 changed=False,
                 msg="Plugin not found or is already uninstalled",
-                command=command,
+                command=helm_cmd_common + " list",
                 stdout=output,
                 stderr=err,
                 rc=rc,
@@ -230,7 +245,7 @@ def main():
                 failed=False,
                 changed=False,
                 msg="Plugin not found or is already uninstalled",
-                command=command,
+                command=helm_cmd_common + " list",
                 stdout=output,
                 stderr=err,
                 rc=rc,
@@ -238,9 +253,7 @@ def main():
 
         helm_uninstall_cmd = "%s uninstall %s" % (helm_cmd_common, plugin_name)
         if not module.check_mode:
-            rc, out, err = module.run_helm_command(
-                helm_uninstall_cmd, fails_on_error=False
-            )
+            rc, out, err = run_helm(module, helm_uninstall_cmd, fails_on_error=False)
         else:
             rc, out, err = (0, "", "")
 
@@ -262,15 +275,15 @@ def main():
         )
     elif state == "latest":
         plugin_name = module.params.get("plugin_name")
-        rc, output, err, command = module.get_helm_plugin_list()
-        out = parse_helm_plugin_list(output=output.splitlines())
+        rc, output, err = get_helm_plugin_list(module, helm_bin=helm_cmd_common)
+        out = parse_helm_plugin_list(module, output=output.splitlines())
 
         if not out:
             module.exit_json(
                 failed=False,
                 changed=False,
                 msg="Plugin not found",
-                command=command,
+                command=helm_cmd_common + " list",
                 stdout=output,
                 stderr=err,
                 rc=rc,
@@ -286,7 +299,7 @@ def main():
                 failed=False,
                 changed=False,
                 msg="Plugin not found",
-                command=command,
+                command=helm_cmd_common + " list",
                 stdout=output,
                 stderr=err,
                 rc=rc,
@@ -294,9 +307,7 @@ def main():
 
         helm_update_cmd = "%s update %s" % (helm_cmd_common, plugin_name)
         if not module.check_mode:
-            rc, out, err = module.run_helm_command(
-                helm_update_cmd, fails_on_error=False
-            )
+            rc, out, err = run_helm(module, helm_update_cmd, fails_on_error=False)
         else:
             rc, out, err = (0, "", "")
 

plugins/modules/helm_plugin_info.py

@@ -70,41 +70,73 @@ rc:
   sample: 1
 """
 
-import copy
+from ansible.module_utils.basic import AnsibleModule, env_fallback
 from ansible_collections.kubernetes.core.plugins.module_utils.helm import (
+    get_helm_plugin_list,
     parse_helm_plugin_list,
-    AnsibleHelmModule,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.helm_args_common import (
-    HELM_AUTH_ARG_SPEC,
-    HELM_AUTH_MUTUALLY_EXCLUSIVE,
 )
 
 
 def main():
-
-    argument_spec = copy.deepcopy(HELM_AUTH_ARG_SPEC)
-    argument_spec.update(
-        dict(
-            plugin_name=dict(
+    module = AnsibleModule(
+        argument_spec=dict(
+            binary_path=dict(type="path"),
+            plugin_name=dict(type="str",),
+            # Helm options
+            context=dict(
                 type="str",
+                aliases=["kube_context"],
+                fallback=(env_fallback, ["K8S_AUTH_CONTEXT"]),
             ),
-        )
-    )
-
-    module = AnsibleHelmModule(
-        argument_spec=argument_spec,
-        mutually_exclusive=HELM_AUTH_MUTUALLY_EXCLUSIVE,
+            kubeconfig=dict(
+                type="path",
+                aliases=["kubeconfig_path"],
+                fallback=(env_fallback, ["K8S_AUTH_KUBECONFIG"]),
+            ),
+            # Generic auth key
+            host=dict(type="str", fallback=(env_fallback, ["K8S_AUTH_HOST"])),
+            ca_cert=dict(
+                type="path",
+                aliases=["ssl_ca_cert"],
+                fallback=(env_fallback, ["K8S_AUTH_SSL_CA_CERT"]),
+            ),
+            validate_certs=dict(
+                type="bool",
+                default=True,
+                aliases=["verify_ssl"],
+                fallback=(env_fallback, ["K8S_AUTH_VERIFY_SSL"]),
+            ),
+            api_key=dict(
+                type="str", no_log=True, fallback=(env_fallback, ["K8S_AUTH_API_KEY"])
+            ),
+        ),
+        mutually_exclusive=[
+            ("context", "ca_cert"),
+            ("context", "validate_certs"),
+            ("kubeconfig", "ca_cert"),
+            ("kubeconfig", "validate_certs"),
+        ],
         supports_check_mode=True,
     )
 
+    bin_path = module.params.get("binary_path")
+
+    if bin_path is not None:
+        helm_cmd_common = bin_path
+    else:
+        helm_cmd_common = "helm"
+
+    helm_cmd_common = module.get_bin_path(helm_cmd_common, required=True)
+
+    helm_cmd_common += " plugin"
+
     plugin_name = module.params.get("plugin_name")
 
     plugin_list = []
 
-    rc, output, err, command = module.get_helm_plugin_list()
+    rc, output, err = get_helm_plugin_list(module, helm_bin=helm_cmd_common)
 
-    out = parse_helm_plugin_list(output=output.splitlines())
+    out = parse_helm_plugin_list(module, output=output.splitlines())
 
     for line in out:
         if plugin_name is None:
@@ -121,7 +153,7 @@ def main():
 
     module.exit_json(
         changed=True,
-        command=command,
+        command=helm_cmd_common + " list",
         stdout=output,
         stderr=err,
         rc=rc,

plugins/modules/helm_pull.py

@@ -1,302 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# Copyright: (c) 2022, Ansible Project
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-from __future__ import absolute_import, division, print_function
-
-__metaclass__ = type
-
-
-DOCUMENTATION = r"""
----
-module: helm_pull
-short_description: download a chart from a repository and (optionally) unpack it in local directory.
-version_added: "2.4.0"
-author:
-  - Aubin Bikouo (@abikouo)
-description:
-  - Retrieve a package from a package repository, and download it locally.
-  - It can also be used to perform cryptographic verification of a chart without installing the chart.
-  - There are options for unpacking the chart after download.
-
-requirements:
-  - "helm >= 3.0 (https://github.com/helm/helm/releases)"
-
-options:
-  chart_ref:
-    description:
-      - chart name on chart repository.
-      - absolute URL.
-    required: true
-    type: str
-  chart_version:
-    description:
-      - Specify a version constraint for the chart version to use.
-      - This constraint can be a specific tag (e.g. 1.1.1) or it may reference a valid range (e.g. ^2.0.0).
-      - Mutually exclusive with C(chart_devel).
-    type: str
-  verify_chart:
-    description:
-      - Verify the package before using it.
-    default: False
-    type: bool
-  verify_chart_keyring:
-    description:
-      - location of public keys used for verification.
-    type: path
-  provenance:
-    description:
-      - Fetch the provenance file, but don't perform verification.
-    type: bool
-    default: False
-  repo_url:
-    description:
-      - chart repository url where to locate the requested chart.
-    type: str
-    aliases: [ url, chart_repo_url ]
-  repo_username:
-    description:
-      - Chart repository username where to locate the requested chart.
-      - Required if C(repo_password) is specified.
-    type: str
-    aliases: [ username, chart_repo_username ]
-  repo_password:
-    description:
-      - Chart repository password where to locate the requested chart.
-      - Required if C(repo_username) is specified.
-    type: str
-    aliases: [ password, chart_repo_password ]
-  pass_credentials:
-    description:
-      - Pass credentials to all domains.
-    default: False
-    type: bool
-  skip_tls_certs_check:
-    description:
-    - Whether or not to check tls certificate for the chart download.
-    - Requires helm >= 3.3.0.
-    type: bool
-    default: False
-  chart_devel:
-    description:
-    - Use development versions, too. Equivalent to version '>0.0.0-0'.
-    - Mutually exclusive with C(chart_version).
-    type: bool
-  untar_chart:
-    description:
-    - if set to true, will untar the chart after downloading it.
-    type: bool
-    default: False
-  destination:
-    description:
-    - location to write the chart.
-    type: path
-    required: True
-  chart_ca_cert:
-    description:
-    - Verify certificates of HTTPS-enabled servers using this CA bundle.
-    - Requires helm >= 3.1.0.
-    type: path
-  chart_ssl_cert_file:
-    description:
-    - Identify HTTPS client using this SSL certificate file.
-    - Requires helm >= 3.1.0.
-    type: path
-  chart_ssl_key_file:
-    description:
-    - Identify HTTPS client using this SSL key file
-    - Requires helm >= 3.1.0.
-    type: path
-  binary_path:
-    description:
-      - The path of a helm binary to use.
-    required: false
-    type: path
-"""
-
-EXAMPLES = r"""
-- name: Download chart using chart url
-  kubernetes.core.helm_pull:
-    chart_ref: https://github.com/grafana/helm-charts/releases/download/grafana-5.6.0/grafana-5.6.0.tgz
-    destination: /path/to/chart
-
-- name: Download Chart using chart_name and repo_url
-  kubernetes.core.helm_pull:
-    chart_ref: redis
-    repo_url: https://charts.bitnami.com/bitnami
-    untar_chart: yes
-    destination: /path/to/chart
-
-- name: Download Chart (skip tls certificate check)
-  kubernetes.core.helm_pull:
-    chart_ref: redis
-    repo_url: https://charts.bitnami.com/bitnami
-    untar_chart: yes
-    destination: /path/to/chart
-    skip_tls_certs_check: yes
-
-- name: Download Chart using chart registry credentials
-  kubernetes.core.helm_pull:
-    chart_ref: redis
-    repo_url: https://charts.bitnami.com/bitnami
-    untar_chart: yes
-    destination: /path/to/chart
-    username: myuser
-    password: mypassword123
-"""
-
-RETURN = r"""
-stdout:
-  type: str
-  description: Full `helm pull` command stdout, in case you want to display it or examine the event log
-  returned: always
-  sample: ''
-stderr:
-  type: str
-  description: Full `helm pull` command stderr, in case you want to display it or examine the event log
-  returned: always
-  sample: ''
-command:
-  type: str
-  description: Full `helm pull` command built by this module, in case you want to re-run the command outside the module or debug a problem.
-  returned: always
-  sample: helm pull --repo test ...
-rc:
-  type: int
-  description: Helm pull command return code
-  returned: always
-  sample: 1
-"""
-
-from ansible_collections.kubernetes.core.plugins.module_utils.helm import (
-    AnsibleHelmModule,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.version import (
-    LooseVersion,
-)
-
-
-def main():
-    argspec = dict(
-        chart_ref=dict(type="str", required=True),
-        chart_version=dict(type="str"),
-        verify_chart=dict(type="bool", default=False),
-        verify_chart_keyring=dict(type="path"),
-        provenance=dict(type="bool", default=False),
-        repo_url=dict(type="str", aliases=["url", "chart_repo_url"]),
-        repo_username=dict(type="str", aliases=["username", "chart_repo_username"]),
-        repo_password=dict(
-            type="str", no_log=True, aliases=["password", "chart_repo_password"]
-        ),
-        pass_credentials=dict(type="bool", default=False),
-        skip_tls_certs_check=dict(type="bool", default=False),
-        chart_devel=dict(type="bool"),
-        untar_chart=dict(type="bool", default=False),
-        destination=dict(type="path", required=True),
-        chart_ca_cert=dict(type="path"),
-        chart_ssl_cert_file=dict(type="path"),
-        chart_ssl_key_file=dict(type="path"),
-        binary_path=dict(type="path"),
-    )
-    module = AnsibleHelmModule(
-        argument_spec=argspec,
-        supports_check_mode=True,
-        required_by=dict(
-            repo_username=("repo_password"),
-            repo_password=("repo_username"),
-        ),
-        mutually_exclusive=[("chart_version", "chart_devel")],
-    )
-
-    helm_version = module.get_helm_version()
-    if LooseVersion(helm_version) < LooseVersion("3.0.0"):
-        module.fail_json(
-            msg="This module requires helm >= 3.0.0, current version is {0}".format(
-                helm_version
-            )
-        )
-
-    helm_pull_opt_versionning = dict(
-        skip_tls_certs_check="3.3.0",
-        chart_ca_cert="3.1.0",
-        chart_ssl_cert_file="3.1.0",
-        chart_ssl_key_file="3.1.0",
-    )
-
-    def test_version_requirement(opt):
-        req_version = helm_pull_opt_versionning.get(opt)
-        if req_version and LooseVersion(helm_version) < LooseVersion(req_version):
-            module.fail_json(
-                msg="Parameter {0} requires helm >= {1}, current version is {2}".format(
-                    opt, req_version, helm_version
-                )
-            )
-
-    # Set `helm pull` arguments requiring values
-    helm_pull_opts = []
-
-    helm_value_args = dict(
-        chart_version="version",
-        verify_chart_keyring="keyring",
-        repo_url="repo",
-        repo_username="username",
-        repo_password="password",
-        destination="destination",
-        chart_ca_cert="ca-file",
-        chart_ssl_cert_file="cert-file",
-        chart_ssl_key_file="key-file",
-    )
-
-    for opt, cmdkey in helm_value_args.items():
-        if module.params.get(opt):
-            test_version_requirement(opt)
-            helm_pull_opts.append("--{0} {1}".format(cmdkey, module.params.get(opt)))
-
-    # Set `helm pull` arguments flags
-    helm_flag_args = dict(
-        verify_chart=dict(key="verify"),
-        provenance=dict(key="prov"),
-        pass_credentials=dict(key="pass-credentials"),
-        skip_tls_certs_check=dict(key="insecure-skip-tls-verify"),
-        chart_devel=dict(key="devel"),
-        untar_chart=dict(key="untar"),
-    )
-
-    for k, v in helm_flag_args.items():
-        if module.params.get(k):
-            test_version_requirement(k)
-            helm_pull_opts.append("--{0}".format(v["key"]))
-
-    helm_cmd_common = "{0} pull {1} {2}".format(
-        module.get_helm_binary(),
-        module.params.get("chart_ref"),
-        " ".join(helm_pull_opts),
-    )
-    if not module.check_mode:
-        rc, out, err = module.run_helm_command(helm_cmd_common, fails_on_error=False)
-    else:
-        rc, out, err = (0, "", "")
-
-    if rc == 0:
-        module.exit_json(
-            failed=False,
-            changed=True,
-            command=helm_cmd_common,
-            stdout=out,
-            stderr=err,
-            rc=rc,
-        )
-    else:
-        module.fail_json(
-            msg="Failure when executing Helm command.",
-            command=helm_cmd_common,
-            changed=False,
-            stdout=out,
-            stderr=err,
-            rc=rc,
-        )
-
-
-if __name__ == "__main__":
-    main()

plugins/modules/helm_repository.py

@@ -97,28 +97,6 @@ options:
     type: path
     aliases: [ ssl_ca_cert ]
     version_added: "2.3.0"
-  context:
-    description:
-      - Helm option to specify which kubeconfig context to use.
-      - If the value is not specified in the task, the value of environment variable C(K8S_AUTH_CONTEXT) will be used instead.
-    type: str
-    aliases: [ kube_context ]
-    version_added: "2.4.0"
-  kubeconfig:
-    description:
-      - Helm option to specify kubeconfig path to use.
-      - If the value is not specified in the task, the value of environment variable C(K8S_AUTH_KUBECONFIG) will be used instead.
-      - The configuration can be provided as dictionary.
-    type: raw
-    aliases: [ kubeconfig_path ]
-    version_added: "2.4.0"
-  force_update:
-    description:
-    - Whether or not to replace (overwrite) the repo if it already exists.
-    type: bool
-    aliases: [ force ]
-    default: False
-    version_added: "2.4.0"
 """
 
 EXAMPLES = r"""
@@ -167,25 +145,17 @@ msg:
 """
 
 import traceback
-import copy
 
 try:
     import yaml
 
     IMP_YAML = True
-    IMP_YAML_ERR = None
 except ImportError:
     IMP_YAML_ERR = traceback.format_exc()
     IMP_YAML = False
 
-from ansible.module_utils.basic import missing_required_lib
-from ansible_collections.kubernetes.core.plugins.module_utils.helm import (
-    AnsibleHelmModule,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.helm_args_common import (
-    HELM_AUTH_ARG_SPEC,
-    HELM_AUTH_MUTUALLY_EXCLUSIVE,
-)
+from ansible.module_utils.basic import AnsibleModule, env_fallback, missing_required_lib
+from ansible_collections.kubernetes.core.plugins.module_utils.helm import run_helm
 
 
 # Get repository from all repositories added
@@ -198,10 +168,10 @@ def get_repository(state, repo_name):
 
 
 # Get repository status
-def get_repository_status(module, repository_name):
-    list_command = module.get_helm_binary() + " repo list --output=yaml"
+def get_repository_status(module, command, repository_name):
+    list_command = command + " repo list --output=yaml"
 
-    rc, out, err = module.run_helm_command(list_command, fails_on_error=False)
+    rc, out, err = run_helm(module, list_command, fails_on_error=False)
 
     # no repo => rc=1 and 'no repositories to show' in output
     if rc == 1 and "no repositories to show" in err:
@@ -225,7 +195,6 @@ def install_repository(
     repository_username,
     repository_password,
     pass_credentials,
-    force_update,
 ):
     install_command = command + " repo add " + repository_name + " " + repository_url
 
@@ -236,9 +205,6 @@ def install_repository(
     if pass_credentials:
         install_command += " --pass-credentials"
 
-    if force_update:
-        install_command += " --force-update"
-
     return install_command
 
 
@@ -249,10 +215,12 @@ def delete_repository(command, repository_name):
     return remove_command
 
 
-def argument_spec():
-    arg_spec = copy.deepcopy(HELM_AUTH_ARG_SPEC)
-    arg_spec.update(
-        dict(
+def main():
+    global module
+
+    module = AnsibleModule(
+        argument_spec=dict(
+            binary_path=dict(type="path"),
             repo_name=dict(type="str", aliases=["name"], required=True),
             repo_url=dict(type="str", aliases=["url"]),
             repo_username=dict(type="str", aliases=["username"]),
@@ -260,21 +228,26 @@ def argument_spec():
             repo_state=dict(
                 default="present", choices=["present", "absent"], aliases=["state"]
             ),
-            pass_credentials=dict(type="bool", default=False, no_log=True),
-            force_update=dict(type="bool", default=False, aliases=["force"]),
-        )
-    )
-    return arg_spec
-
-
-def main():
-    global module
-
-    module = AnsibleHelmModule(
-        argument_spec=argument_spec(),
+            pass_credentials=dict(type="bool", default=False),
+            # Generic auth key
+            host=dict(type="str", fallback=(env_fallback, ["K8S_AUTH_HOST"])),
+            ca_cert=dict(
+                type="path",
+                aliases=["ssl_ca_cert"],
+                fallback=(env_fallback, ["K8S_AUTH_SSL_CA_CERT"]),
+            ),
+            validate_certs=dict(
+                type="bool",
+                default=True,
+                aliases=["verify_ssl"],
+                fallback=(env_fallback, ["K8S_AUTH_VERIFY_SSL"]),
+            ),
+            api_key=dict(
+                type="str", no_log=True, fallback=(env_fallback, ["K8S_AUTH_API_KEY"])
+            ),
+        ),
         required_together=[["repo_username", "repo_password"]],
         required_if=[("repo_state", "present", ["repo_url"])],
-        mutually_exclusive=HELM_AUTH_MUTUALLY_EXCLUSIVE,
         supports_check_mode=True,
     )
 
@@ -283,23 +256,26 @@ def main():
 
     changed = False
 
+    bin_path = module.params.get("binary_path")
     repo_name = module.params.get("repo_name")
     repo_url = module.params.get("repo_url")
     repo_username = module.params.get("repo_username")
     repo_password = module.params.get("repo_password")
     repo_state = module.params.get("repo_state")
     pass_credentials = module.params.get("pass_credentials")
-    force_update = module.params.get("force_update")
 
-    helm_cmd = module.get_helm_binary()
+    if bin_path is not None:
+        helm_cmd = bin_path
+    else:
+        helm_cmd = module.get_bin_path("helm", required=True)
 
-    repository_status = get_repository_status(module, repo_name)
+    repository_status = get_repository_status(module, helm_cmd, repo_name)
 
     if repo_state == "absent" and repository_status is not None:
         helm_cmd = delete_repository(helm_cmd, repo_name)
         changed = True
     elif repo_state == "present":
-        if repository_status is None or force_update:
+        if repository_status is None:
             helm_cmd = install_repository(
                 helm_cmd,
                 repo_name,
@@ -307,7 +283,6 @@ def main():
                 repo_username,
                 repo_password,
                 pass_credentials,
-                force_update,
             )
             changed = True
         elif repository_status["url"] != repo_url:
@@ -320,7 +295,7 @@ def main():
     elif not changed:
         module.exit_json(changed=False, repo_name=repo_name, repo_url=repo_url)
 
-    rc, out, err = module.run_helm_command(helm_cmd)
+    rc, out, err = run_helm(module, helm_cmd)
 
     if repo_password is not None:
         helm_cmd = helm_cmd.replace(repo_password, "******")

plugins/modules/helm_template.py

@@ -45,21 +45,6 @@ options:
       - Chart version to use. If this is not specified, the latest version is installed.
     required: false
     type: str
-  dependency_update:
-    description:
-      - Run helm dependency update before the operation.
-      - The I(dependency_update) option require the add of C(dependencies) block in C(Chart.yaml/requirements.yaml) file.
-      - For more information please visit U(https://helm.sh/docs/helm/helm_dependency/)
-    default: false
-    type: bool
-    aliases: [ dep_up ]
-    version_added: "2.4.0"
-  disable_hook:
-    description:
-      - Prevent hooks from running during install.
-    default: False
-    type: bool
-    version_added: 2.4.0
   include_crds:
     description:
       - Include custom resource descriptions in rendered templates.
@@ -72,19 +57,12 @@ options:
       - If the directory already exists, it will be overwritten.
     required: false
     type: path
-  release_name:
-    description:
-      - Release name to use in rendered templates.
-    required: false
-    aliases: [ name ]
-    type: str
-    version_added: 2.4.0
   release_namespace:
     description:
       - namespace scope for this request.
     required: false
     type: str
-    version_added: 2.4.0
+    version_added: 2.3.0
   release_values:
     description:
         - Values to pass to chart.
@@ -98,7 +76,7 @@ options:
     required: false
     type: list
     elements: str
-    version_added: 2.4.0
+    version_added: 2.3.0
   values_files:
     description:
         - Value files to pass to chart.
@@ -114,31 +92,6 @@ options:
       - Run C(helm repo update) before the operation. Can be run as part of the template generation or as a separate step.
     default: false
     type: bool
-  set_values:
-    description:
-      - Values to pass to chart configuration.
-    required: false
-    type: list
-    elements: dict
-    suboptions:
-      value:
-        description:
-          - Value to pass to chart configuration (e.g phase=prod).
-        type: str
-        required: true
-      value_type:
-        description:
-          - Use C(raw) set individual value.
-          - Use C(string) to force a string for an individual value.
-          - Use C(file) to set individual values from a file when the value itself is too long for the command line or is dynamically generated.
-          - Use C(json) to set json values (scalars/objects/arrays). This feature requires helm>=3.10.0.
-        default: raw
-        choices:
-          - raw
-          - string
-          - json
-          - file
-    version_added: '2.4.0'
 """
 
 EXAMPLES = r"""
@@ -201,15 +154,12 @@ try:
     import yaml
 
     IMP_YAML = True
-    IMP_YAML_ERR = None
 except ImportError:
     IMP_YAML_ERR = traceback.format_exc()
     IMP_YAML = False
 
-from ansible.module_utils.basic import missing_required_lib
-from ansible_collections.kubernetes.core.plugins.module_utils.helm import (
-    AnsibleHelmModule,
-)
+from ansible.module_utils.basic import AnsibleModule, missing_required_lib
+from ansible_collections.kubernetes.core.plugins.module_utils.helm import run_helm
 
 
 def template(
@@ -217,26 +167,14 @@ def template(
     chart_ref,
     chart_repo_url=None,
     chart_version=None,
-    dependency_update=None,
-    disable_hook=None,
     output_dir=None,
     show_only=None,
-    release_name=None,
-    release_namespace=None,
     release_values=None,
+    release_namespace=None,
     values_files=None,
     include_crds=False,
-    set_values=None,
 ):
-    cmd += " template "
-
-    if release_name:
-        cmd += release_name + " "
-
-    cmd += chart_ref
-
-    if dependency_update:
-        cmd += " --dependency-update"
+    cmd += " template " + chart_ref
 
     if chart_repo_url:
         cmd += " --repo=" + chart_repo_url
@@ -244,9 +182,6 @@ def template(
     if chart_version:
         cmd += " --version=" + chart_version
 
-    if disable_hook:
-        cmd += " --no-hooks"
-
     if output_dir:
         cmd += " --output-dir=" + output_dir
 
@@ -270,82 +205,64 @@ def template(
     if include_crds:
         cmd += " --include-crds"
 
-    if set_values:
-        cmd += " " + set_values
-
     return cmd
 
 
 def main():
-    module = AnsibleHelmModule(
+    module = AnsibleModule(
         argument_spec=dict(
             binary_path=dict(type="path"),
             chart_ref=dict(type="path", required=True),
             chart_repo_url=dict(type="str"),
             chart_version=dict(type="str"),
-            dependency_update=dict(type="bool", default=False, aliases=["dep_up"]),
-            disable_hook=dict(type="bool", default=False),
             include_crds=dict(type="bool", default=False),
-            release_name=dict(type="str", aliases=["name"]),
             output_dir=dict(type="path"),
             release_namespace=dict(type="str"),
             release_values=dict(type="dict", default={}, aliases=["values"]),
             show_only=dict(type="list", default=[], elements="str"),
             values_files=dict(type="list", default=[], elements="str"),
             update_repo_cache=dict(type="bool", default=False),
-            set_values=dict(type="list", elements="dict"),
         ),
         supports_check_mode=True,
     )
 
     check_mode = module.check_mode
+    bin_path = module.params.get("binary_path")
     chart_ref = module.params.get("chart_ref")
     chart_repo_url = module.params.get("chart_repo_url")
     chart_version = module.params.get("chart_version")
-    dependency_update = module.params.get("dependency_update")
-    disable_hook = module.params.get("disable_hook")
     include_crds = module.params.get("include_crds")
-    release_name = module.params.get("release_name")
     output_dir = module.params.get("output_dir")
     show_only = module.params.get("show_only")
     release_namespace = module.params.get("release_namespace")
     release_values = module.params.get("release_values")
     values_files = module.params.get("values_files")
     update_repo_cache = module.params.get("update_repo_cache")
-    set_values = module.params.get("set_values")
 
     if not IMP_YAML:
         module.fail_json(msg=missing_required_lib("yaml"), exception=IMP_YAML_ERR)
 
-    helm_cmd = module.get_helm_binary()
+    helm_cmd = bin_path or module.get_bin_path("helm", required=True)
 
     if update_repo_cache:
         update_cmd = helm_cmd + " repo update"
-        module.run_helm_command(update_cmd)
-
-    set_values_args = None
-    if set_values:
-        set_values_args = module.get_helm_set_values_args(set_values)
+        run_helm(module, update_cmd)
 
     tmpl_cmd = template(
         helm_cmd,
         chart_ref,
-        dependency_update=dependency_update,
         chart_repo_url=chart_repo_url,
         chart_version=chart_version,
-        disable_hook=disable_hook,
-        release_name=release_name,
         output_dir=output_dir,
         release_namespace=release_namespace,
         release_values=release_values,
         show_only=show_only,
         values_files=values_files,
         include_crds=include_crds,
-        set_values=set_values_args,
     )
 
     if not check_mode:
-        rc, out, err = module.run_helm_command(tmpl_cmd)
+        rc, out, err = run_helm(module, tmpl_cmd)
     else:
         out = err = ""
         rc = 0

plugins/modules/k8s.py

@@ -232,14 +232,6 @@ EXAMPLES = r"""
     state: present
     definition: "{{ lookup('file', '/testing/deployment.yml') | from_yaml }}"
 
-- name: >-
-    (Alternative) Read definition file from the Ansible controller file system.
-    In this case, the definition file contains multiple YAML documents, separated by ---.
-    If the definition file has been encrypted with Ansible Vault it will automatically be decrypted.
-  kubernetes.core.k8s:
-    state: present
-    definition: "{{ lookup('file', '/testing/deployment.yml') | from_yaml_all }}"
-
 - name: Read definition template file from the Ansible controller file system
   kubernetes.core.k8s:
     state: present
@@ -399,15 +391,6 @@ from ansible_collections.kubernetes.core.plugins.module_utils.args_common import
     RESOURCE_ARG_SPEC,
     DELETE_OPTS_ARG_SPEC,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.core import (
-    AnsibleK8SModule,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions import (
-    CoreException,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.runner import (
-    run_module,
-)
 
 
 def validate_spec():
@@ -454,6 +437,28 @@ def argspec():
     return argument_spec
 
 
+def execute_module(module, k8s_ansible_mixin):
+    k8s_ansible_mixin.module = module
+    k8s_ansible_mixin.argspec = module.argument_spec
+    k8s_ansible_mixin.check_mode = k8s_ansible_mixin.module.check_mode
+    k8s_ansible_mixin.params = k8s_ansible_mixin.module.params
+    k8s_ansible_mixin.fail_json = k8s_ansible_mixin.module.fail_json
+    k8s_ansible_mixin.fail = k8s_ansible_mixin.module.fail_json
+    k8s_ansible_mixin.exit_json = k8s_ansible_mixin.module.exit_json
+    k8s_ansible_mixin.warn = k8s_ansible_mixin.module.warn
+    k8s_ansible_mixin.warnings = []
+
+    k8s_ansible_mixin.kind = k8s_ansible_mixin.params.get("kind")
+    k8s_ansible_mixin.api_version = k8s_ansible_mixin.params.get("api_version")
+    k8s_ansible_mixin.name = k8s_ansible_mixin.params.get("name")
+    k8s_ansible_mixin.generate_name = k8s_ansible_mixin.params.get("generate_name")
+    k8s_ansible_mixin.namespace = k8s_ansible_mixin.params.get("namespace")
+
+    k8s_ansible_mixin.check_library_version()
+    k8s_ansible_mixin.set_resource_definitions(module)
+    k8s_ansible_mixin.execute_module()
+
+
 def main():
     mutually_exclusive = [
         ("resource_definition", "src"),
@@ -462,17 +467,19 @@ def main():
         ("template", "src"),
         ("name", "generate_name"),
     ]
-
-    module = AnsibleK8SModule(
-        module_class=AnsibleModule,
+    module = AnsibleModule(
         argument_spec=argspec(),
         mutually_exclusive=mutually_exclusive,
         supports_check_mode=True,
     )
-    try:
-        run_module(module)
-    except CoreException as e:
-        module.fail_from_exception(e)
+    from ansible_collections.kubernetes.core.plugins.module_utils.common import (
+        K8sAnsibleMixin,
+        get_api_client,
+    )
+
+    k8s_ansible_mixin = K8sAnsibleMixin(module)
+    k8s_ansible_mixin.client = get_api_client(module=module)
+    execute_module(module, k8s_ansible_mixin)
 
 
 if __name__ == "__main__":

plugins/modules/k8s_cluster_info.py

@@ -141,32 +141,36 @@ apis:
 
 
 import copy
+import traceback
 from collections import defaultdict
 
+HAS_K8S = False
 try:
     from ansible_collections.kubernetes.core.plugins.module_utils.client.resource import (
         ResourceList,
     )
-except ImportError:
-    # Handled during module setup
-    pass
 
+    HAS_K8S = True
+except ImportError as e:
+    K8S_IMP_ERR = e
+    K8S_IMP_EXC = traceback.format_exc()
+
+from ansible.module_utils._text import to_native
+from ansible.module_utils.basic import missing_required_lib
+from ansible.module_utils.parsing.convert_bool import boolean
 from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import (
     AnsibleModule,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.core import (
-    AnsibleK8SModule,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions import (
-    CoreException,
-)
 from ansible_collections.kubernetes.core.plugins.module_utils.args_common import (
     AUTH_ARG_SPEC,
 )
 
 
 def execute_module(module, client):
-    if module.params.get("invalidate_cache"):
+    invalidate_cache = boolean(
+        module.params.get("invalidate_cache", True), strict=False
+    )
+    if invalidate_cache:
         client.resources.invalidate_cache()
     results = defaultdict(dict)
     for resource in list(client.resources):
@@ -200,7 +204,7 @@ def execute_module(module, client):
 
     version_info = {
         "client": version,
-        "server": client.client.version,
+        "server": client.version,
     }
     module.exit_json(
         changed=False, apis=results, connection=connection, version=version_info
@@ -214,18 +218,18 @@ def argspec():
 
 
 def main():
-    module = AnsibleK8SModule(
-        module_class=AnsibleModule, argument_spec=argspec(), supports_check_mode=True
-    )
-
-    from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
+    module = AnsibleModule(argument_spec=argspec(), supports_check_mode=True)
+    if not HAS_K8S:
+        module.fail_json(
+            msg=missing_required_lib("kubernetes"),
+            exception=K8S_IMP_EXC,
+            error=to_native(K8S_IMP_ERR),
+        )
+    from ansible_collections.kubernetes.core.plugins.module_utils.common import (
         get_api_client,
     )
 
-    try:
-        execute_module(module, client=get_api_client(module=module))
-    except CoreException as e:
-        module.fail_from_exception(e)
+    execute_module(module, client=get_api_client(module=module))
 
 
 if __name__ == "__main__":

plugins/modules/k8s_cp.py

@@ -119,7 +119,7 @@ EXAMPLES = r"""
     state: from_pod
 
 # copy content into a file in the remote pod
-- name: Copy content into a file in the remote pod
+- name: Copy /tmp/foo from a remote pod to /tmp/bar locally
   kubernetes.core.k8s_cp:
     state: to_pod
     namespace: some-namespace
@@ -142,19 +142,6 @@ import copy
 from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import (
     AnsibleModule,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
-    get_api_client,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.core import (
-    AnsibleK8SModule,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions import (
-    CoreException,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.service import (
-    K8sService,
-)
-
 from ansible_collections.kubernetes.core.plugins.module_utils.args_common import (
     AUTH_ARG_SPEC,
 )
@@ -184,9 +171,23 @@ def argspec():
 
 
 def execute_module(module):
-    client = get_api_client(module=module)
-    svc = K8sService(client, module)
-    containers = check_pod(svc)
+
+    from ansible_collections.kubernetes.core.plugins.module_utils.common import (
+        K8sAnsibleMixin,
+        get_api_client,
+    )
+
+    k8s_ansible_mixin = K8sAnsibleMixin(module, pyyaml_required=False)
+    k8s_ansible_mixin.check_library_version()
+
+    k8s_ansible_mixin.module = module
+    k8s_ansible_mixin.argspec = module.argument_spec
+    k8s_ansible_mixin.params = k8s_ansible_mixin.module.params
+    k8s_ansible_mixin.fail_json = k8s_ansible_mixin.module.fail_json
+    k8s_ansible_mixin.fail = k8s_ansible_mixin.module.fail_json
+
+    k8s_ansible_mixin.client = get_api_client(module=module)
+    containers = check_pod(k8s_ansible_mixin, module)
     if len(containers) > 1 and module.params.get("container") is None:
         module.fail_json(
             msg="Pod contains more than 1 container, option 'container' should be set"
@@ -194,9 +195,9 @@ def execute_module(module):
 
     state = module.params.get("state")
     if state == "to_pod":
-        k8s_copy = K8SCopyToPod(module, client.client)
+        k8s_copy = K8SCopyToPod(module, k8s_ansible_mixin.client)
     else:
-        k8s_copy = K8SCopyFromPod(module, client.client)
+        k8s_copy = K8SCopyFromPod(module, k8s_ansible_mixin.client)
 
     try:
         k8s_copy.run()
@@ -205,20 +206,15 @@ def execute_module(module):
 
 
 def main():
-    module = AnsibleK8SModule(
-        module_class=AnsibleModule,
+    module = AnsibleModule(
         argument_spec=argspec(),
-        check_pyyaml=False,
         mutually_exclusive=[("local_path", "content")],
         required_if=[("state", "from_pod", ["local_path"])],
         required_one_of=[["local_path", "content"]],
         supports_check_mode=True,
     )
 
-    try:
-        execute_module(module)
-    except CoreException as e:
-        module.fail_from_exception(e)
+    execute_module(module)
 
 
 if __name__ == "__main__":

plugins/modules/k8s_drain.py

@@ -136,21 +136,11 @@ from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule impo
 from ansible_collections.kubernetes.core.plugins.module_utils.args_common import (
     AUTH_ARG_SPEC,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
-    get_api_client,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.core import (
-    AnsibleK8SModule,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions import (
-    CoreException,
-)
-
 from ansible.module_utils._text import to_native
 
 try:
     from kubernetes.client.api import core_v1_api
-    from kubernetes.client.models import V1DeleteOptions, V1ObjectMeta
+    from kubernetes.client.models import V1DeleteOptions
     from kubernetes.client.exceptions import ApiException
 except ImportError:
     # ImportError are managed by the common module already.
@@ -254,16 +244,44 @@ def filter_pods(pods, force, ignore_daemonset, delete_emptydir_data):
 
 
 class K8sDrainAnsible(object):
-    def __init__(self, module, client):
+    def __init__(self, module):
+        from ansible_collections.kubernetes.core.plugins.module_utils.common import (
+            K8sAnsibleMixin,
+            get_api_client,
+        )
+
         self._module = module
-        self._api_instance = core_v1_api.CoreV1Api(client.client)
+        self._k8s_ansible_mixin = K8sAnsibleMixin(module)
+        self._k8s_ansible_mixin.client = get_api_client(module=self._module)
+
+        self._k8s_ansible_mixin.module = self._module
+        self._k8s_ansible_mixin.argspec = self._module.argument_spec
+        self._k8s_ansible_mixin.check_mode = self._module.check_mode
+        self._k8s_ansible_mixin.params = self._module.params
+        self._k8s_ansible_mixin.fail_json = self._module.fail_json
+        self._k8s_ansible_mixin.fail = self._module.fail_json
+        self._k8s_ansible_mixin.exit_json = self._module.exit_json
+        self._k8s_ansible_mixin.warn = self._module.warn
+        self._k8s_ansible_mixin.warnings = []
+
+        self._api_instance = core_v1_api.CoreV1Api(
+            self._k8s_ansible_mixin.client.client
+        )
+        self._k8s_ansible_mixin.check_library_version()
 
         # delete options
         self._drain_options = module.params.get("delete_options", {})
         self._delete_options = None
         if self._drain_options.get("terminate_grace_period"):
-            self._delete_options = V1DeleteOptions(
-                grace_period_seconds=self._drain_options.get("terminate_grace_period")
+            self._delete_options = {}
+            self._delete_options.update({"apiVersion": "v1"})
+            self._delete_options.update({"kind": "DeleteOptions"})
+            self._delete_options.update(
+                {
+                    "gracePeriodSeconds": self._drain_options.get(
+                        "terminate_grace_period"
+                    )
+                }
             )
 
         self._changed = False
@@ -300,16 +318,17 @@ class K8sDrainAnsible(object):
 
     def evict_pods(self, pods):
         for namespace, name in pods:
+            definition = {"metadata": {"name": name, "namespace": namespace}}
+            if self._delete_options:
+                definition.update({"delete_options": self._delete_options})
             try:
                 if self._drain_options.get("disable_eviction"):
+                    body = V1DeleteOptions(**definition)
                     self._api_instance.delete_namespaced_pod(
-                        name=name, namespace=namespace, body=self._delete_options
+                        name=name, namespace=namespace, body=body
                     )
                 else:
-                    body = v1_eviction(
-                        delete_options=self._delete_options,
-                        metadata=V1ObjectMeta(name=name, namespace=namespace),
-                    )
+                    body = v1_eviction(**definition)
                     self._api_instance.create_namespaced_pod_eviction(
                         name=name, namespace=namespace, body=body
                     )
@@ -492,7 +511,7 @@ def argspec():
 
 
 def main():
-    module = AnsibleK8SModule(module_class=AnsibleModule, argument_spec=argspec())
+    module = AnsibleModule(argument_spec=argspec())
 
     if not HAS_EVICTION_API:
         module.fail_json(
@@ -501,12 +520,8 @@ def main():
             error=to_native(k8s_import_exception),
         )
 
-    try:
-        client = get_api_client(module=module)
-        k8s_drain = K8sDrainAnsible(module, client.client)
-        k8s_drain.execute_module()
-    except CoreException as e:
-        module.fail_from_exception(e)
+    k8s_drain = K8sDrainAnsible(module)
+    k8s_drain.execute_module()
 
 
 if __name__ == "__main__":

plugins/modules/k8s_exec.py

@@ -138,15 +138,6 @@ from ansible.module_utils._text import to_native
 from ansible_collections.kubernetes.core.plugins.module_utils.common import (
     AUTH_ARG_SPEC,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.core import (
-    AnsibleK8SModule,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
-    get_api_client,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions import (
-    CoreException,
-)
 
 try:
     from kubernetes.client.apis import core_v1_api
@@ -166,9 +157,10 @@ def argspec():
     return spec
 
 
-def execute_module(module, client):
+def execute_module(module, k8s_ansible_mixin):
+
     # Load kubernetes.client.Configuration
-    api = core_v1_api.CoreV1Api(client.client)
+    api = core_v1_api.CoreV1Api(k8s_ansible_mixin.client.client)
 
     # hack because passing the container as None breaks things
     optional_kwargs = {}
@@ -220,8 +212,7 @@ def execute_module(module, client):
         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.",
+        "The 'return_code' return key is deprecated. Please use 'rc' instead.",
         version="4.0.0",
         collection_name="kubernetes.core",
     )
@@ -236,18 +227,15 @@ def execute_module(module, client):
 
 
 def main():
-    module = AnsibleK8SModule(
-        module_class=AnsibleModule,
-        check_pyyaml=False,
-        argument_spec=argspec(),
-        supports_check_mode=True,
+    module = AnsibleModule(argument_spec=argspec(), supports_check_mode=True,)
+    from ansible_collections.kubernetes.core.plugins.module_utils.common import (
+        K8sAnsibleMixin,
+        get_api_client,
     )
 
-    try:
-        client = get_api_client(module)
-        execute_module(module, client.client)
-    except CoreException as e:
-        module.fail_from_exception(e)
+    k8s_ansible_mixin = K8sAnsibleMixin(module)
+    k8s_ansible_mixin.client = get_api_client(module=module)
+    execute_module(module, k8s_ansible_mixin)
 
 
 if __name__ == "__main__":

plugins/modules/k8s_info.py

@@ -155,22 +155,10 @@ from ansible_collections.kubernetes.core.plugins.module_utils.args_common import
     AUTH_ARG_SPEC,
     WAIT_ARG_SPEC,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.core import (
-    AnsibleK8SModule,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
-    get_api_client,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions import (
-    CoreException,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.service import (
-    K8sService,
-)
 
 
-def execute_module(module, svc):
-    facts = svc.find(
+def execute_module(module, k8s_ansible_mixin):
+    facts = k8s_ansible_mixin.kubernetes_facts(
         module.params["kind"],
         module.params["api_version"],
         name=module.params["name"],
@@ -202,15 +190,19 @@ def argspec():
 
 
 def main():
-    module = AnsibleK8SModule(
-        module_class=AnsibleModule, argument_spec=argspec(), supports_check_mode=True
+    module = AnsibleModule(argument_spec=argspec(), supports_check_mode=True)
+    from ansible_collections.kubernetes.core.plugins.module_utils.common import (
+        K8sAnsibleMixin,
+        get_api_client,
     )
-    try:
-        client = get_api_client(module)
-        svc = K8sService(client, module)
-        execute_module(module, svc)
-    except CoreException as e:
-        module.fail_from_exception(e)
+
+    k8s_ansible_mixin = K8sAnsibleMixin(module)
+    k8s_ansible_mixin.client = get_api_client(module=module)
+    k8s_ansible_mixin.fail_json = module.fail_json
+    k8s_ansible_mixin.fail = module.fail_json
+    k8s_ansible_mixin.exit_json = module.exit_json
+    k8s_ansible_mixin.warn = module.warn
+    execute_module(module, k8s_ansible_mixin)
 
 
 if __name__ == "__main__":

plugins/modules/k8s_json_patch.py

@@ -79,7 +79,7 @@ EXAMPLES = r"""
         path: /metadata/labels/app
         value: myapp
       - op: replace
-        path: /spec/containers/0/image
+        patch: /spec/containers/0/image
         value: nginx
 """
 
@@ -136,22 +136,10 @@ from ansible_collections.kubernetes.core.plugins.module_utils.args_common import
     AUTH_ARG_SPEC,
     WAIT_ARG_SPEC,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
+from ansible_collections.kubernetes.core.plugins.module_utils.common import (
     get_api_client,
+    K8sAnsibleMixin,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.core import (
-    AnsibleK8SModule,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions import (
-    CoreException,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.service import (
-    diff_objects,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.waiter import (
-    get_waiter,
-)
-
 
 try:
     from kubernetes.dynamic.exceptions import DynamicApiError
@@ -197,7 +185,7 @@ def json_patch(existing, patch):
         return None, error
 
 
-def execute_module(module, client):
+def execute_module(k8s_module, module):
     kind = module.params.get("kind")
     api_version = module.params.get("api_version")
     name = module.params.get("name")
@@ -212,14 +200,19 @@ def execute_module(module, client):
         "type"
     ):
         wait_condition = module.params["wait_condition"]
+    # definition is needed for wait
+    definition = {
+        "kind": kind,
+        "metadata": {"name": name, "namespace": namespace},
+    }
 
     def build_error_msg(kind, name, msg):
         return "%s %s: %s" % (kind, name, msg)
 
-    resource = client.resource(kind, api_version)
+    resource = k8s_module.find_resource(kind, api_version, fail=True)
 
     try:
-        existing = client.get(resource, name=name, namespace=namespace)
+        existing = resource.get(name=name, namespace=namespace)
     except DynamicApiError as exc:
         msg = "Failed to retrieve requested object: {0}".format(exc.body)
         module.fail_json(
@@ -234,7 +227,7 @@ def execute_module(module, client):
             msg=build_error_msg(kind, name, msg), error="", status="", reason=""
         )
 
-    if module.check_mode and not client.dry_run:
+    if module.check_mode and not k8s_module.supports_dry_run:
         obj, error = json_patch(existing.to_dict(), patch)
         if error:
             module.fail_json(**error)
@@ -243,8 +236,7 @@ def execute_module(module, client):
         if module.check_mode:
             params["dry_run"] = "All"
         try:
-            obj = client.patch(
-                resource,
+            obj = resource.patch(
                 patch,
                 name=name,
                 namespace=namespace,
@@ -263,11 +255,10 @@ def execute_module(module, client):
     success = True
     result = {"result": obj}
     if wait and not module.check_mode:
-        waiter = get_waiter(client, resource, condition=wait_condition)
-        success, result["result"], result["duration"] = waiter.wait(
-            wait_timeout, wait_sleep, name, namespace
+        success, result["result"], result["duration"] = k8s_module.wait(
+            resource, definition, wait_sleep, wait_timeout, condition=wait_condition
         )
-    match, diffs = diff_objects(existing.to_dict(), obj)
+    match, diffs = k8s_module.diff_objects(existing.to_dict(), obj)
     result["changed"] = not match
     if module._diff:
         result["diff"] = diffs
@@ -283,14 +274,13 @@ def main():
     args = copy.deepcopy(AUTH_ARG_SPEC)
     args.update(copy.deepcopy(WAIT_ARG_SPEC))
     args.update(JSON_PATCH_ARGS)
-    module = AnsibleK8SModule(
-        module_class=AnsibleModule, argument_spec=args, supports_check_mode=True
-    )
-    try:
-        client = get_api_client(module)
-        execute_module(module, client)
-    except CoreException as e:
-        module.fail_from_exception(e)
+    module = AnsibleModule(argument_spec=args, supports_check_mode=True)
+    k8s_module = K8sAnsibleMixin(module)
+    k8s_module.params = module.params
+    k8s_module.check_library_version()
+    client = get_api_client(module)
+    k8s_module.client = client
+    execute_module(k8s_module, module)
 
 
 if __name__ == "__main__":

plugins/modules/k8s_log.py

@@ -51,8 +51,7 @@ options:
     description:
     - Use to specify the container within a pod to grab the log from.
     - If there is only one container, this will default to that container.
-    - If there is more than one container, this option is required or set I(all_containers) to C(true).
-    - mutually exclusive with C(all_containers).
+    - If there is more than one container, this option is required.
     required: no
     type: str
   since_seconds:
@@ -61,25 +60,6 @@ options:
     required: no
     type: str
     version_added: '2.2.0'
-  previous:
-    description:
-    - If C(true), print the logs for the previous instance of the container in a pod if it exists.
-    required: no
-    type: bool
-    default: False
-    version_added: '2.4.0'
-  tail_lines:
-    description:
-    - A number of lines from the end of the logs to retrieve.
-    required: no
-    type: int
-    version_added: '2.4.0'
-  all_containers:
-    description:
-    - If set to C(true), retrieve all containers' logs in the pod(s).
-    - mutually exclusive with C(container).
-    type: bool
-    version_added: '2.4.0'
 
 requirements:
   - "python >= 3.6"
@@ -119,15 +99,7 @@ EXAMPLES = r"""
     kind: DeploymentConfig
     namespace: testing
     name: example
-    tail_lines: 100
   register: log
-
-# This will get the logs from all containers in Pod
-- name: Get the logs from all containers in pod
-  kubernetes.core.k8s_log:
-    namespace: testing
-    name: some-pod
-    all_containers: true
 """
 
 RETURN = r"""
@@ -145,33 +117,16 @@ log_lines:
 
 
 import copy
-import json
 
 from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import (
     AnsibleModule,
 )
+from ansible.module_utils.six import PY2
+
 from ansible_collections.kubernetes.core.plugins.module_utils.args_common import (
     AUTH_ARG_SPEC,
     NAME_ARG_SPEC,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
-    get_api_client,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.core import (
-    AnsibleK8SModule,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions import (
-    CoreException,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.service import (
-    K8sService,
-)
-
-try:
-    from kubernetes.client.exceptions import ApiException
-except ImportError:
-    # ImportError are managed by the common module already.
-    pass
 
 
 def argspec():
@@ -183,61 +138,37 @@ def argspec():
             container=dict(),
             since_seconds=dict(),
             label_selectors=dict(type="list", elements="str", default=[]),
-            previous=dict(type="bool", default=False),
-            tail_lines=dict(type="int"),
-            all_containers=dict(type="bool"),
         )
     )
     return args
 
 
-def get_exception_message(exc):
-    try:
-        d = json.loads(exc.body.decode("utf8"))
-        return d["message"]
-    except Exception:
-        return exc
-
-
-def list_containers_in_pod(svc, resource, namespace, name):
-    try:
-        result = svc.client.get(resource, name=name, namespace=namespace)
-        containers = [
-            c["name"] for c in result.to_dict()["status"]["containerStatuses"]
-        ]
-        return containers
-    except Exception as exc:
-        raise CoreException(
-            "Unable to retrieve log from Pod due to: {0}".format(
-                get_exception_message(exc)
-            )
-        )
-
-
-def execute_module(svc, params):
-    name = params.get("name")
-    namespace = params.get("namespace")
-    label_selector = ",".join(params.get("label_selectors", {}))
+def execute_module(module, k8s_ansible_mixin):
+    name = module.params.get("name")
+    namespace = module.params.get("namespace")
+    label_selector = ",".join(module.params.get("label_selectors", {}))
     if name and label_selector:
-        raise CoreException("Only one of name or label_selectors can be provided")
+        module.fail(msg="Only one of name or label_selectors can be provided")
 
-    resource = svc.find_resource(params["kind"], params["api_version"], fail=True)
-    v1_pods = svc.find_resource("Pod", "v1", fail=True)
+    resource = k8s_ansible_mixin.find_resource(
+        module.params["kind"], module.params["api_version"], fail=True
+    )
+    v1_pods = k8s_ansible_mixin.find_resource("Pod", "v1", fail=True)
 
     if "log" not in resource.subresources:
         if not name:
-            raise CoreException(
-                "name must be provided for resources that do not support the log subresource"
+            module.fail(
+                msg="name must be provided for resources that do not support the log subresource"
             )
         instance = resource.get(name=name, namespace=namespace)
-        label_selector = ",".join(extract_selectors(instance))
+        label_selector = ",".join(extract_selectors(module, instance))
         resource = v1_pods
 
     if label_selector:
         instances = v1_pods.get(namespace=namespace, label_selector=label_selector)
         if not instances.items:
-            raise CoreException(
-                "No pods in namespace {0} matched selector {1}".format(
+            module.fail(
+                msg="No pods in namespace {0} matched selector {1}".format(
                     namespace, label_selector
                 )
             )
@@ -245,60 +176,29 @@ def execute_module(svc, params):
         name = instances.items[0].metadata.name
         resource = v1_pods
 
-    if "base" not in resource.log.urls and not name:
-        raise CoreException(
-            "name must be provided for resources that do not support namespaced base url"
-        )
-
     kwargs = {}
-    if params.get("container"):
-        kwargs["query_params"] = {"container": params["container"]}
+    if module.params.get("container"):
+        kwargs["query_params"] = dict(container=module.params["container"])
 
-    if params.get("since_seconds"):
+    if module.params.get("since_seconds"):
         kwargs.setdefault("query_params", {}).update(
-            {"sinceSeconds": params["since_seconds"]}
+            {"sinceSeconds": module.params["since_seconds"]}
         )
 
-    if params.get("previous"):
-        kwargs.setdefault("query_params", {}).update({"previous": params["previous"]})
+    log = serialize_log(
+        resource.log.get(name=name, namespace=namespace, serialize=False, **kwargs)
+    )
 
-    if params.get("tail_lines"):
-        kwargs.setdefault("query_params", {}).update(
-            {"tailLines": params["tail_lines"]}
-        )
-
-    pod_containers = [None]
-    if params.get("all_containers"):
-        pod_containers = list_containers_in_pod(svc, resource, namespace, name)
-
-    log = ""
-    try:
-        for container in pod_containers:
-            if container is not None:
-                kwargs.setdefault("query_params", {}).update({"container": container})
-            response = resource.log.get(
-                name=name, namespace=namespace, serialize=False, **kwargs
-            )
-            log += response.data.decode("utf8")
-    except ApiException as exc:
-        if exc.reason == "Not Found":
-            raise CoreException("Pod {0}/{1} not found.".format(namespace, name))
-        raise CoreException(
-            "Unable to retrieve log from Pod due to: {0}".format(
-                get_exception_message(exc)
-            )
-        )
-
-    return {"changed": False, "log": log, "log_lines": log.split("\n")}
+    module.exit_json(changed=False, log=log, log_lines=log.split("\n"))
 
 
-def extract_selectors(instance):
+def extract_selectors(module, instance):
     # Parses selectors on an object based on the specifications documented here:
     # https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors
     selectors = []
     if not instance.spec.selector:
-        raise CoreException(
-            "{0} {1} does not support the log subresource directly, and no Pod selector was found on the object".format(
+        module.fail(
+            msg="{0} {1} does not support the log subresource directly, and no Pod selector was found on the object".format(
                 "/".join(instance.group, instance.apiVersion), instance.kind
             )
         )
@@ -332,8 +232,8 @@ def extract_selectors(instance):
                     )
                 )
             else:
-                raise CoreException(
-                    "The k8s_log module does not support the {0} matchExpression operator".format(
+                module.fail(
+                    msg="The k8s_log module does not support the {0} matchExpression operator".format(
                         operator.lower()
                     )
                 )
@@ -341,21 +241,22 @@ def extract_selectors(instance):
     return selectors
 
 
+def serialize_log(response):
+    if PY2:
+        return response.data
+    return response.data.decode("utf8")
+
+
 def main():
-    module = AnsibleK8SModule(
-        module_class=AnsibleModule,
-        argument_spec=argspec(),
-        supports_check_mode=True,
-        mutually_exclusive=[("container", "all_containers")],
+    module = AnsibleModule(argument_spec=argspec(), supports_check_mode=True)
+    from ansible_collections.kubernetes.core.plugins.module_utils.common import (
+        K8sAnsibleMixin,
+        get_api_client,
     )
 
-    try:
-        client = get_api_client(module=module)
-        svc = K8sService(client, module)
-        result = execute_module(svc, module.params)
-        module.exit_json(**result)
-    except CoreException as e:
-        module.fail_from_exception(e)
+    k8s_ansible_mixin = K8sAnsibleMixin(module)
+    k8s_ansible_mixin.client = get_api_client(module=module)
+    execute_module(module, k8s_ansible_mixin)
 
 
 if __name__ == "__main__":

plugins/modules/k8s_rollback.py

@@ -86,23 +86,12 @@ from ansible_collections.kubernetes.core.plugins.module_utils.args_common import
     AUTH_ARG_SPEC,
     NAME_ARG_SPEC,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
-    get_api_client,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.core import (
-    AnsibleK8SModule,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions import (
-    CoreException,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.service import (
-    K8sService,
-)
 
 
-def get_managed_resource(kind):
+def get_managed_resource(module):
     managed_resource = {}
 
+    kind = module.params["kind"]
     if kind == "DaemonSet":
         managed_resource["kind"] = "ControllerRevision"
         managed_resource["api_version"] = "apps/v1"
@@ -110,17 +99,14 @@ def get_managed_resource(kind):
         managed_resource["kind"] = "ReplicaSet"
         managed_resource["api_version"] = "apps/v1"
     else:
-        raise CoreException(
-            "Cannot perform rollback on resource of kind {0}".format(kind)
-        )
+        module.fail(msg="Cannot perform rollback on resource of kind {0}".format(kind))
     return managed_resource
 
 
-def execute_module(svc):
+def execute_module(module, k8s_ansible_mixin):
     results = []
-    module = svc.module
 
-    resources = svc.find(
+    resources = k8s_ansible_mixin.kubernetes_facts(
         module.params["kind"],
         module.params["api_version"],
         module.params["name"],
@@ -131,16 +117,14 @@ def execute_module(svc):
 
     changed = False
     for resource in resources["resources"]:
-        result = perform_action(svc, resource)
+        result = perform_action(module, k8s_ansible_mixin, resource)
         changed = result["changed"] or changed
         results.append(result)
 
     module.exit_json(**{"changed": changed, "rollback_info": results})
 
 
-def perform_action(svc, resource):
-    module = svc.module
-
+def perform_action(module, k8s_ansible_mixin, resource):
     if module.params["kind"] == "DaemonSet":
         current_revision = resource["metadata"]["generation"]
     elif module.params["kind"] == "Deployment":
@@ -148,8 +132,8 @@ def perform_action(svc, resource):
             "deployment.kubernetes.io/revision"
         ]
 
-    managed_resource = get_managed_resource(module.params["kind"])
-    managed_resources = svc.find(
+    managed_resource = get_managed_resource(module)
+    managed_resources = k8s_ansible_mixin.kubernetes_facts(
         managed_resource["kind"],
         managed_resource["api_version"],
         "",
@@ -201,7 +185,7 @@ def perform_action(svc, resource):
 
     rollback = resource
     if not module.check_mode:
-        rollback = svc.client.client.request(
+        rollback = k8s_ansible_mixin.client.request(
             "PATCH",
             "/apis/{0}/namespaces/{1}/{2}/{3}".format(
                 module.params["api_version"],
@@ -258,16 +242,15 @@ def get_previous_revision(all_resources, current_revision):
 
 
 def main():
-    module = AnsibleK8SModule(
-        module_class=AnsibleModule, argument_spec=argspec(), supports_check_mode=True
+    module = AnsibleModule(argument_spec=argspec(), supports_check_mode=True)
+    from ansible_collections.kubernetes.core.plugins.module_utils.common import (
+        K8sAnsibleMixin,
+        get_api_client,
     )
 
-    try:
-        client = get_api_client(module=module)
-        svc = K8sService(client, module)
-        execute_module(svc)
-    except CoreException as e:
-        module.fail_from_exception(e)
+    k8s_ansible_mixin = K8sAnsibleMixin(module)
+    k8s_ansible_mixin.client = get_api_client(module=module)
+    execute_module(module, k8s_ansible_mixin)
 
 
 if __name__ == "__main__":

plugins/modules/k8s_scale.py

@@ -143,14 +143,6 @@ result:
 
 import copy
 
-try:
-    from kubernetes.dynamic.exceptions import NotFoundError
-except ImportError:
-    # Handled in module setup
-    pass
-
-from ansible.module_utils._text import to_native
-
 from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import (
     AnsibleModule,
 )
@@ -159,25 +151,7 @@ from ansible_collections.kubernetes.core.plugins.module_utils.args_common import
     RESOURCE_ARG_SPEC,
     NAME_ARG_SPEC,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
-    get_api_client,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.core import (
-    AnsibleK8SModule,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions import (
-    CoreException,
-    ResourceTimeout,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.service import (
-    diff_objects,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.waiter import (
-    get_waiter,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.resource import (
-    create_definitions,
-)
+
 
 SCALE_ARG_SPEC = {
     "replicas": {"type": "int", "required": True},
@@ -189,20 +163,26 @@ SCALE_ARG_SPEC = {
 }
 
 
-def execute_module(client, module):
-    current_replicas = module.params.get("current_replicas")
-    replicas = module.params.get("replicas")
-    resource_version = module.params.get("resource_version")
-    definitions = create_definitions(module.params)
-    definition = definitions[0]
-    name = definition["metadata"].get("name")
+def execute_module(
+    module, k8s_ansible_mixin,
+):
+    k8s_ansible_mixin.set_resource_definitions(module)
+
+    definition = k8s_ansible_mixin.resource_definitions[0]
+
+    name = definition["metadata"]["name"]
     namespace = definition["metadata"].get("namespace")
     api_version = definition["apiVersion"]
     kind = definition["kind"]
+    current_replicas = module.params.get("current_replicas")
+    replicas = module.params.get("replicas")
+    resource_version = module.params.get("resource_version")
+
     label_selectors = module.params.get("label_selectors")
     if not label_selectors:
         label_selectors = []
     continue_on_error = module.params.get("continue_on_error")
+
     wait = module.params.get("wait")
     wait_time = module.params.get("wait_timeout")
     wait_sleep = module.params.get("wait_sleep")
@@ -214,7 +194,12 @@ def execute_module(client, module):
     if wait:
         return_attributes["duration"] = 0
 
-    resource = client.resource(kind, api_version)
+    resource = k8s_ansible_mixin.find_resource(kind, api_version, fail=True)
+
+    from ansible_collections.kubernetes.core.plugins.module_utils.common import (
+        NotFoundError,
+    )
+
     multiple_scale = False
     try:
         existing = resource.get(
@@ -225,10 +210,11 @@ def execute_module(client, module):
             multiple_scale = len(existing_items) > 1
         else:
             existing_items = [existing]
-    except NotFoundError as e:
-        reason = e.body if hasattr(e, "body") else e
-        msg = "Failed to retrieve requested object: {0}".format(reason)
-        raise CoreException(msg) from e
+    except NotFoundError as exc:
+        module.fail_json(
+            msg="Failed to retrieve requested object: {0}".format(exc),
+            error=exc.value.get("status"),
+        )
 
     if multiple_scale:
         # when scaling multiple resource, the 'result' is changed to 'results' and is a list
@@ -250,7 +236,7 @@ def execute_module(client, module):
             module.exit_json(warning=warn, **return_attributes)
 
     for existing in existing_items:
-        if kind.lower() == "job":
+        if module.params["kind"].lower() == "job":
             existing_count = existing.spec.parallelism
         elif hasattr(existing.spec, "replicas"):
             existing_count = existing.spec.replicas
@@ -285,34 +271,29 @@ def execute_module(client, module):
             continue
 
         if existing_count != replicas:
-            if kind.lower() == "job":
+            if module.params["kind"].lower() == "job":
                 existing.spec.parallelism = replicas
                 result = {"changed": True}
                 if module.check_mode:
                     result["result"] = existing.to_dict()
                 else:
-                    result["result"] = client.patch(
-                        resource, existing.to_dict()
-                    ).to_dict()
+                    result["result"] = resource.patch(existing.to_dict()).to_dict()
             else:
-                try:
-                    result = scale(
-                        client,
-                        module,
-                        resource,
-                        existing,
-                        replicas,
-                        wait,
-                        wait_time,
-                        wait_sleep,
-                    )
-                except CoreException as e:
-                    module.fail_json(msg=to_native(e))
+                result = scale(
+                    module,
+                    k8s_ansible_mixin,
+                    resource,
+                    existing,
+                    replicas,
+                    wait,
+                    wait_time,
+                    wait_sleep,
+                )
                 changed = changed or result["changed"]
         else:
             name = existing.metadata.name
             namespace = existing.metadata.namespace
-            existing = client.get(resource, name=name, namespace=namespace)
+            existing = resource.get(name=name, namespace=namespace)
             result = {"changed": False, "result": existing.to_dict()}
             if module._diff:
                 result["diff"] = {}
@@ -338,8 +319,8 @@ def argspec():
 
 
 def scale(
-    client,
     module,
+    k8s_ansible_mixin,
     resource,
     existing_object,
     replicas,
@@ -352,8 +333,8 @@ def scale(
     kind = existing_object.kind
 
     if not hasattr(resource, "scale"):
-        raise CoreException(
-            "Cannot perform scale on resource of kind {0}".format(resource.kind)
+        module.fail_json(
+            msg="Cannot perform scale on resource of kind {0}".format(resource.kind)
         )
 
     scale_obj = {
@@ -362,37 +343,32 @@ def scale(
         "spec": {"replicas": replicas},
     }
 
-    existing = client.get(resource, name=name, namespace=namespace)
+    existing = resource.get(name=name, namespace=namespace)
 
     result = dict()
     if module.check_mode:
         k8s_obj = copy.deepcopy(existing.to_dict())
         k8s_obj["spec"]["replicas"] = replicas
+        match, diffs = k8s_ansible_mixin.diff_objects(existing.to_dict(), k8s_obj)
         if wait:
             result["duration"] = 0
         result["result"] = k8s_obj
     else:
         try:
             resource.scale.patch(body=scale_obj)
-        except Exception as e:
-            reason = e.body if hasattr(e, "body") else e
-            msg = "Scale request failed: {0}".format(reason)
-            raise CoreException(msg) from e
+        except Exception as exc:
+            module.fail_json(msg="Scale request failed: {0}".format(exc))
 
-        k8s_obj = client.get(resource, name=name, namespace=namespace).to_dict()
+        k8s_obj = resource.get(name=name, namespace=namespace).to_dict()
         result["result"] = k8s_obj
-        if wait:
-            waiter = get_waiter(client, resource)
-            success, result["result"], result["duration"] = waiter.wait(
-                timeout=wait_time,
-                sleep=wait_sleep,
-                name=name,
-                namespace=namespace,
+        if wait and not module.check_mode:
+            success, result["result"], result["duration"] = k8s_ansible_mixin.wait(
+                resource, scale_obj, wait_sleep, wait_time
             )
             if not success:
-                raise ResourceTimeout("Resource scaling timed out", **result)
+                module.fail_json(msg="Resource scaling timed out", **result)
 
-    match, diffs = diff_objects(existing.to_dict(), result["result"])
+    match, diffs = k8s_ansible_mixin.diff_objects(existing.to_dict(), k8s_obj)
     result["changed"] = not match
     if module._diff:
         result["diff"] = diffs
@@ -404,18 +380,19 @@ def main():
     mutually_exclusive = [
         ("resource_definition", "src"),
     ]
-    module = AnsibleK8SModule(
-        module_class=AnsibleModule,
+    module = AnsibleModule(
         argument_spec=argspec(),
         mutually_exclusive=mutually_exclusive,
         supports_check_mode=True,
     )
+    from ansible_collections.kubernetes.core.plugins.module_utils.common import (
+        K8sAnsibleMixin,
+        get_api_client,
+    )
 
-    try:
-        client = get_api_client(module=module)
-        execute_module(client, module)
-    except CoreException as e:
-        module.fail_from_exception(e)
+    k8s_ansible_mixin = K8sAnsibleMixin(module)
+    k8s_ansible_mixin.client = get_api_client(module=module)
+    execute_module(module, k8s_ansible_mixin)
 
 
 if __name__ == "__main__":

plugins/modules/k8s_service.py

@@ -154,25 +154,6 @@ from ansible_collections.kubernetes.core.plugins.module_utils.args_common import
     COMMON_ARG_SPEC,
     RESOURCE_ARG_SPEC,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.core import (
-    AnsibleK8SModule,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
-    get_api_client,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions import (
-    CoreException,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.service import (
-    K8sService,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.resource import (
-    create_definitions,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.runner import (
-    perform_action,
-)
-
 
 SERVICE_ARG_SPEC = {
     "apply": {"type": "bool", "default": False},
@@ -198,7 +179,7 @@ def merge_dicts(x, y):
             if isinstance(x[k], dict) and isinstance(y[k], dict):
                 yield (k, dict(merge_dicts(x[k], y[k])))
             else:
-                yield (k, y[k] if y[k] else x[k])
+                yield (k, y[k])
         elif k in x:
             yield (k, x[k])
         else:
@@ -206,7 +187,7 @@ def merge_dicts(x, y):
 
 
 def argspec():
-    """argspec property builder"""
+    """ argspec property builder """
     argument_spec = copy.deepcopy(AUTH_ARG_SPEC)
     argument_spec.update(COMMON_ARG_SPEC)
     argument_spec.update(RESOURCE_ARG_SPEC)
@@ -214,9 +195,10 @@ def argspec():
     return argument_spec
 
 
-def execute_module(svc):
-    """Module execution"""
-    module = svc.module
+def execute_module(module, k8s_ansible_mixin):
+    """ Module execution """
+    k8s_ansible_mixin.set_resource_definitions(module)
+
     api_version = "v1"
     selector = module.params.get("selector")
     service_type = module.params.get("type")
@@ -236,29 +218,28 @@ def execute_module(svc):
     def_meta["name"] = module.params.get("name")
     def_meta["namespace"] = module.params.get("namespace")
 
-    definitions = create_definitions(module.params)
-
     # 'resource_definition:' has lower priority than module parameters
-    definition = dict(merge_dicts(definitions[0], definition))
+    definition = dict(
+        merge_dicts(k8s_ansible_mixin.resource_definitions[0], definition)
+    )
 
-    result = perform_action(svc, definition, module.params)
+    resource = k8s_ansible_mixin.find_resource("Service", api_version, fail=True)
+    definition = k8s_ansible_mixin.set_defaults(resource, definition)
+    result = k8s_ansible_mixin.perform_action(resource, definition)
 
     module.exit_json(**result)
 
 
 def main():
-    module = AnsibleK8SModule(
-        module_class=AnsibleModule,
-        argument_spec=argspec(),
-        supports_check_mode=True,
+    module = AnsibleModule(argument_spec=argspec(), supports_check_mode=True)
+    from ansible_collections.kubernetes.core.plugins.module_utils.common import (
+        K8sAnsibleMixin,
+        get_api_client,
     )
 
-    try:
-        client = get_api_client(module=module)
-        svc = K8sService(client, module)
-        execute_module(svc)
-    except CoreException as e:
-        module.fail_from_exception(e)
+    k8s_ansible_mixin = K8sAnsibleMixin(module)
+    k8s_ansible_mixin.client = get_api_client(module=module)
+    execute_module(module, k8s_ansible_mixin)
 
 
 if __name__ == "__main__":

plugins/modules/k8s_taint.py

@@ -126,29 +126,22 @@ result:
 
 import copy
 
+from ansible.module_utils.basic import AnsibleModule
 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.common import (
+    K8sAnsibleMixin,
+    get_api_client,
 )
 from ansible_collections.kubernetes.core.plugins.module_utils.args_common import (
     AUTH_ARG_SPEC,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
-    get_api_client,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.core import (
-    AnsibleK8SModule,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions import (
-    CoreException,
-)
 
 try:
     from kubernetes.client.api import core_v1_api
     from kubernetes.client.exceptions import ApiException
 except ImportError:
-    # ImportErrors are handled during module setup
+    # ImportError are managed by the common module already.
     pass
 
 
@@ -198,9 +191,21 @@ def argspec():
 
 
 class K8sTaintAnsible:
-    def __init__(self, module, client):
+    def __init__(self, module):
         self.module = module
-        self.api_instance = core_v1_api.CoreV1Api(client.client)
+        self.k8s_ansible_mixin = K8sAnsibleMixin(module=self.module)
+        self.k8s_ansible_mixin.client = get_api_client(module=self.module)
+        self.k8s_ansible_mixin.module = self.module
+        self.k8s_ansible_mixin.argspec = self.module.argument_spec
+        self.k8s_ansible_mixin.check_mode = self.module.check_mode
+        self.k8s_ansible_mixin.params = self.module.params
+        self.k8s_ansible_mixin.fail_json = self.module.fail_json
+        self.k8s_ansible_mixin.fail = self.module.fail_json
+        self.k8s_ansible_mixin.exit_json = self.module.exit_json
+        self.k8s_ansible_mixin.warn = self.module.warn
+        self.k8s_ansible_mixin.warnings = []
+        self.api_instance = core_v1_api.CoreV1Api(self.k8s_ansible_mixin.client.client)
+        self.k8s_ansible_mixin.check_library_version()
         self.changed = False
 
     def get_node(self, name):
@@ -296,17 +301,9 @@ class K8sTaintAnsible:
 
 
 def main():
-    module = AnsibleK8SModule(
-        module_class=AnsibleModule,
-        argument_spec=argspec(),
-        supports_check_mode=True,
-    )
-    try:
-        client = get_api_client(module)
-        k8s_taint = K8sTaintAnsible(module, client.client)
-        k8s_taint.execute_module()
-    except CoreException as e:
-        module.fail_from_exception(e)
+    module = AnsibleModule(argument_spec=argspec(), supports_check_mode=True,)
+    k8s_taint = K8sTaintAnsible(module)
+    k8s_taint.execute_module()
 
 
 if __name__ == "__main__":

setup.cfg

@@ -1,4 +1,4 @@
 [flake8]
 max-line-length = 160
 ignore = W503,E402
-exclude = .cache,.git,.tox,tests/output
+exclude = .cache

test-requirements.txt

@@ -1,7 +1,4 @@
 kubernetes-validate
 coverage==4.5.4
-mock
 pytest
 pytest-xdist
-pytest-mock
-pytest-forked

tests/config.yml

@@ -1,2 +0,0 @@
-modules:
-  python_requires: ">=3.6"

tests/integration/targets/helm/aliases

@@ -1,4 +1,8 @@
-time=100
+# slow - 11min
+slow
+time=313
 helm_info
+helm_plugin
+helm_plugin_info
 helm_repository
 helm_template

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

@@ -1,12 +1,12 @@
 ---
-helm_default_archive_name: "helm-{{ helm_version }}-{{ ansible_system | lower }}-amd64.tar.gz"
+helm_archive_name: "helm-{{ helm_version }}-{{ ansible_system | lower }}-amd64.tar.gz"
 helm_binary: "/tmp/helm/{{ ansible_system | lower }}-amd64/helm"
 
 chart_test: "ingress-nginx"
 chart_test_local_path: "nginx-ingress"
-chart_test_version: 4.2.4
+chart_test_version: 3.8.0
 chart_test_version_local_path: 1.32.0
-chart_test_version_upgrade: 4.2.5
+chart_test_version_upgrade: 3.9.0
 chart_test_version_upgrade_local_path: 1.33.0
 chart_test_repo: "https://kubernetes.github.io/ingress-nginx"
 chart_test_git_repo: "http://github.com/helm/charts.git"
@@ -15,12 +15,13 @@ chart_test_values:
   myValue: "changed"
 
 test_namespace:
-  - "helm-test-crds"
+  - "helm-diff"
+  - "helm-envvars"
   - "helm-uninstall"
-  - "helm-read-envvars"
-  - "helm-dep-update"
+  - "helm-not-installed"
+  - "helm-crd"
+  - "helm-url"
+  - "helm-repository"
   - "helm-local-path-001"
   - "helm-local-path-002"
   - "helm-local-path-003"
-  - "helm-from-repository"
-  - "helm-from-url"

tests/integration/targets/helm/files/dep-up/Chart.yaml

@@ -1,10 +0,0 @@
-apiVersion: v2
-name: dep_up
-description: A Helm chart for molecule test
-type: application
-version: 0.1.0
-appVersion: "default"
-dependencies:
-  - name: test-chart
-    repository: file://../test-chart
-    version: "0.1.0"

tests/integration/targets/helm/files/dep-up/values.yaml

@@ -1,2 +0,0 @@
-chart-test:
-  myValue: helm update dependency test

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

@@ -62,8 +62,7 @@ from ansible.module_utils.basic import AnsibleModule
 def main():
     module = AnsibleModule(
         argument_spec=dict(
-            binary_path=dict(type="path"),
-            version=dict(type="str", default="3.7.0"),
+            binary_path=dict(type="path"), version=dict(type="str", default="3.7.0"),
         ),
     )
 

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

@@ -6,7 +6,7 @@
 
 - name: Unarchive Helm binary
   unarchive:
-    src: 'https://get.helm.sh/{{ helm_archive_name | default(helm_default_archive_name) }}'
+    src: 'https://get.helm.sh/{{ helm_archive_name }}'
     dest: /tmp/helm/
     remote_src: yes
   retries: 10

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

@@ -4,4 +4,4 @@
   loop_control:
     loop_var: helm_version
   with_items:
-    - "v3.7.0"
+    - "v3.2.4"

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

@@ -10,12 +10,14 @@
   include_tasks: test_helm_not_installed.yml
 
 - name: "Install {{ helm_version }}"
-  include_role:
-    name: install_helm
+  include_tasks: install.yml
 
 - name: "Ensure we honor the environment variables"
   include_tasks: test_read_envvars.yml
 
+- name: tests_repository
+  include_tasks: tests_repository.yml
+
 - name: Deploy charts
   include_tasks: "tests_chart/{{ test_chart_type }}.yml"
   loop_control:
@@ -25,8 +27,11 @@
     - from_repository
     - from_url
 
-- name: test helm dependency update
-  include_tasks: test_up_dep.yml
+- name: Test helm plugin
+  include_tasks: tests_helm_plugin.yml
+
+- name: Test helm diff
+  include_tasks: tests_helm_diff.yml
 
 - name: Test helm uninstall
   include_tasks: test_helm_uninstall.yml

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

@@ -2,12 +2,11 @@
 - name: Test CRDs
   vars:
     test_chart: "test-crds"
-    helm_namespace: "{{ test_namespace[0] }}"
   block:
     - name: Create namespace
       k8s:
         kind: Namespace
-        name: "{{ helm_namespace }}"
+        name: "{{ test_namespace[4] }}"
 
     - name: Copy test chart
       copy:
@@ -18,7 +17,7 @@
       helm:
         binary_path: "{{ helm_binary }}"
         chart_ref: "/tmp/helm_test_crds/{{ test_chart }}"
-        namespace: "{{ helm_namespace }}"
+        namespace: "{{ test_namespace[4] }}"
         name: test-crds
         skip_crds: true
       register: install
@@ -34,7 +33,7 @@
           apiVersion: ansible.com/v1
           kind: Foo
           metadata:
-            namespace: "{{ helm_namespace }}"
+            namespace: "{{ test_namespace[4] }}"
             name: test-foo
           foobar: footest
       ignore_errors: true
@@ -49,7 +48,7 @@
     - name: Uninstall chart
       helm:
         binary_path: "{{ helm_binary }}"
-        namespace: "{{ helm_namespace }}"
+        namespace: "{{ test_namespace[4] }}"
         name: test-crds
         state: absent
 
@@ -57,7 +56,7 @@
       helm:
         binary_path: "{{ helm_binary }}"
         chart_ref: "/tmp/helm_test_crds/{{ test_chart }}"
-        namespace: "{{ helm_namespace }}"
+        namespace: "{{ test_namespace[4] }}"
         name: test-crds
 
     - name: Create custom resource
@@ -66,7 +65,7 @@
           apiVersion: ansible.com/v1
           kind: Foo
           metadata:
-            namespace: "{{ helm_namespace }}"
+            namespace: "{{ test_namespace[4] }}"
             name: test-foo
           foobar: footest
       register: result
@@ -86,7 +85,7 @@
     - name: Remove namespace
       k8s:
         kind: Namespace
-        name: "{{ helm_namespace }}"
+        name: "{{ test_namespace[4] }}"
         state: absent
       ignore_errors: true
 

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

@@ -4,7 +4,7 @@
     binary_path: "{{ helm_binary}}_fake"
     name: test
     chart_ref: "{{ chart_test }}"
-    namespace: "helm-test"
+    namespace: "{{ test_namespace[3] }}"
   ignore_errors: yes
   register: helm_missing_binary
 

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

@@ -4,11 +4,11 @@
     version: "3.7.0"
   register: test_version
 
-- vars:
-    chart_source: "https://github.com/kubernetes/kube-state-metrics/releases/download/kube-state-metrics-helm-chart-2.13.3/kube-state-metrics-2.13.3.tgz"
-    chart_name: "test-wait-uninstall"
-    helm_namespace: "{{ test_namespace[1] }}"
-  block:
+- block:
+  - set_fact:
+      chart_source: "https://github.com/kubernetes/kube-state-metrics/releases/download/kube-state-metrics-helm-chart-2.13.3/kube-state-metrics-2.13.3.tgz"
+      chart_name: "test-wait-uninstall"
+      helm_namespace: "{{ test_namespace[2] }}"
 
   - name: Install chart
     helm:

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

@@ -3,10 +3,8 @@
     binary_path: "{{ helm_binary }}"
     state: absent
     name: does-not-exist
-    namespace: "{{ helm_namespace }}"
+    namespace: "{{ test_namespace[1] }}"
   environment:
     K8S_AUTH_HOST: somewhere
-  vars:
-    helm_namespace: "{{ test_namespace[2] }}"
   register: _helm_result
   failed_when: '"http://somewhere/version" not in _helm_result.stderr'

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

@@ -1,160 +0,0 @@
-# Helm module
-- name: "Test dependency update for helm module"
-  vars:
-    helm_namespace: "{{ test_namespace[3] }}"
-  block:
-    - name: copy chart
-      copy:
-        src: "{{ item }}"
-        dest: /tmp
-      loop:
-        - test-chart
-        - dep-up
-
-    - name: "Test chart with dependency_update false"
-      helm:
-        binary_path: "{{ helm_binary }}"
-        name: test
-        chart_ref: "/tmp/test-chart"
-        chart_version: "{{ chart_source_version | default(omit) }}"
-        namespace: "{{ helm_namespace }}"
-        dependency_update: false
-        create_namespace: yes
-      register: release
-
-    - name: "Get stats of the subchart"
-      stat:
-        path: "/tmp/test-chart/Chart.lock"
-      register: stat_result
-
-    - name: "Check if the subchart not exist in chart"
-      assert:
-        that:
-          - not stat_result.stat.exists
-        success_msg: "subchart not exist in the chart directory"
-        fail_msg: "subchart exist in the charts directory"
-
-    - name: "Test chart without dependencies block and dependency_update true"
-      helm:
-        binary_path: "{{ helm_binary }}"
-        name: test
-        chart_ref: "/tmp/test-chart"
-        chart_version: "{{ chart_source_version | default(omit) }}"
-        namespace: "{{ helm_namespace }}"
-        create_namespace: yes
-        dependency_update: true
-      ignore_errors: true
-      register: release
-
-    - assert:
-        that:
-          - release.warnings[0] == "There is no dependencies block defined in Chart.yaml. Dependency update will not be performed. Please consider add dependencies block or disable dependency_update to remove this warning."
-        success_msg: "warning when there is no dependencies block with dependency_update enabled"
-
-    - name: "Test chart with dependencies block and dependency_update true"
-      helm:
-        binary_path: "{{ helm_binary }}"
-        name: test
-        chart_ref: "/tmp/dep-up"
-        chart_version: "{{ chart_source_version | default(omit) }}"
-        namespace: "{{ helm_namespace }}"
-        dependency_update: true
-        create_namespace: yes
-      register: release
-
-    - name: "Get stats of the subchart"
-      stat:
-        path: "/tmp/dep-up/Chart.lock"
-      register: stat_result
-
-    - name: "Check if the subchart exists in chart"
-      assert:
-        that:
-          - stat_result.stat.exists
-        success_msg: "subchart exist in the chart directory"
-        fail_msg: "subchart not exist in the charts directory"
-  always:
-    - name: Remove helm namespace
-      k8s:
-        api_version: v1
-        kind: Namespace
-        name: "{{ helm_namespace }}"
-        state: absent
-
-    - name: "Remove charts"
-      file:
-        state: absent
-        path: "/tmp/{{ item }}"
-      loop:
-        - test-chart
-        - dep-up
-
-# Helm_template module
-- name: "Test dependency update for helm_template module"
-  block:
-    - name: copy chart
-      copy:
-        src: "{{ item }}"
-        dest: /tmp
-      loop:
-        - test-chart
-        - dep-up
-
-    - name: Test Helm dependency update true
-      helm_template:
-        binary_path: "{{ helm_binary }}"
-        chart_ref: "/tmp/dep-up"
-        chart_version: "{{ chart_source_version | default(omit) }}"
-        dependency_update: true
-        output_dir: "/tmp"
-      register: result
-
-    - name: "Get stats of the subchart"
-      stat:
-        path: "{{ item }}"
-      register: stat_result
-      loop:
-        - /tmp/dep-up/Chart.lock
-        - /tmp/dep_up/charts/test-chart/templates/configmap.yaml
-
-    - name: "Check if the subchart exist in chart"
-      assert:
-        that:
-          - stat_result.results[0].stat.exists
-          - stat_result.results[1].stat.exists
-        success_msg: "subchart exist in the charts directory"
-        fail_msg: "There is no Subchart pulled"
-
-    - name: Test Helm subchart not pulled when dependency_update false for helm_template
-      helm_template:
-        binary_path: "{{ helm_binary }}"
-        chart_ref: "/tmp/test-chart"
-        chart_version: "{{ chart_source_version | default(omit) }}"
-        dependency_update: false
-        output_dir: "/tmp"
-      register: result
-
-    - name: "Get stats of the subchart"
-      stat:
-        path: "{{ item }}"
-      register: stat_result
-      loop:
-        - /tmp/test-chart/Chart.lock
-        - /tmp/test-chart/templates/configmap.yaml
-
-    - name: "Check if the subchart not exist in chart"
-      assert:
-        that:
-          - not stat_result.results[0].stat.exists
-          - stat_result.results[1].stat.exists
-        success_msg: "subchart not exist in the charts directory"
-        fail_msg: "There is no Subchart pulled"
-  always:
-
-    - name: "Remove charts"
-      file:
-        state: absent
-        path: "/tmp/{{ item }}"
-      loop:
-        - test-chart
-        - dep-up

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

@@ -335,13 +335,6 @@
         that:
           - not (install is changed)
 
-    - name: "Remove {{ chart_release_name }} release"
-      helm:
-        binary_path: "{{ helm_binary }}"
-        name: "{{ chart_release_name }}"
-        namespace: "{{ helm_namespace }}"
-        state: absent
-
     - name: Render templates
       helm_template:
         binary_path: "{{ helm_binary }}"
@@ -368,31 +361,6 @@
         that:
           result.stat.exists
 
-    - name: Render single template from chart to result
-      helm_template:
-        binary_path: "{{ helm_binary }}"
-        chart_ref: "{{ chart_source }}"
-        chart_version: "{{ chart_source_version | default(omit) }}"
-        disable_hook: True
-        release_name: "MyRelease"
-        release_namespace: "MyReleaseNamespace"
-        show_only:
-          - "templates/configmap.yaml"
-        release_values:
-          "myValue": "ThisValue"
-      register: result
-      when: chart_source is search("test-chart")
-
-    - assert:
-        that:
-          - result is changed
-          - result is not failed
-          - result.rc == 0
-          - result.command is match("{{ helm_binary }} template MyRelease {{ chart_source }}")
-          - result.stdout is search("ThisValue")
-      when: chart_source is search("test-chart")
-      # limit assertion of test result to controlled (local) chart_source
-
     - name: Release using non-existent context
       helm:
         binary_path: "{{ helm_binary }}"

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

@@ -23,7 +23,7 @@
     chart_test_version: "{{ chart_test_version_local_path }}"
     chart_test_version_upgrade: "{{ chart_test_version_upgrade_local_path }}"
     chart_name: "local-path-001"
-    helm_namespace: "{{ test_namespace[4] }}"
+    helm_namespace: "{{ test_namespace[7] }}"
 
 - name: Test appVersion idempotence
   vars:
@@ -69,7 +69,7 @@
         chart_source: "/tmp/helm_test_appversion/test-chart/{{ chart_test }}-{{ chart_test_app_version }}-{{ chart_test_version }}.tgz"
         chart_source_upgrade: "/tmp/helm_test_appversion/test-chart/{{ chart_test }}-{{ chart_test_upgrade_app_version }}-{{ chart_test_version_upgrade }}.tgz"
         chart_name: "local-path-002"
-        helm_namespace: "{{ test_namespace[5] }}"
+        helm_namespace: "{{ test_namespace[8] }}"
 
 - name: Test appVersion handling when null
   vars:
@@ -99,7 +99,7 @@
         chart_source: "/tmp/helm_test_appversion/test-null/{{ chart_test }}/"
         chart_source_upgrade: "{{ chart_test }}-{{ chart_test_version_upgrade }}.tgz"
         chart_name: "local-path-003"
-        helm_namespace: "{{ test_namespace[6] }}"
+        helm_namespace: "{{ test_namespace[9] }}"
 
 - name: Remove clone repos
   file:

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

@@ -12,9 +12,9 @@
     chart_source: "test_helm/{{ chart_test }}"
     chart_source_version: "{{ chart_test_version }}"
     chart_source_version_upgrade: "{{ chart_test_version_upgrade }}"
-    helm_namespace: "{{ test_namespace[7] }}"
+    helm_namespace: "{{ test_namespace[6] }}"
 
-- name: Remove chart repo
+- name: Add chart repo
   helm_repository:
     binary_path: "{{ helm_binary }}"
     name: test_helm

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

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

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

@@ -2,9 +2,10 @@
 - name: Test helm diff functionality
   vars:
     test_chart_ref: "/tmp/test-chart"
-    redis_chart_version: '17.0.5'
 
   block:
+    - set_fact:
+        helm_namespace: "{{ test_namespace[0] }}"
 
     - name: Install helm diff
       helm_plugin:
@@ -181,7 +182,7 @@
         chart_ref: redis
         namespace: "{{ helm_namespace }}"
         name: redis-chart
-        chart_version: "{{ redis_chart_version }}"
+        chart_version: '16.0.0'
         release_values: "{{ redis_chart_values }}"
 
     - name: Upgrade Redis chart
@@ -191,7 +192,7 @@
         chart_ref: redis
         namespace: "{{ helm_namespace }}"
         name: redis-chart
-        chart_version: "{{ redis_chart_version }}"
+        chart_version: '16.0.0'
         release_values: "{{ redis_chart_values }}"
       check_mode: yes
       register: redis_upgrade
@@ -225,7 +226,7 @@
         chart_ref: redis
         namespace: "{{ helm_namespace }}"
         name: redis-chart
-        chart_version: "{{ redis_chart_version }}"
+        chart_version: '16.0.0'
         release_values: "{{ redis_chart_values }}"
       check_mode: yes
       register: redis_upgrade_2

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

@@ -42,19 +42,6 @@
     that:
       - repository_errors is failed
 
-- name: Succesfully add repository with the same name when forcing
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    repo_url: "{{ chart_test_repo }}"
-    force: true
-  register: repository
-
-- name: Assert that test_helm_repo repository is changed
-  assert:
-    that:
-      - repository is changed
-
 - name: Remove test_helm_repo chart repository
   helm_repository:
     binary_path: "{{ helm_binary }}"

tests/integration/targets/helm_diff/aliases

@@ -1,3 +0,0 @@
-time=40
-helm_plugin
-helm

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

@@ -1,3 +0,0 @@
----
-helm_binary: "/tmp/helm/{{ ansible_system | lower }}-amd64/helm"
-helm_namespace: helm-diff

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

@@ -1,6 +0,0 @@
-apiVersion: v2
-name: test-chart
-description: A chart used in molecule tests
-type: application
-version: 0.1.0
-appVersion: "default"

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

@@ -1,6 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: test-chart-configmap
-data:
-  myValue: {{ default "test" .Values.myValue }}

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

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