Prepare for release 2.4.1 (#677)

Prepare for release 2.4.1

SUMMARY


This is a release prep PR for kubernetes.core 2.4.1
ISSUE TYPE


Bugfix Pull Request
Docs Pull Request
Feature Pull Request
New Module Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION

Reviewed-by: Jill R
Reviewed-by: Bikouo Aubin
Reviewed-by: Mike Graves <mgraves@redhat.com>
Reviewed-by: Alina Buzachis

.ansible-lint

@@ -1,6 +1,7 @@
 ---
 profile: production
-
+skip_list:
+  - meta-runtime[unsupported-version]
 exclude_paths:
   - tests/integration
   - tests/sanity

.github/stale.yml

@@ -12,7 +12,6 @@ daysUntilClose: 30
 # Only issues or pull requests with all of these labels are check if stale.
 # Defaults to `[]` (disabled)
 onlyLabels: []
-
 # Issues or Pull Requests with these labels will never be considered stale. Set
 # to `[]` to disable
 exemptLabels:

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

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

.github/workflows/integration-tests.yaml

@@ -132,8 +132,6 @@ jobs:
 
       - name: create kubernetes cluster
         uses: helm/kind-action@v1.8.0
-        with:
-          node_image: "kindest/node:v1.29.2"
 
       - name: Run integration tests
         uses: ansible-network/github_actions/.github/actions/ansible_test_integration@main

.github/workflows/linters.yaml

@@ -10,7 +10,7 @@ on:
       - main
       - stable-*
     tags:
-      - '*'
+      - "*"
 
 jobs:
   linters:
@@ -21,4 +21,4 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Run ansible-lint
-        uses: ansible/ansible-lint@v24.2.3
+        uses: ansible/ansible-lint@v6.21.0

.github/workflows/unit-tests.yaml

@@ -1,3 +1,4 @@
+---
 name: Unit tests
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

CHANGELOG.rst

@@ -4,112 +4,14 @@ Kubernetes Collection Release Notes
 
 .. contents:: Topics
 
-v4.0.0
+
+v2.4.1
 ======
 
 Release Summary
 ---------------
 
-This major release brings several bug fixes. We have also removed support for ``ansible-core<2.15`` and deprecated functions and class from ``module_utils/common.py``.
-
-Minor Changes
--------------
-
-- inventory/k8s.py - Defer removal of k8s inventory plugin to version 5.0 (https://github.com/ansible-collections/kubernetes.core/pull/723).
-- k8s - The module and K8sService were changed so warnings returned by the K8S API are now displayed to the user.
-
-Removed Features (previously deprecated)
-----------------------------------------
-
-- k8s - Support for ``merge_type=json`` has been removed in version 4.0.0. Please use ``kubernetes.core.k8s_json_patch`` instead (https://github.com/ansible-collections/kubernetes.core/pull/722).
-- k8s_exec - the previously deprecated ``result.return_code`` return value has been removed, consider using ``result.rc`` instead (https://github.com/ansible-collections/kubernetes.core/pull/726).
-- module_utils/common.py - the previously deprecated ``K8sAnsibleMixin`` class has been removed (https://github.com/ansible-collections/kubernetes.core/pull/726).
-- module_utils/common.py - the previously deprecated ``configuration_digest()`` function has been removed (https://github.com/ansible-collections/kubernetes.core/pull/726).
-- module_utils/common.py - the previously deprecated ``get_api_client()`` function has been removed (https://github.com/ansible-collections/kubernetes.core/pull/726).
-- module_utils/common.py - the previously deprecated ``unique_string()`` function has been removed (https://github.com/ansible-collections/kubernetes.core/pull/726).
-
-Bugfixes
---------
-
-- Resolve Collections util resource discovery fails when complex subresources present (https://github.com/ansible-collections/kubernetes.core/pull/676).
-- align `helmdiff_check()` function commandline rendering with the `deploy()` function (https://github.com/ansible-collections/kubernetes.core/pull/670).
-- avoid unsafe conditions in integration tests (https://github.com/ansible-collections/kubernetes.core/pull/665).
-- helm - use ``reuse-values`` when running ``helm diff`` command (https://github.com/ansible-collections/kubernetes.core/issues/680).
-- integrations test helm_kubeconfig - set helm version to v3.10.3 to avoid incompatability with new bitnami charts (https://github.com/ansible-collections/kubernetes.core/pull/670).
-
-v3.1.0
-======
-
-Release Summary
----------------
-
-This release comes with some bugfixes and documentation updates. It also adds new features to the kubectl connection plugin and the kustomize lookup plugin.
-
-Minor Changes
--------------
-
-- kubectl - added support of local enviroment variable that will be used for kubectl and may be requried for establishing connections ifself (https://github.com/ansible-collections/kubernetes.core/pull/702)
-- kustomize - new parameter added to --enable-helm (https://github.com/ansible-collections/kubernetes.core/issues/568)
-
-Bugfixes
---------
-
-- helm - expand kubeconfig path with user's home directory for consistency with k8s
-- k8s_json_patch - rename action symlink to ensure k8s action plugin is used (https://github.com/ansible-collections/kubernetes.core/pull/652).
-
-v3.0.1
-======
-
-Release Summary
----------------
-
-This release fixes issue with resources discovery when complex subresources are present, and fixes issues with `reuse-values` parameter for helm module.
-
-Bugfixes
---------
-
-- Resolve Collections util resource discovery fails when complex subresources present (https://github.com/ansible-collections/kubernetes.core/pull/676).
-- align `helmdiff_check()` function commandline rendering with the `deploy()` function (https://github.com/ansible-collections/kubernetes.core/pull/670).
-- helm - use ``reuse-values`` when running ``helm diff`` command (https://github.com/ansible-collections/kubernetes.core/issues/680).
-- integrations test helm_kubeconfig - set helm version to v3.10.3 to avoid incompatability with new bitnami charts (https://github.com/ansible-collections/kubernetes.core/pull/670).
-
-v3.0.0
-======
-
-Release Summary
----------------
-
-This major release drops support for ansible-core versions lower than 2.14, Python versions lower than 3.9 and updates python kubernetes library to 24.2.0, helm/kind-action to 1.8.0, kubernetes >= 1.24, along with bug fixes and minor changes.
-
-Minor Changes
--------------
-
-- helm - add ``reuse_values`` and ``reset_values`` support to helm module (https://github.com/ansible-collections/kubernetes.core/issues/394).
-- k8s - add new option ``delete_all`` to support deletion of all resources when state is set to ``absent``. (https://github.com/ansible-collections/kubernetes.core/issues/504)
-- k8s, k8s_info - add a hidden_fields option to allow fields to be hidden in the results of k8s and k8s_info
-- k8s_drain - add ability to filter the list of pods to be drained by a pod label selector (https://github.com/ansible-collections/kubernetes.core/issues/474).
-
-Breaking Changes / Porting Guide
---------------------------------
-
-- Remove support for ansible-core < 2.14
-- Update python kubernetes library to 24.2.0, helm/kind-action to 1.8.0, kubernetes >= 1.24.
-
-Deprecated Features
--------------------
-
-- k8s - the ``k8s`` inventory plugin has been deprecated and will be removed in release 4.0.0 (https://github.com/ansible-collections/kubernetes.core/issues/31).
-
-Bugfixes
---------
-
-- helm - Put the chart_ref into quotes when running ``helm show chart``, ``helm upgrade`` and ``helm dependency update`` commands (https://github.com/ansible-collections/kubernetes.core/issues/653).
-- helm - delete temporary file created when deploying chart with option ``release_values`` set (https://github.com/ansible-collections/kubernetes.core/issues/530).
-- helm - fix issue occurring when uninstalling chart with statues others than ``deployed`` (https://github.com/ansible-collections/kubernetes.core/issues/319).
-- helm - fix post_renderer argument breaking the helm deploy_command (https://github.com/ansible-collections/kubernetes.core/pull/586).
-- helm - use post_renderer when checking ``changed`` status for a helm release (https://github.com/ansible-collections/kubernetes.core/pull/588).
-- k8s_scale - clean handling of ResourceTimeout exception (https://github.com/ansible-collections/kubernetes.core/issues/583).
-- k8s_scale - fix issue when scaling StatefulSets with ``updateStrategy=OnDelete`` (https://github.com/ansible-collections/kubernetes.core/issues/579).
+The kubernetes.core 2.4.1 release includes several trivial bug fixes related to code sanity.
 
 v2.4.0
 ======
@@ -202,7 +104,7 @@ v2.3.1
 Bugfixes
 --------
 
-- Catch expectation raised when the process is waiting for resources (https://github.com/ansible-collections/kubernetes.core/issues/407).
+- 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).

Makefile

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

README.md

@@ -9,7 +9,7 @@ The collection includes a variety of Ansible content to help automate the manage
 <!--start requires_ansible-->
 ## Ansible version compatibility
 
-This collection has been tested against following Ansible versions: **>=2.14.0**.
+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`).
@@ -20,13 +20,13 @@ PEP440 is the schema used to describe the versions of Ansible.
 
 ## Python Support
 
-* Collection supports 3.9+
+* Collection supports 3.6+
 
 Note: Python2 is deprecated from [1st January 2020](https://www.python.org/doc/sunset-python-2/). Please switch to Python3.
 
 ## Kubernetes Version Support
 
-This collection supports Kubernetes versions >= 1.24.
+This collection supports Kubernetes versions >=1.19.
 
 ## Included content
 
@@ -93,7 +93,7 @@ You can also include it in a `requirements.yml` file and install it via `ansible
 ---
 collections:
   - name: kubernetes.core
-    version: 4.0.0
+    version: 2.4.1
 ```
 
 ### Installing the Kubernetes Python Library

changelogs/changelog.yaml

@@ -762,137 +762,9 @@ releases:
       name: helm_pull
       namespace: ''
     release_date: '2023-01-24'
-  3.0.0:
+  2.4.1:
     changes:
-      breaking_changes:
-      - Remove support for ansible-core < 2.14
-      - Update python kubernetes library to 24.2.0, helm/kind-action to 1.8.0, kubernetes
-        >= 1.24.
-      bugfixes:
-      - helm - Put the chart_ref into quotes when running ``helm show chart``, ``helm
-        upgrade`` and ``helm dependency update`` commands (https://github.com/ansible-collections/kubernetes.core/issues/653).
-      - helm - delete temporary file created when deploying chart with option ``release_values``
-        set (https://github.com/ansible-collections/kubernetes.core/issues/530).
-      - helm - fix issue occurring when uninstalling chart with statues others than
-        ``deployed`` (https://github.com/ansible-collections/kubernetes.core/issues/319).
-      - helm - fix post_renderer argument breaking the helm deploy_command (https://github.com/ansible-collections/kubernetes.core/pull/586).
-      - helm - use post_renderer when checking ``changed`` status for a helm release
-        (https://github.com/ansible-collections/kubernetes.core/pull/588).
-      - k8s_scale - clean handling of ResourceTimeout exception (https://github.com/ansible-collections/kubernetes.core/issues/583).
-      - k8s_scale - fix issue when scaling StatefulSets with ``updateStrategy=OnDelete``
-        (https://github.com/ansible-collections/kubernetes.core/issues/579).
-      deprecated_features:
-      - k8s - the ``k8s`` inventory plugin has been deprecated and will be removed
-        in release 4.0.0 (https://github.com/ansible-collections/kubernetes.core/issues/31).
-      minor_changes:
-      - helm - add ``reuse_values`` and ``reset_values`` support to helm module (https://github.com/ansible-collections/kubernetes.core/issues/394).
-      - k8s - add new option ``delete_all`` to support deletion of all resources when
-        state is set to ``absent``. (https://github.com/ansible-collections/kubernetes.core/issues/504)
-      - k8s, k8s_info - add a hidden_fields option to allow fields to be hidden in
-        the results of k8s and k8s_info
-      - k8s_drain - add ability to filter the list of pods to be drained by a pod
-        label selector (https://github.com/ansible-collections/kubernetes.core/issues/474).
-      release_summary: This major release drops support for ansible-core versions
-        lower than 2.14, Python versions lower than 3.9 and updates python kubernetes
-        library to 24.2.0, helm/kind-action to 1.8.0, kubernetes >= 1.24, along with
-        bug fixes and minor changes.
+      release_summary: The kubernetes.core 2.4.1 release includes several trivial bug fixes related to sanity.
     fragments:
-    - 20230206-deprecate-k8s-inventory.yml
-    - 20231110-helm-quote-ref.yaml
-    - 517-k8s-make-name-optional.yaml
-    - 575-helm-add-support-for-reuse_values-and-reset_values.yml
-    - 579-k8s_scale-fix-issue-with-scaling-statefulsets.yml
-    - 583-k8s_scale-clean-handling-of-ResourceTimeout-exception.yaml
-    - 586-helm-fix-post-renderer-arg.yml
-    - 588-helm-use-post-renderer-for-helmdiff.yml
-    - 589-helm-uninstall-chart-releases-with-statuses-different-than-deployed.yaml
-    - 606-k8s_drain-add-pod_selectors-parameter.yaml
-    - 612-fix-helm-tests.yaml
-    - 629-add-hidden-fields-option.yaml
-    - gha-sanity-fixes.yaml
-    - helm-delete-temporary-file-created-when-using-option-release_values.yaml
-    - remove_ansible_2_13.yaml
-    - update_supported_versions.yaml
-    release_date: '2023-11-17'
-  3.0.1:
-    changes:
-      bugfixes:
-      - Resolve Collections util resource discovery fails when complex subresources
-        present (https://github.com/ansible-collections/kubernetes.core/pull/676).
-      - align `helmdiff_check()` function commandline rendering with the `deploy()`
-        function (https://github.com/ansible-collections/kubernetes.core/pull/670).
-      - helm - use ``reuse-values`` when running ``helm diff`` command (https://github.com/ansible-collections/kubernetes.core/issues/680).
-      - integrations test helm_kubeconfig - set helm version to v3.10.3 to avoid incompatability
-        with new bitnami charts (https://github.com/ansible-collections/kubernetes.core/pull/670).
-      release_summary: This release fixes issue with resources discovery when complex
-        subresources are present, and fixes issues with `reuse-values` parameter for
-        helm module.
-    fragments:
-    - 20240117-fix-helm-diff-cmd-line-rendering.yml
-    - 20240222-Collections-util-resource-discovery-fails-when-complex-subresources-present.yml
-    - 20240228-fix-helm-diff-with-reuse-values.yml
-    - 3.0.1.yml
-    release_date: '2024-03-01'
-  3.1.0:
-    changes:
-      bugfixes:
-      - helm - expand kubeconfig path with user's home directory for consistency with
-        k8s
-      - k8s_json_patch - rename action symlink to ensure k8s action plugin is used
-        (https://github.com/ansible-collections/kubernetes.core/pull/652).
-      minor_changes:
-      - kubectl - added support of local enviroment variable that will be used for
-        kubectl and may be requried for establishing connections ifself (https://github.com/ansible-collections/kubernetes.core/pull/702)
-      - kustomize - new parameter added to --enable-helm (https://github.com/ansible-collections/kubernetes.core/issues/568)
-      release_summary: This release comes with some bugfixes and documentation updates.
-        It also adds new features to the kubectl connection plugin and the kustomize
-        lookup plugin.
-    fragments:
-    - 20240426-add-support-of-kubectl-local-env-vars-for-connection-plugin.yml
-    - 3.1.0.yml
-    - 592-kustomize-helm-support.yml
-    - 652-fix-json-patch-action.yml
-    - 654-helm-expand-user.yml
-    release_date: '2024-05-16'
-  4.0.0:
-    changes:
-      bugfixes:
-      - Resolve Collections util resource discovery fails when complex subresources
-        present (https://github.com/ansible-collections/kubernetes.core/pull/676).
-      - align `helmdiff_check()` function commandline rendering with the `deploy()`
-        function (https://github.com/ansible-collections/kubernetes.core/pull/670).
-      - avoid unsafe conditions in integration tests (https://github.com/ansible-collections/kubernetes.core/pull/665).
-      - helm - use ``reuse-values`` when running ``helm diff`` command (https://github.com/ansible-collections/kubernetes.core/issues/680).
-      - integrations test helm_kubeconfig - set helm version to v3.10.3 to avoid incompatability
-        with new bitnami charts (https://github.com/ansible-collections/kubernetes.core/pull/670).
-      minor_changes:
-      - inventory/k8s.py - Defer removal of k8s inventory plugin to version 5.0 (https://github.com/ansible-collections/kubernetes.core/pull/723).
-      - k8s - The module and K8sService were changed so warnings returned by the K8S
-        API are now displayed to the user.
-      release_summary: This major release brings several bug fixes. We have also removed
-        support for ``ansible-core<2.15`` and deprecated functions and class from
-        ``module_utils/common.py``.
-      removed_features:
-      - k8s - Support for ``merge_type=json`` has been removed in version 4.0.0. Please
-        use ``kubernetes.core.k8s_json_patch`` instead (https://github.com/ansible-collections/kubernetes.core/pull/722).
-      - k8s_exec - the previously deprecated ``result.return_code`` return value has
-        been removed, consider using ``result.rc`` instead (https://github.com/ansible-collections/kubernetes.core/pull/726).
-      - module_utils/common.py - the previously deprecated ``K8sAnsibleMixin`` class
-        has been removed (https://github.com/ansible-collections/kubernetes.core/pull/726).
-      - module_utils/common.py - the previously deprecated ``configuration_digest()``
-        function has been removed (https://github.com/ansible-collections/kubernetes.core/pull/726).
-      - module_utils/common.py - the previously deprecated ``get_api_client()`` function
-        has been removed (https://github.com/ansible-collections/kubernetes.core/pull/726).
-      - module_utils/common.py - the previously deprecated ``unique_string()`` function
-        has been removed (https://github.com/ansible-collections/kubernetes.core/pull/726).
-    fragments:
-    - 20231206-fix-unsafe-condition-in-integration.yml
-    - 20240117-fix-helm-diff-cmd-line-rendering.yml
-    - 20240222-Collections-util-resource-discovery-fails-when-complex-subresources-present.yml
-    - 20240228-fix-helm-diff-with-reuse-values.yml
-    - 20240423-k8s-display-warnings-to-users.yml
-    - 4.0.0.yaml
-    - inventory-update_removal_date.yml
-    - k8s-merge_type-removed.yml
-    - module_utils-common-remove-deprecated-functions-and-class.yaml
-    release_date: '2024-05-24'
+    - fix_sanity_errors.yml
+    release_date: '2024-02-06'

docs/kubernetes.core.helm_info_module.rst

@@ -105,27 +105,6 @@ Parameters
                         <div style="font-size: small; color: darkgreen"><br/>aliases: kube_context</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>get_all_values</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">boolean</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.4.0</div>
-                </td>
-                <td>
-                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
-                                    <li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
-                                    <li>yes</li>
-                        </ul>
-                </td>
-                <td>
-                        <div>Set to <code>True</code> if you want to get all (computed) values of the release.</div>
-                        <div>When <code>False</code> (default), only user supplied values are returned.</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -148,7 +127,7 @@ Parameters
                     <b>kubeconfig</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">raw</span>
+                        <span style="color: purple">path</span>
                     </div>
                 </td>
                 <td>
@@ -156,7 +135,6 @@ Parameters
                 <td>
                         <div>Helm option to specify kubeconfig path to use.</div>
                         <div>If the value is not specified in the task, the value of environment variable <code>K8S_AUTH_KUBECONFIG</code> will be used instead.</div>
-                        <div>The configuration can be provided as dictionary. Added in version 2.4.0.</div>
                         <div style="font-size: small; color: darkgreen"><br/>aliases: kubeconfig_path</div>
                 </td>
             </tr>
@@ -194,32 +172,6 @@ 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>
-                        <b>Default:</b><br/><div style="color: blue">[]</div>
-                </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>
@@ -252,18 +204,11 @@ Examples
 
 .. code-block:: yaml
 
-    - name: Gather information of Grafana chart inside monitoring namespace
+    - name: Deploy latest version 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
@@ -325,42 +270,6 @@ Common return values are documented `here <https://docs.ansible.com/ansible/late
                     <br/>
                 </td>
             </tr>
-            <tr>
-                    <td class="elbow-placeholder">&nbsp;</td>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>hooks</b>
-                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
-                    <div style="font-size: small">
-                      <span style="color: purple">list</span>
-                       / <span style="color: purple">elements=dictionary</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.4.0</div>
-                </td>
-                <td>always</td>
-                <td>
-                            <div>Hooks of the release</div>
-                    <br/>
-                </td>
-            </tr>
-            <tr>
-                    <td class="elbow-placeholder">&nbsp;</td>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>manifest</b>
-                    <a class="ansibleOptionLink" href="#return-" title="Permalink to this return value"></a>
-                    <div style="font-size: small">
-                      <span style="color: purple">list</span>
-                       / <span style="color: purple">elements=dictionary</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.4.0</div>
-                </td>
-                <td>always</td>
-                <td>
-                            <div>Manifest of the release</div>
-                    <br/>
-                </td>
-            </tr>
             <tr>
                     <td class="elbow-placeholder">&nbsp;</td>
                 <td colspan="1">
@@ -393,23 +302,6 @@ Common return values are documented `here <https://docs.ansible.com/ansible/late
                     <br/>
                 </td>
             </tr>
-            <tr>
-                    <td class="elbow-placeholder">&nbsp;</td>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="return-"></div>
-                    <b>notes</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>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.4.0</div>
-                </td>
-                <td>always</td>
-                <td>
-                            <div>Notes of the release</div>
-                    <br/>
-                </td>
-            </tr>
             <tr>
                     <td class="elbow-placeholder">&nbsp;</td>
                 <td colspan="1">

docs/kubernetes.core.helm_module.rst

@@ -36,12 +36,12 @@ Parameters
 
     <table  border=0 cellpadding=0 class="documentation-table">
         <tr>
-            <th colspan="2">Parameter</th>
+            <th colspan="1">Parameter</th>
             <th>Choices/<font color="blue">Defaults</font></th>
             <th width="100%">Comments</th>
         </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>api_key</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -57,7 +57,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>atomic</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -76,7 +76,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>binary_path</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -91,7 +91,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>ca_cert</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -108,7 +108,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>chart_ref</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -127,7 +127,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>chart_repo_url</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -142,7 +142,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>chart_version</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -157,7 +157,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>context</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -174,7 +174,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>create_namespace</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -194,14 +194,13 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <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>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.4.0</div>
                 </td>
                 <td>
                         <ul style="margin: 0; padding: 0"><b>Choices:</b>
@@ -210,7 +209,7 @@ Parameters
                         </ul>
                 </td>
                 <td>
-                        <div>Run standalone <code>helm dependency update CHART</code> before the operation.</div>
+                        <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>
@@ -219,7 +218,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>disable_hook</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -238,7 +237,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>force</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -257,7 +256,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>history_max</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -274,7 +273,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>host</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -290,12 +289,12 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>kubeconfig</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">raw</span>
+                        <span style="color: purple">path</span>
                     </div>
                 </td>
                 <td>
@@ -303,28 +302,11 @@ Parameters
                 <td>
                         <div>Helm option to specify kubeconfig path to use.</div>
                         <div>If the value is not specified in the task, the value of environment variable <code>K8S_AUTH_KUBECONFIG</code> will be used instead.</div>
-                        <div>The configuration can be provided as dictionary. Added in version 2.4.0.</div>
                         <div style="font-size: small; color: darkgreen"><br/>aliases: kubeconfig_path</div>
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>post_renderer</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.4.0</div>
-                </td>
-                <td>
-                </td>
-                <td>
-                        <div>Path to an executable to be used for post rendering.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>purge</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -343,7 +325,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>release_name</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -360,7 +342,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>release_namespace</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -377,7 +359,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>release_state</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -397,7 +379,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>release_values</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -414,7 +396,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>replace</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -436,108 +418,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>reset_values</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">boolean</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.5.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>When upgrading package, reset the values to the ones built into the chart.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>reuse_values</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">boolean</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.5.0</div>
-                </td>
-                <td>
-                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
-                                    <li>no</li>
-                                    <li>yes</li>
-                        </ul>
-                </td>
-                <td>
-                        <div>When upgrading package, specifies wether to reuse the last release&#x27;s values and merge in any overrides from parameters <em>release_values</em>, <em>values_files</em> or <em>set_values</em>.</div>
-                        <div>If <em>reset_values</em> is set to <code>True</code>, this is ignored.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>set_values</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=dictionary</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.4.0</div>
-                </td>
-                <td>
-                </td>
-                <td>
-                        <div>Values to pass to chart configuration</div>
-                </td>
-            </tr>
-                                <tr>
-                    <td class="elbow-placeholder"></td>
                 <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>value</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>Value to pass to chart configuration (e.g phase=prod).</div>
-                </td>
-            </tr>
-            <tr>
-                    <td class="elbow-placeholder"></td>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>value_type</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">-</span>
-                    </div>
-                </td>
-                <td>
-                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
-                                    <li><div style="color: blue"><b>raw</b>&nbsp;&larr;</div></li>
-                                    <li>string</li>
-                                    <li>json</li>
-                                    <li>file</li>
-                        </ul>
-                </td>
-                <td>
-                        <div>Use <code>raw</code> set individual value.</div>
-                        <div>Use <code>string</code> to force a string for an individual value.</div>
-                        <div>Use <code>file</code> to set individual values from a file when the value itself is too long for the command line or is dynamically generated.</div>
-                        <div>Use <code>json</code> to set json values (scalars/objects/arrays). This feature requires helm&gt;=3.10.0.</div>
-                </td>
-            </tr>
-
-            <tr>
-                <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>skip_crds</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -557,7 +438,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>timeout</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -575,7 +456,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>update_repo_cache</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -594,7 +475,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>validate_certs</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -615,7 +496,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>values_files</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -636,7 +517,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>wait</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -656,7 +537,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>wait_timeout</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -675,12 +556,6 @@ 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
@@ -737,15 +612,6 @@ Examples
         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:
@@ -791,17 +657,6 @@ Examples
           logging:
             enabled: True
 
-    # Deploy latest version
-    - name: Deploy latest version of Grafana chart using reuse_values
-      kubernetes.core.helm:
-        name: test
-        chart_ref: stable/grafana
-        release_namespace: monitoring
-        reuse_values: true
-        values:
-          replicas: 2
-          version: 3e8ec0b2dffa40fb97d5342e4af887de95faa8c61a62480dd7f8aa03dffcf533
-
 
 
 Return Values

docs/kubernetes.core.helm_plugin_info_module.rst

@@ -126,7 +126,7 @@ Parameters
                     <b>kubeconfig</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">raw</span>
+                        <span style="color: purple">path</span>
                     </div>
                 </td>
                 <td>
@@ -134,7 +134,6 @@ Parameters
                 <td>
                         <div>Helm option to specify kubeconfig path to use.</div>
                         <div>If the value is not specified in the task, the value of environment variable <code>K8S_AUTH_KUBECONFIG</code> will be used instead.</div>
-                        <div>The configuration can be provided as dictionary. Added in version 2.4.0.</div>
                         <div style="font-size: small; color: darkgreen"><br/>aliases: kubeconfig_path</div>
                 </td>
             </tr>

docs/kubernetes.core.helm_plugin_module.rst

@@ -126,7 +126,7 @@ Parameters
                     <b>kubeconfig</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">raw</span>
+                        <span style="color: purple">path</span>
                     </div>
                 </td>
                 <td>
@@ -134,7 +134,6 @@ Parameters
                 <td>
                         <div>Helm option to specify kubeconfig path to use.</div>
                         <div>If the value is not specified in the task, the value of environment variable <code>K8S_AUTH_KUBECONFIG</code> will be used instead.</div>
-                        <div>The configuration can be provided as dictionary. Added in version 2.4.0.</div>
                         <div style="font-size: small; color: darkgreen"><br/>aliases: kubeconfig_path</div>
                 </td>
             </tr>
@@ -151,7 +150,7 @@ Parameters
                 </td>
                 <td>
                         <div>Name of Helm plugin.</div>
-                        <div>Required only if <code>state=absent</code> or <code>state=latest</code>.</div>
+                        <div>Required only if <code>state=absent</code>.</div>
                 </td>
             </tr>
             <tr>
@@ -171,23 +170,6 @@ 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>
@@ -201,12 +183,10 @@ 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>
@@ -257,17 +237,6 @@ 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_repository_module.rst

@@ -39,22 +39,6 @@ Parameters
             <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>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">
@@ -71,117 +55,6 @@ 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>context</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.4.0</div>
-                </td>
-                <td>
-                </td>
-                <td>
-                        <div>Helm option to specify which kubeconfig context to use.</div>
-                        <div>If the value is not specified in the task, the value of environment variable <code>K8S_AUTH_CONTEXT</code> will be used instead.</div>
-                        <div style="font-size: small; color: darkgreen"><br/>aliases: kube_context</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>force_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>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.4.0</div>
-                </td>
-                <td>
-                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
-                                    <li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
-                                    <li>yes</li>
-                        </ul>
-                </td>
-                <td>
-                        <div>Whether or not to replace (overwrite) the repo if it already exists.</div>
-                        <div style="font-size: small; color: darkgreen"><br/>aliases: force</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>kubeconfig</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">raw</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.4.0</div>
-                </td>
-                <td>
-                </td>
-                <td>
-                        <div>Helm option to specify kubeconfig path to use.</div>
-                        <div>If the value is not specified in the task, the value of environment variable <code>K8S_AUTH_KUBECONFIG</code> will be used instead.</div>
-                        <div>The configuration can be provided as dictionary.</div>
-                        <div style="font-size: small; color: darkgreen"><br/>aliases: kubeconfig_path</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>
@@ -269,27 +142,6 @@ 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

@@ -28,12 +28,12 @@ Parameters
 
     <table  border=0 cellpadding=0 class="documentation-table">
         <tr>
-            <th colspan="2">Parameter</th>
+            <th colspan="1">Parameter</th>
             <th>Choices/<font color="blue">Defaults</font></th>
             <th width="100%">Comments</th>
         </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>binary_path</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -48,7 +48,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>chart_ref</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -67,7 +67,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>chart_repo_url</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -82,7 +82,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>chart_version</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -97,14 +97,13 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <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>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.4.0</div>
                 </td>
                 <td>
                         <ul style="margin: 0; padding: 0"><b>Choices:</b>
@@ -120,27 +119,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>disable_hook</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.4.0</div>
-                </td>
-                <td>
-                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
-                                    <li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
-                                    <li>yes</li>
-                        </ul>
-                </td>
-                <td>
-                        <div>Prevent hooks from running during install.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>include_crds</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -159,7 +138,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>output_dir</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -175,40 +154,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>release_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.4.0</div>
-                </td>
-                <td>
-                </td>
-                <td>
-                        <div>Release name to use in rendered templates.</div>
-                        <div style="font-size: small; color: darkgreen"><br/>aliases: name</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="2">
-                    <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.4.0</div>
-                </td>
-                <td>
-                </td>
-                <td>
-                        <div>namespace scope for this request.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>release_values</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -225,85 +171,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>set_values</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=dictionary</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.4.0</div>
-                </td>
-                <td>
-                </td>
-                <td>
-                        <div>Values to pass to chart configuration.</div>
-                </td>
-            </tr>
-                                <tr>
-                    <td class="elbow-placeholder"></td>
                 <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>value</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>Value to pass to chart configuration (e.g phase=prod).</div>
-                </td>
-            </tr>
-            <tr>
-                    <td class="elbow-placeholder"></td>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>value_type</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">-</span>
-                    </div>
-                </td>
-                <td>
-                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
-                                    <li><div style="color: blue"><b>raw</b>&nbsp;&larr;</div></li>
-                                    <li>string</li>
-                                    <li>json</li>
-                                    <li>file</li>
-                        </ul>
-                </td>
-                <td>
-                        <div>Use <code>raw</code> set individual value.</div>
-                        <div>Use <code>string</code> to force a string for an individual value.</div>
-                        <div>Use <code>file</code> to set individual values from a file when the value itself is too long for the command line or is dynamically generated.</div>
-                        <div>Use <code>json</code> to set json values (scalars/objects/arrays). This feature requires helm&gt;=3.10.0.</div>
-                </td>
-            </tr>
-
-            <tr>
-                <td colspan="2">
-                    <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.4.0</div>
-                </td>
-                <td>
-                        <b>Default:</b><br/><div style="color: blue">[]</div>
-                </td>
-                <td>
-                        <div>Only show manifests rendered from the given templates.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>update_repo_cache</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -322,7 +190,7 @@ Parameters
                 </td>
             </tr>
             <tr>
-                <td colspan="2">
+                <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>values_files</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
@@ -367,24 +235,6 @@ 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

@@ -27,8 +27,8 @@ Requirements
 ------------
 The below requirements are needed on the host that executes this module.
 
-- python >= 3.9
-- kubernetes >= 24.2.0
+- python >= 3.6
+- kubernetes >= 12.0.0
 - PyYAML >= 3.11
 
 
@@ -203,29 +203,9 @@ Parameters
                 </td>
                 <td>
                         <div>Path to an existing Kubernetes config file. If not provided, and no other connection options are provided, the Kubernetes client will attempt to load the default configuration file from <em>~/.kube/config</em>. Can also be specified via K8S_AUTH_KUBECONFIG environment variable.</div>
-                        <div>Multiple Kubernetes config file can be provided using separator &#x27;;&#x27; for Windows platform or &#x27;:&#x27; for others platforms.</div>
                         <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

@@ -25,8 +25,8 @@ Requirements
 ------------
 The below requirements are needed on the host that executes this module.
 
-- python >= 3.9
-- kubernetes >= 24.2.0
+- python >= 3.6
+- kubernetes >= 12.0.0
 
 
 Parameters
@@ -215,7 +215,6 @@ Parameters
                 </td>
                 <td>
                         <div>Path to an existing Kubernetes config file. If not provided, and no other connection options are provided, the Kubernetes client will attempt to load the default configuration file from <em>~/.kube/config</em>. Can also be specified via K8S_AUTH_KUBECONFIG environment variable.</div>
-                        <div>Multiple Kubernetes config file can be provided using separator &#x27;;&#x27; for Windows platform or &#x27;:&#x27; for others platforms.</div>
                         <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>
@@ -272,25 +271,6 @@ 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>
@@ -558,7 +538,7 @@ Examples
         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

docs/kubernetes.core.k8s_drain_module.rst

@@ -29,8 +29,8 @@ Requirements
 ------------
 The below requirements are needed on the host that executes this module.
 
-- python >= 3.9
-- kubernetes >= 24.2.0
+- python >= 3.6
+- kubernetes >= 12.0.0
 
 
 Parameters
@@ -132,7 +132,6 @@ Parameters
                     </div>
                 </td>
                 <td>
-                        <b>Default:</b><br/><div style="color: blue">{}</div>
                 </td>
                 <td>
                         <div>Specify options to delete pods.</div>
@@ -148,7 +147,6 @@ 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>
@@ -157,7 +155,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>
@@ -336,7 +334,6 @@ Parameters
                 </td>
                 <td>
                         <div>Path to an existing Kubernetes config file. If not provided, and no other connection options are provided, the Kubernetes client will attempt to load the default configuration file from <em>~/.kube/config</em>. Can also be specified via K8S_AUTH_KUBECONFIG environment variable.</div>
-                        <div>Multiple Kubernetes config file can be provided using separator &#x27;;&#x27; for Windows platform or &#x27;:&#x27; for others platforms.</div>
                         <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>
@@ -356,25 +353,6 @@ 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>
@@ -414,25 +392,6 @@ Parameters
                         <div>The fix for this k8s python library is here: https://github.com/kubernetes-client/python-base/pull/169</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>pod_selectors</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.5.0</div>
-                </td>
-                <td>
-                </td>
-                <td>
-                        <div>Label selector to filter pods on the node.</div>
-                        <div>This option has effect only when <code>state</code> is set to <em>drain</em>.</div>
-                        <div style="font-size: small; color: darkgreen"><br/>aliases: label_selectors</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -614,14 +573,6 @@ Examples
         state: cordon
         name: foo
 
-    - name: Drain node "foo" using label selector to filter the list of pods to be drained.
-      kubernetes.core.k8s_drain:
-        state: drain
-        name: foo
-        pod_selectors:
-        - 'app!=csi-attacher'
-        - 'app!=csi-provisioner'
-
 
 
 Return Values

docs/kubernetes.core.k8s_exec_module.rst

@@ -25,8 +25,8 @@ Requirements
 ------------
 The below requirements are needed on the host that executes this module.
 
-- python >= 3.9
-- kubernetes >= 24.2.0
+- python >= 3.6
+- kubernetes >= 12.0.0
 - PyYAML >= 3.11
 
 
@@ -117,7 +117,7 @@ Parameters
                 <td>
                 </td>
                 <td>
-                        <div>The command to execute.</div>
+                        <div>The command to execute</div>
                 </td>
             </tr>
             <tr>
@@ -134,7 +134,6 @@ 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>
@@ -215,7 +214,6 @@ Parameters
                 </td>
                 <td>
                         <div>Path to an existing Kubernetes config file. If not provided, and no other connection options are provided, the Kubernetes client will attempt to load the default configuration file from <em>~/.kube/config</em>. Can also be specified via K8S_AUTH_KUBECONFIG environment variable.</div>
-                        <div>Multiple Kubernetes config file can be provided using separator &#x27;;&#x27; for Windows platform or &#x27;:&#x27; for others platforms.</div>
                         <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>
@@ -232,26 +230,7 @@ Parameters
                 <td>
                 </td>
                 <td>
-                        <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>
+                        <div>The pod namespace name</div>
                 </td>
             </tr>
             <tr>
@@ -306,7 +285,7 @@ Parameters
                 <td>
                 </td>
                 <td>
-                        <div>The pod name.</div>
+                        <div>The pod name</div>
                 </td>
             </tr>
             <tr>
@@ -323,7 +302,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 (for example, HTTP_PROXY).</div>
+                        <div>Please note that this module does not pick up typical proxy settings from the environment (e.g. HTTP_PROXY).</div>
                 </td>
             </tr>
             <tr>
@@ -470,13 +449,6 @@ 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

@@ -28,8 +28,8 @@ Requirements
 ------------
 The below requirements are needed on the host that executes this module.
 
-- python >= 3.9
-- kubernetes >= 24.2.0
+- python >= 3.6
+- kubernetes >= 12.0.0
 - PyYAML >= 3.11
 
 
@@ -153,31 +153,11 @@ Parameters
                     </div>
                 </td>
                 <td>
-                        <b>Default:</b><br/><div style="color: blue">[]</div>
                 </td>
                 <td>
                         <div>List of field selectors to use to filter results</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>hidden_fields</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">list</span>
-                         / <span style="color: purple">elements=string</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.5.0</div>
-                </td>
-                <td>
-                </td>
-                <td>
-                        <div>Hide fields matching any of the field definitions in the result</div>
-                        <div>An example might be <code>hidden_fields=[metadata.managedFields]</code></div>
-                        <div>Only field definitions that don&#x27;t reference list items are supported (so V(spec.containers[0]) would not work)</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -260,7 +240,6 @@ Parameters
                 </td>
                 <td>
                         <div>Path to an existing Kubernetes config file. If not provided, and no other connection options are provided, the Kubernetes client will attempt to load the default configuration file from <em>~/.kube/config</em>. Can also be specified via K8S_AUTH_KUBECONFIG environment variable.</div>
-                        <div>Multiple Kubernetes config file can be provided using separator &#x27;;&#x27; for Windows platform or &#x27;:&#x27; for others platforms.</div>
                         <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>
@@ -275,7 +254,6 @@ Parameters
                     </div>
                 </td>
                 <td>
-                        <b>Default:</b><br/><div style="color: blue">[]</div>
                 </td>
                 <td>
                         <div>List of label selectors to use to filter results</div>
@@ -317,25 +295,6 @@ 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

@@ -13,15 +13,6 @@ kubernetes.core.k8s
    :local:
    :depth: 1
 
-DEPRECATED
-----------
-:Removed in collection release after 
-:Why: As discussed in https://github.com/ansible-collections/kubernetes.core/issues/31, we decided to
-remove the k8s inventory plugin in release 5.0.0.
-
-:Alternative: Use :ref:`kubernetes.core.k8s_info <kubernetes.core.k8s_info_module>` and :ref:`ansible.builtin.add_host <ansible.builtin.add_host_module>` instead.
-
-
 
 Synopsis
 --------
@@ -36,8 +27,8 @@ Requirements
 ------------
 The below requirements are needed on the local Ansible controller node that executes this inventory.
 
-- python >= 3.9
-- kubernetes >= 24.2.0
+- python >= 3.6
+- kubernetes >= 12.0.0
 - PyYAML >= 3.11
 
 
@@ -331,20 +322,20 @@ Examples
 
     # File must be named k8s.yaml or k8s.yml
 
-    - name: Authenticate with token, and return all pods and services for all namespaces
+    # Authenticate with token, and return all pods and services for all namespaces
     plugin: kubernetes.core.k8s
     connections:
       - host: https://192.168.64.4:8443
         api_key: xxxxxxxxxxxxxxxx
         validate_certs: false
 
-    - name: Use default config (~/.kube/config) file and active context, and return objects for a specific namespace
+    # Use default config (~/.kube/config) file and active context, and return objects for a specific namespace
     plugin: kubernetes.core.k8s
     connections:
       - namespaces:
         - testing
 
-    - name: Use a custom config file, and a specific context.
+    # Use a custom config file, and a specific context.
     plugin: kubernetes.core.k8s
     connections:
       - kubeconfig: /path/to/config
@@ -357,15 +348,11 @@ Status
 ------
 
 
-- This inventory will be removed in version 5.0.0. *[deprecated]*
-- For more information see `DEPRECATED`_.
-
-
 Authors
 ~~~~~~~
 
-- Chris Houseknecht (@chouseknecht)
-- Fabian von Feilitzsch (@fabianvf)
+- Chris Houseknecht <@chouseknecht>
+- Fabian von Feilitzsch <@fabianvf>
 
 
 .. hint::

docs/kubernetes.core.k8s_json_patch_module.rst

@@ -27,8 +27,8 @@ Requirements
 ------------
 The below requirements are needed on the host that executes this module.
 
-- python >= 3.9
-- kubernetes >= 24.2.0
+- python >= 3.6
+- kubernetes >= 12.0.0
 - PyYAML >= 3.11
 - jsonpatch
 
@@ -220,7 +220,6 @@ Parameters
                 </td>
                 <td>
                         <div>Path to an existing Kubernetes config file. If not provided, and no other connection options are provided, the Kubernetes client will attempt to load the default configuration file from <em>~/.kube/config</em>. Can also be specified via K8S_AUTH_KUBECONFIG environment variable.</div>
-                        <div>Multiple Kubernetes config file can be provided using separator &#x27;;&#x27; for Windows platform or &#x27;:&#x27; for others platforms.</div>
                         <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>
@@ -257,25 +256,6 @@ 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>
@@ -614,7 +594,7 @@ Examples
             path: /metadata/labels/app
             value: myapp
           - op: replace
-            path: /spec/containers/0/image
+            patch: /spec/containers/0/image
             value: nginx
 
 

docs/kubernetes.core.k8s_log_module.rst

@@ -28,8 +28,8 @@ Requirements
 ------------
 The below requirements are needed on the host that executes this module.
 
-- python >= 3.9
-- kubernetes >= 24.2.0
+- python >= 3.6
+- kubernetes >= 12.0.0
 - PyYAML >= 3.11
 
 
@@ -43,27 +43,6 @@ Parameters
             <th colspan="2">Parameter</th>
             <th>Choices/<font color="blue">Defaults</font></th>
             <th width="100%">Comments</th>
-        </tr>
-            <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>all_containers</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.4.0</div>
-                </td>
-                <td>
-                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
-                                    <li>no</li>
-                                    <li>yes</li>
-                        </ul>
-                </td>
-                <td>
-                        <div>If set to <code>true</code>, retrieve all containers&#x27; logs in the pod(s).</div>
-                        <div>mutually exclusive with <code>container</code>.</div>
-                </td>
         </tr>
             <tr>
                 <td colspan="2">
@@ -162,8 +141,7 @@ Parameters
                 <td>
                         <div>Use to specify the container within a pod to grab the log from.</div>
                         <div>If there is only one container, this will default to that container.</div>
-                        <div>If there is more than one container, this option is required or set <em>all_containers</em> to <code>true</code>.</div>
-                        <div>mutually exclusive with <code>all_containers</code>.</div>
+                        <div>If there is more than one container, this option is required.</div>
                 </td>
             </tr>
             <tr>
@@ -262,7 +240,6 @@ Parameters
                 </td>
                 <td>
                         <div>Path to an existing Kubernetes config file. If not provided, and no other connection options are provided, the Kubernetes client will attempt to load the default configuration file from <em>~/.kube/config</em>. Can also be specified via K8S_AUTH_KUBECONFIG environment variable.</div>
-                        <div>Multiple Kubernetes config file can be provided using separator &#x27;;&#x27; for Windows platform or &#x27;:&#x27; for others platforms.</div>
                         <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>
@@ -277,7 +254,6 @@ Parameters
                     </div>
                 </td>
                 <td>
-                        <b>Default:</b><br/><div style="color: blue">[]</div>
                 </td>
                 <td>
                         <div>List of label selectors to use to filter results</div>
@@ -319,25 +295,6 @@ 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>
@@ -377,26 +334,6 @@ Parameters
                         <div>The fix for this k8s python library is here: https://github.com/kubernetes-client/python-base/pull/169</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>previous</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.4.0</div>
-                </td>
-                <td>
-                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
-                                    <li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
-                                    <li>yes</li>
-                        </ul>
-                </td>
-                <td>
-                        <div>If <code>true</code>, print the logs for the previous instance of the container in a pod if it exists.</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -498,22 +435,6 @@ Parameters
                         <div>A relative time in seconds before the current time from which to show logs.</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="2">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>tail_lines</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">integer</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.4.0</div>
-                </td>
-                <td>
-                </td>
-                <td>
-                        <div>A number of lines from the end of the logs to retrieve.</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -598,16 +519,8 @@ Examples
         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 Values

docs/kubernetes.core.k8s_lookup.rst

@@ -26,8 +26,8 @@ Requirements
 ------------
 The below requirements are needed on the local Ansible controller node that executes this lookup.
 
-- python >= 3.9
-- kubernetes >= 24.2.0
+- python >= 3.6
+- kubernetes >= 12.0.0
 - PyYAML >= 3.11
 
 
@@ -438,28 +438,106 @@ Common return values are documented `here <https://docs.ansible.com/ansible/late
 
     <table border=0 cellpadding=0 class="documentation-table">
         <tr>
-            <th colspan="1">Key</th>
+            <th colspan="2">Key</th>
             <th>Returned</th>
             <th width="100%">Description</th>
         </tr>
             <tr>
-                <td colspan="1">
+                <td colspan="2">
                     <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">list</span>
-                       / <span style="color: purple">elements=dictionary</span>
+                      <span style="color: purple">complex</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/>
 
@@ -471,8 +549,8 @@ Status
 Authors
 ~~~~~~~
 
-- Chris Houseknecht (@chouseknecht)
-- Fabian von Feilitzsch (@fabianvf)
+- Chris Houseknecht <@chouseknecht>
+- Fabian von Feilitzsch <@fabianvf>
 
 
 .. hint::

docs/kubernetes.core.k8s_module.rst

@@ -29,8 +29,8 @@ Requirements
 ------------
 The below requirements are needed on the host that executes this module.
 
-- python >= 3.9
-- kubernetes >= 24.2.0
+- python >= 3.6
+- kubernetes >= 12.0.0
 - PyYAML >= 3.11
 - jsonpatch
 
@@ -121,7 +121,7 @@ Parameters
                 <td>
                         <div><code>apply</code> compares the desired resource definition with the previously supplied resource definition, ignoring properties that are automatically generated</div>
                         <div><code>apply</code> works better with Services than &#x27;force=yes&#x27;</div>
-                        <div>Mutually exclusive with <code>merge_type</code>.</div>
+                        <div>mutually exclusive with <code>merge_type</code></div>
                 </td>
             </tr>
             <tr>
@@ -208,30 +208,6 @@ Parameters
                         <div>This has no effect on the validation step which is controlled by the <code>validate.fail_on_error</code> parameter.</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="3">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>delete_all</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.5.0</div>
-                </td>
-                <td>
-                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
-                                    <li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
-                                    <li>yes</li>
-                        </ul>
-                </td>
-                <td>
-                        <div>When this option is set to <em>true</em> and <em>state=absent</em>, module will delete all resources of the specified resource type in the requested namespace.</div>
-                        <div>Ignored when <code>state</code> is not set to <em>absent</em> or when one of (src), <code>name</code>  or <code>resource_definition</code> is provided.</div>
-                        <div>Parameter <code>kind</code> is required to use this option.</div>
-                        <div>This parameter can be used with <code>label_selectors</code> to restrict the resources to be deleted.</div>
-                        <div style="font-size: small; color: darkgreen"><br/>aliases: all</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="3">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -360,45 +336,6 @@ 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>
-                    <b>hidden_fields</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">list</span>
-                         / <span style="color: purple">elements=string</span>
-                    </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.5.0</div>
-                </td>
-                <td>
-                </td>
-                <td>
-                        <div>Hide fields matching this option in the result</div>
-                        <div>An example might be <code>hidden_fields=[metadata.managedFields]</code></div>
-                        <div>Only field definitions that don&#x27;t reference list items are supported (so V(spec.containers[0]) would not work)</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="3">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -480,7 +417,6 @@ Parameters
                 </td>
                 <td>
                         <div>Path to an existing Kubernetes config file. If not provided, and no other connection options are provided, the Kubernetes client will attempt to load the default configuration file from <em>~/.kube/config</em>. Can also be specified via K8S_AUTH_KUBECONFIG environment variable.</div>
-                        <div>Multiple Kubernetes config file can be provided using separator &#x27;;&#x27; for Windows platform or &#x27;:&#x27; for others platforms.</div>
                         <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>
@@ -513,17 +449,18 @@ Parameters
                 </td>
                 <td>
                         <ul style="margin: 0; padding: 0"><b>Choices:</b>
+                                    <li>json</li>
                                     <li>merge</li>
                                     <li>strategic-merge</li>
                         </ul>
                 </td>
                 <td>
                         <div>Whether to override the default patch merge approach with a specific type. By default, the strategic merge will typically be used.</div>
-                        <div>For example, Custom Resource Definitions typically aren&#x27;t updatable by the usual strategic merge. You may want to use <code>merge</code> if you see &quot;strategic merge patch format is not supported&quot;.</div>
+                        <div>For example, Custom Resource Definitions typically aren&#x27;t updatable by the usual strategic merge. You may want to use <code>merge</code> if you see &quot;strategic merge patch format is not supported&quot;</div>
                         <div>See <a href='https://kubernetes.io/docs/tasks/run-application/update-api-object-kubectl-patch/#use-a-json-merge-patch-to-update-a-deployment'>https://kubernetes.io/docs/tasks/run-application/update-api-object-kubectl-patch/#use-a-json-merge-patch-to-update-a-deployment</a></div>
                         <div>If more than one <code>merge_type</code> is given, the merge_types will be tried in order. This defaults to <code>[&#x27;strategic-merge&#x27;, &#x27;merge&#x27;]</code>, which is ideal for using the same parameters on resource kinds that combine Custom Resources and built-in resources.</div>
-                        <div>Mutually exclusive with <code>apply</code>.</div>
-                        <div><em>merge_type=json</em> has been removed in version 4.0.0. Please use <span class='module'>kubernetes.core.k8s_json_patch</span> instead.</div>
+                        <div>mutually exclusive with <code>apply</code></div>
+                        <div><em>merge_type=json</em> is deprecated and will be removed in version 3.0.0. Please use <span class='module'>kubernetes.core.k8s_json_patch</span> instead.</div>
                 </td>
             </tr>
             <tr>
@@ -562,25 +499,6 @@ 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>
@@ -722,63 +640,6 @@ 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>
@@ -793,8 +654,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>The URL to manifest files that can be used to create the resource. Added in version 2.4.0.</div>
-                        <div>Mutually exclusive with <em>template</em> in case of <span class='module'>kubernetes.core.k8s</span> module.</div>
+                        <div>Mutually exclusive with <em>template</em> in case of <span class='module'>k8s</span> module.</div>
                 </td>
             </tr>
             <tr>
@@ -1156,14 +1016,6 @@ Examples
         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
@@ -1241,41 +1093,6 @@ 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
-
-    # Delete all Deployment from specified namespace
-    - name: Delete all Deployment from specified namespace
-      kubernetes.core.k8s:
-        api_version: apps/v1
-        namespace: testing
-        kind: Deployment
-        delete_all: true
-
 
 
 Return Values

docs/kubernetes.core.k8s_rollback_module.rst

@@ -27,8 +27,8 @@ Requirements
 ------------
 The below requirements are needed on the host that executes this module.
 
-- python >= 3.9
-- kubernetes >= 24.2.0
+- python >= 3.6
+- kubernetes >= 12.0.0
 - PyYAML >= 3.11
 
 
@@ -152,7 +152,6 @@ Parameters
                     </div>
                 </td>
                 <td>
-                        <b>Default:</b><br/><div style="color: blue">[]</div>
                 </td>
                 <td>
                         <div>List of field selectors to use to filter results.</div>
@@ -239,7 +238,6 @@ Parameters
                 </td>
                 <td>
                         <div>Path to an existing Kubernetes config file. If not provided, and no other connection options are provided, the Kubernetes client will attempt to load the default configuration file from <em>~/.kube/config</em>. Can also be specified via K8S_AUTH_KUBECONFIG environment variable.</div>
-                        <div>Multiple Kubernetes config file can be provided using separator &#x27;;&#x27; for Windows platform or &#x27;:&#x27; for others platforms.</div>
                         <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>
@@ -254,7 +252,6 @@ Parameters
                     </div>
                 </td>
                 <td>
-                        <b>Default:</b><br/><div style="color: blue">[]</div>
                 </td>
                 <td>
                         <div>List of label selectors to use to filter results.</div>
@@ -296,25 +293,6 @@ 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

@@ -25,8 +25,8 @@ Requirements
 ------------
 The below requirements are needed on the host that executes this module.
 
-- python >= 3.9
-- kubernetes >= 24.2.0
+- python >= 3.6
+- kubernetes >= 12.0.0
 - PyYAML >= 3.11
 
 
@@ -255,7 +255,6 @@ Parameters
                 </td>
                 <td>
                         <div>Path to an existing Kubernetes config file. If not provided, and no other connection options are provided, the Kubernetes client will attempt to load the default configuration file from <em>~/.kube/config</em>. Can also be specified via K8S_AUTH_KUBECONFIG environment variable.</div>
-                        <div>Multiple Kubernetes config file can be provided using separator &#x27;;&#x27; for Windows platform or &#x27;:&#x27; for others platforms.</div>
                         <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>
@@ -271,7 +270,6 @@ Parameters
                     <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.0.0</div>
                 </td>
                 <td>
-                        <b>Default:</b><br/><div style="color: blue">[]</div>
                 </td>
                 <td>
                         <div>List of label selectors to use to filter results.</div>
@@ -313,25 +311,6 @@ 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>
@@ -518,8 +497,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>The URL to manifest files that can be used to create the resource. Added in version 2.4.0.</div>
-                        <div>Mutually exclusive with <em>template</em> in case of <span class='module'>kubernetes.core.k8s</span> module.</div>
+                        <div>Mutually exclusive with <em>template</em> in case of <span class='module'>k8s</span> module.</div>
                 </td>
             </tr>
             <tr>

docs/kubernetes.core.k8s_service_module.rst

@@ -24,8 +24,8 @@ Requirements
 ------------
 The below requirements are needed on the host that executes this module.
 
-- python >= 3.9
-- kubernetes >= 24.2.0
+- python >= 3.6
+- kubernetes >= 12.0.0
 
 
 Parameters
@@ -220,7 +220,6 @@ Parameters
                 </td>
                 <td>
                         <div>Path to an existing Kubernetes config file. If not provided, and no other connection options are provided, the Kubernetes client will attempt to load the default configuration file from <em>~/.kube/config</em>. Can also be specified via K8S_AUTH_KUBECONFIG environment variable.</div>
-                        <div>Multiple Kubernetes config file can be provided using separator &#x27;;&#x27; for Windows platform or &#x27;:&#x27; for others platforms.</div>
                         <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>
@@ -281,25 +280,6 @@ 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>
@@ -488,8 +468,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>The URL to manifest files that can be used to create the resource. Added in version 2.4.0.</div>
-                        <div>Mutually exclusive with <em>template</em> in case of <span class='module'>kubernetes.core.k8s</span> module.</div>
+                        <div>Mutually exclusive with <em>template</em> in case of <span class='module'>k8s</span> module.</div>
                 </td>
             </tr>
             <tr>

docs/kubernetes.core.k8s_taint_module.rst

@@ -26,8 +26,8 @@ Requirements
 ------------
 The below requirements are needed on the host that executes this module.
 
-- python >= 3.9
-- kubernetes >= 24.2.0
+- python >= 3.6
+- kubernetes >= 12.0.0
 
 
 Parameters
@@ -182,7 +182,6 @@ Parameters
                 </td>
                 <td>
                         <div>Path to an existing Kubernetes config file. If not provided, and no other connection options are provided, the Kubernetes client will attempt to load the default configuration file from <em>~/.kube/config</em>. Can also be specified via K8S_AUTH_KUBECONFIG environment variable.</div>
-                        <div>Multiple Kubernetes config file can be provided using separator &#x27;;&#x27; for Windows platform or &#x27;:&#x27; for others platforms.</div>
                         <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>

docs/kubernetes.core.kubectl_connection.rst

@@ -208,28 +208,6 @@ Parameters
                     </td>
                 <td>
                         <div>Path to a kubectl config file. Defaults to <em>~/.kube/config</em></div>
-                        <div>The configuration can be provided as dictionary. Added in version 2.4.0.</div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>kubectl_local_env_vars</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 3.1.0</div>
-                </td>
-                <td>
-                        <b>Default:</b><br/><div style="color: blue">{}</div>
-                </td>
-                    <td>
-                                <div>var: ansible_kubectl_local_env_vars</div>
-                    </td>
-                <td>
-                        <div>Local enviromantal variable to be passed locally to the kubectl command line.</div>
-                        <div>Please be aware that this passes information directly on the command line and it could expose sensitive data.</div>
                 </td>
             </tr>
             <tr>
@@ -376,7 +354,7 @@ Status
 Authors
 ~~~~~~~
 
-- xuxinkun (@xuxinkun)
+- xuxinkun
 
 
 .. hint::

docs/kubernetes.core.kustomize_lookup.rst

@@ -77,24 +77,6 @@ Parameters
                         <div>If omitted, &#x27;.&#x27; is assumed.</div>
                 </td>
             </tr>
-            <tr>
-                <td colspan="1">
-                    <div class="ansibleOptionAnchor" id="parameter-"></div>
-                    <b>enable_helm</b>
-                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
-                    <div style="font-size: small">
-                        <span style="color: purple">-</span>
-                    </div>
-                </td>
-                <td>
-                        <b>Default:</b><br/><div style="color: blue">"False"</div>
-                </td>
-                    <td>
-                    </td>
-                <td>
-                        <div>Enable the helm chart inflation generator</div>
-                </td>
-            </tr>
             <tr>
                 <td colspan="1">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
@@ -130,21 +112,17 @@ Examples
 .. code-block:: yaml
 
     - name: Run lookup using kustomize
-      ansible.builtin.set_fact:
+      set_fact:
         resources: "{{ lookup('kubernetes.core.kustomize', binary_path='/path/to/kustomize') }}"
 
     - name: Run lookup using kubectl kustomize
-      ansible.builtin.set_fact:
+      set_fact:
         resources: "{{ lookup('kubernetes.core.kustomize', binary_path='/path/to/kubectl') }}"
 
     - name: Create kubernetes resources for lookup output
-      kubernetes.core.k8s:
+      k8s:
         definition: "{{ lookup('kubernetes.core.kustomize', dir='/path/to/kustomization') }}"
 
-    - name: Create kubernetes resources for lookup output with `--enable-helm` set
-      kubernetes.core.k8s:
-        definition: "{{ lookup('kubernetes.core.kustomize', dir='/path/to/kustomization', enable_helm=True) }}"
-
 
 
 Return Values
@@ -155,27 +133,106 @@ Common return values are documented `here <https://docs.ansible.com/ansible/late
 
     <table border=0 cellpadding=0 class="documentation-table">
         <tr>
-            <th colspan="1">Key</th>
+            <th colspan="2">Key</th>
             <th>Returned</th>
             <th width="100%">Description</th>
         </tr>
             <tr>
-                <td colspan="1">
+                <td colspan="2">
                     <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>
+                    </div>
+                </td>
+                <td></td>
+                <td>
+                            <div>One ore more object definitions returned from the tool execution.</div>
+                    <br/>
+                </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></td>
+                <td>success</td>
                 <td>
-                            <div>YAML string for the object definitions returned from the tool execution.</div>
+                            <div>The versioned schema of this representation of an object.</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>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/>
 
@@ -187,7 +244,7 @@ Status
 Authors
 ~~~~~~~
 
-- Aubin Bikouo (@abikouo)
+- Aubin Bikouo <@abikouo>
 
 
 .. hint::

galaxy.yml

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

meta/runtime.yml

@@ -1,5 +1,5 @@
 ---
-requires_ansible: '>=2.14.0'
+requires_ansible: ">=2.9.17"
 
 action_groups:
   helm:
@@ -20,12 +20,6 @@ plugin_routing:
   inventory:
     openshift:
       redirect: community.okd.openshift
-    k8s:
-      deprecation:
-        removal_version: 5.0.0
-        warning_text: >-
-          The k8s inventory plugin has been deprecated and
-          will be removed in release 5.0.0.
   modules:
     k8s_auth:
       redirect: community.okd.k8s_auth
@@ -35,18 +29,18 @@ plugin_routing:
         warning_text: Use kubernetes.core.k8s_info instead.
     k8s_raw:
       tombstone:
-        removal_version: 0.1.0
+        removal_version: "0.1.0"
         warning_text: The k8s_raw module was slated for deprecation in Ansible 2.10 and has been removed. Use kubernetes.core.k8s instead.
     openshift_raw:
       tombstone:
-        removal_version: 0.1.0
+        removal_version: "0.1.0"
         warning_text: The openshift_raw module was slated for deprecation in Ansible 2.10 and has been removed. Use kubernetes.core.k8s instead.
     openshift_scale:
       tombstone:
-        removal_version: 0.1.0
+        removal_version: "0.1.0"
         warning_text: The openshift_scale module was slated for deprecation in Ansible 2.10 and has been removed. Use kubernetes.core.k8s_scale instead.
   lookup:
     openshift:
       tombstone:
-        removal_version: 0.1.0
+        removal_version: "0.1.0"
         warning_text: The openshift lookup plugin was slated for deprecation in Ansible 2.10 and has been removed. Use kubernetes.core.k8s instead.

plugins/action/k8s_info.py

@@ -8,21 +8,21 @@ from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
 import copy
-import os
-import platform
 import traceback
+import os
 from contextlib import contextmanager
+import platform
 
 from ansible.config.manager import ensure_type
 from ansible.errors import (
-    AnsibleAction,
-    AnsibleActionFail,
     AnsibleError,
     AnsibleFileNotFound,
+    AnsibleAction,
+    AnsibleActionFail,
 )
-from ansible.module_utils._text import to_bytes, to_native, to_text
 from ansible.module_utils.parsing.convert_bool import boolean
-from ansible.module_utils.six import iteritems, string_types
+from ansible.module_utils.six import string_types, iteritems
+from ansible.module_utils._text import to_text, to_bytes, to_native
 from ansible.plugins.action import ActionBase
 
 
@@ -55,6 +55,7 @@ ENV_KUBECONFIG_PATH_SEPARATOR = ";" if platform.system() == "Windows" else ":"
 
 
 class ActionModule(ActionBase):
+
     TRANSFERS_FILES = True
     DEFAULT_NEWLINE_SEQUENCE = "\n"
 

plugins/connection/kubectl.py

@@ -72,15 +72,6 @@ DOCUMENTATION = r"""
           - name: ansible_kubectl_extra_args
         env:
           - name: K8S_AUTH_EXTRA_ARGS
-      kubectl_local_env_vars:
-        description:
-          - Local enviromantal variable to be passed locally to the kubectl command line.
-          - Please be aware that this passes information directly on the command line and it could expose sensitive data.
-        default: {}
-        type: dict
-        version_added: 3.1.0
-        vars:
-          - name: ansible_kubectl_local_env_vars
       kubectl_kubeconfig:
         description:
           - Path to a kubectl config file. Defaults to I(~/.kube/config)
@@ -181,18 +172,18 @@ DOCUMENTATION = r"""
         aliases: [ kubectl_verify_ssl ]
 """
 
-import json
 import os
 import os.path
 import shutil
 import subprocess
 import tempfile
+import json
 
-from ansible.errors import AnsibleError, AnsibleFileNotFound
-from ansible.module_utils._text import to_bytes
-from ansible.module_utils.six.moves import shlex_quote
 from ansible.parsing.yaml.loader import AnsibleLoader
-from ansible.plugins.connection import BUFSIZE, ConnectionBase
+from ansible.errors import AnsibleError, AnsibleFileNotFound
+from ansible.module_utils.six.moves import shlex_quote
+from ansible.module_utils._text import to_bytes
+from ansible.plugins.connection import ConnectionBase, BUFSIZE
 from ansible.utils.display import Display
 
 display = Display()
@@ -310,19 +301,6 @@ class Connection(ConnectionBase):
 
         return local_cmd, censored_local_cmd
 
-    def _local_env(self):
-        """Return a dict of local environment variables to pass to the kubectl command"""
-        local_env = {}
-        local_local_env_vars_name = "{0}_local_env_vars".format(self.transport)
-        local_env_vars = self.get_option(local_local_env_vars_name)
-        if local_env_vars:
-            if isinstance(local_env_vars, dict):
-                local_env_vars = json.dumps(local_env_vars)
-            local_env = os.environ.copy()
-            local_env.update(json.loads(local_env_vars))
-            return local_env
-        return None
-
     def _connect(self, port=None):
         """Connect to the container. Nothing to do"""
         super(Connection, self)._connect()
@@ -351,7 +329,6 @@ class Connection(ConnectionBase):
             stdin=subprocess.PIPE,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
-            env=self._local_env(),
         )
 
         stdout, stderr = p.communicate(in_data)
@@ -401,11 +378,7 @@ class Connection(ConnectionBase):
             args = [to_bytes(i, errors="surrogate_or_strict") for i in args]
             try:
                 p = subprocess.Popen(
-                    args,
-                    stdin=in_file,
-                    stdout=subprocess.PIPE,
-                    stderr=subprocess.PIPE,
-                    env=self._local_env(),
+                    args, stdin=in_file, stdout=subprocess.PIPE, stderr=subprocess.PIPE
                 )
             except OSError:
                 raise AnsibleError(
@@ -442,11 +415,7 @@ class Connection(ConnectionBase):
         ) as out_file:
             try:
                 p = subprocess.Popen(
-                    args,
-                    stdin=subprocess.PIPE,
-                    stdout=out_file,
-                    stderr=subprocess.PIPE,
-                    env=self._local_env(),
+                    args, stdin=subprocess.PIPE, stdout=out_file, stderr=subprocess.PIPE
                 )
             except OSError:
                 raise AnsibleError(

plugins/doc_fragments/helm_common_options.py

@@ -12,6 +12,7 @@ __metaclass__ = type
 
 
 class ModuleDocFragment(object):
+
     DOCUMENTATION = r"""
 options:
   binary_path:
@@ -36,12 +37,12 @@ options:
     description:
     - Provide a URL for accessing the API. Can also be specified via C(K8S_AUTH_HOST) environment variable.
     type: str
-    version_added: 1.2.0
+    version_added: "1.2.0"
   api_key:
     description:
     - Token used to authenticate with the API. Can also be specified via C(K8S_AUTH_API_KEY) environment variable.
     type: str
-    version_added: 1.2.0
+    version_added: "1.2.0"
   validate_certs:
     description:
     - Whether or not to verify the API server's SSL certificates. Can also be specified via C(K8S_AUTH_VERIFY_SSL)
@@ -49,12 +50,12 @@ options:
     type: bool
     aliases: [ verify_ssl ]
     default: True
-    version_added: 1.2.0
+    version_added: "1.2.0"
   ca_cert:
     description:
     - 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 C(K8S_AUTH_SSL_CA_CERT) environment variable.
     type: path
     aliases: [ ssl_ca_cert ]
-    version_added: 1.2.0
+    version_added: "1.2.0"
 """

plugins/doc_fragments/k8s_auth_options.py

@@ -11,6 +11,7 @@ __metaclass__ = type
 
 
 class ModuleDocFragment(object):
+
     DOCUMENTATION = r"""
 options:
   host:

plugins/doc_fragments/k8s_delete_options.py

@@ -11,11 +11,12 @@ __metaclass__ = type
 
 
 class ModuleDocFragment(object):
+
     DOCUMENTATION = r"""
 options:
   delete_options:
     type: dict
-    version_added: 1.2.0
+    version_added: '1.2.0'
     description:
     - Configure behavior when deleting an object.
     - Only used when I(state=absent).

plugins/doc_fragments/k8s_name_options.py

@@ -11,6 +11,7 @@ __metaclass__ = type
 
 
 class ModuleDocFragment(object):
+
     DOCUMENTATION = r"""
 options:
   api_version:

plugins/doc_fragments/k8s_resource_options.py

@@ -11,6 +11,7 @@ __metaclass__ = type
 
 
 class ModuleDocFragment(object):
+
     DOCUMENTATION = r"""
 options:
   resource_definition:

plugins/doc_fragments/k8s_scale_options.py

@@ -11,6 +11,7 @@ __metaclass__ = type
 
 
 class ModuleDocFragment(object):
+
     DOCUMENTATION = r"""
 options:
   replicas:

plugins/doc_fragments/k8s_state_options.py

@@ -11,6 +11,7 @@ __metaclass__ = type
 
 
 class ModuleDocFragment(object):
+
     DOCUMENTATION = r"""
 options:
   state:

plugins/doc_fragments/k8s_wait_options.py

@@ -11,6 +11,7 @@ __metaclass__ = type
 
 
 class ModuleDocFragment(object):
+
     DOCUMENTATION = r"""
 options:
   wait:

plugins/filter/k8s.py

@@ -1,12 +1,50 @@
 # Copyright (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import absolute_import, division, print_function
 
 __metaclass__ = type
 
 
+DOCUMENTATION = r"""
+
+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 = r"""
+# 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 = r"""
+  _value:
+    description: Generated resource name.
+    type: str
+"""
+
+
 from ansible.errors import AnsibleFilterError
 from ansible_collections.kubernetes.core.plugins.module_utils.hashes import (
     generate_hash,

plugins/inventory/k8s.py

@@ -19,13 +19,6 @@ DOCUMENTATION = """
       - Uses the kubectl connection plugin to access the Kubernetes cluster.
       - Uses k8s.(yml|yaml) YAML configuration file to set parameter values.
 
-    deprecated:
-      removed_in: 5.0.0
-      why: |
-        As discussed in U(https://github.com/ansible-collections/kubernetes.core/issues/31), we decided to
-        remove the k8s inventory plugin in release 5.0.0.
-      alternative: "Use M(kubernetes.core.k8s_info) and M(ansible.builtin.add_host) instead."
-
     options:
       plugin:
          description: token that ensures this is a source file for the 'k8s' plugin.
@@ -34,7 +27,7 @@ DOCUMENTATION = """
       connections:
           description:
           - Optional list of cluster connection settings. If no connections are provided, the default
-            I(~/.kube/config) and active context will be used, and objects will be returned for all namespaces
+            '~/.kube/config' and active context will be used, and objects will be returned for all namespaces
             the active user is authorized to access.
           suboptions:
               name:
@@ -45,7 +38,7 @@ DOCUMENTATION = """
                   description:
                   - Path to an existing Kubernetes config file. If not provided, and no other connection
                     options are provided, the Kubernetes client will attempt to load the default
-                    configuration file from I(~/.kube/config). Can also be specified via K8S_AUTH_KUBECONFIG
+                    configuration file from '~/.kube/config'. Can also be specified via K8S_AUTH_KUBECONFIG
                     environment variable.
               context:
                   description:
@@ -93,12 +86,12 @@ DOCUMENTATION = """
                     to access.
 
     requirements:
-    - "python >= 3.9"
-    - "kubernetes >= 24.2.0"
+    - "python >= 3.6"
+    - "kubernetes >= 12.0.0"
     - "PyYAML >= 3.11"
 """
 
-EXAMPLES = r"""
+EXAMPLES = """
 # File must be named k8s.yaml or k8s.yml
 
 - name: Authenticate with token, and return all pods and services for all namespaces
@@ -124,19 +117,19 @@ EXAMPLES = r"""
 import json
 
 from ansible.errors import AnsibleError
-from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable, Constructable
-
-try:
-    from kubernetes.dynamic.exceptions import DynamicApiError
-
-    HAS_K8S_MODULE_HELPER = True
-    k8s_import_exception = None
-except ImportError as e:
-    HAS_K8S_MODULE_HELPER = False
-    k8s_import_exception = e
+from ansible_collections.kubernetes.core.plugins.module_utils.common import (
+    HAS_K8S_MODULE_HELPER,
+    k8s_import_exception,
+)
 from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
     get_api_client,
 )
+from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable
+
+try:
+    from kubernetes.dynamic.exceptions import DynamicApiError
+except ImportError:
+    pass
 
 
 def format_dynamic_api_exc(exc):
@@ -162,12 +155,6 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
 
     def parse(self, inventory, loader, path, cache=True):
         super(InventoryModule, self).parse(inventory, loader, path)
-
-        self.display.deprecated(
-            "The 'k8s' inventory plugin has been deprecated and will be removed in release 5.0.0",
-            version="5.0.0",
-            collection_name="kubernetes.core",
-        )
         cache_key = self._get_cache_prefix(path)
         config_data = self._read_config_data(path)
         self.setup(config_data, cache, cache_key)
@@ -193,6 +180,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
             self.fetch_objects(connections)
 
     def fetch_objects(self, connections):
+
         if connections:
             if not isinstance(connections, list):
                 raise K8sInventoryException("Expecting connections to be a list.")

plugins/lookup/k8s.py

@@ -114,8 +114,8 @@ DOCUMENTATION = """
         aliases: [ verify_ssl ]
 
     requirements:
-      - "python >= 3.9"
-      - "kubernetes >= 24.2.0"
+      - "python >= 3.6"
+      - "kubernetes >= 12.0.0"
       - "PyYAML >= 3.11"
 """
 
@@ -179,6 +179,7 @@ import os
 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 (
     get_api_client,
 )
@@ -213,6 +214,7 @@ except ImportError as e:
 
 class KubernetesLookup(object):
     def __init__(self):
+
         if not HAS_K8S_MODULE_HELPER:
             raise Exception(
                 "Requires the Kubernetes Python client. Try `pip install kubernetes`. Detail: {0}".format(

plugins/lookup/kustomize.py

@@ -8,7 +8,7 @@ DOCUMENTATION = """
 
     short_description: Build a set of kubernetes resources using a 'kustomization.yaml' file.
 
-    version_added: 2.2.0
+    version_added: "2.2.0"
 
     author:
       - Aubin Bikouo (@abikouo)
@@ -30,10 +30,6 @@ DOCUMENTATION = """
       opt_dirs:
         description:
         - An optional list of directories to search for the executable in addition to PATH.
-      enable_helm:
-        description:
-        - Enable the helm chart inflation generator
-        default: "False"
 
     requirements:
       - "python >= 3.6"
@@ -41,20 +37,16 @@ DOCUMENTATION = """
 
 EXAMPLES = """
 - name: Run lookup using kustomize
-  ansible.builtin.set_fact:
+  set_fact:
     resources: "{{ lookup('kubernetes.core.kustomize', binary_path='/path/to/kustomize') }}"
 
 - name: Run lookup using kubectl kustomize
-  ansible.builtin.set_fact:
+  set_fact:
     resources: "{{ lookup('kubernetes.core.kustomize', binary_path='/path/to/kubectl') }}"
 
 - name: Create kubernetes resources for lookup output
-  kubernetes.core.k8s:
+  k8s:
     definition: "{{ lookup('kubernetes.core.kustomize', dir='/path/to/kustomization') }}"
-
-- name: Create kubernetes resources for lookup output with `--enable-helm` set
-  kubernetes.core.k8s:
-    definition: "{{ lookup('kubernetes.core.kustomize', dir='/path/to/kustomization', enable_helm=True) }}"
 """
 
 RETURN = """
@@ -72,11 +64,12 @@ RETURN = """
         key1: val1
 """
 
-import subprocess
-
 from ansible.errors import AnsibleLookupError
-from ansible.module_utils.common.process import get_bin_path
 from ansible.plugins.lookup import LookupBase
+from ansible.module_utils.common.process import get_bin_path
+
+
+import subprocess
 
 
 def get_binary_from_path(name, opt_dirs=None):
@@ -99,14 +92,7 @@ def run_command(command):
 
 class LookupModule(LookupBase):
     def run(
-        self,
-        terms,
-        variables=None,
-        dir=".",
-        binary_path=None,
-        opt_dirs=None,
-        enable_helm=False,
-        **kwargs
+        self, terms, variables=None, dir=".", binary_path=None, opt_dirs=None, **kwargs
     ):
         executable_path = binary_path
         if executable_path is None:
@@ -137,9 +123,6 @@ class LookupModule(LookupBase):
                 )
             )
 
-        if enable_helm:
-            command += ["--enable-helm"]
-
         (out, err) = run_command(command)
         if err:
             raise AnsibleLookupError(

plugins/module_utils/ansiblemodule.py

@@ -14,9 +14,9 @@ except TypeError:
 
 if enable_turbo_mode:
     try:
-        from ansible_collections.cloud.common.plugins.module_utils.turbo.module import (  # noqa: F401
+        from ansible_collections.cloud.common.plugins.module_utils.turbo.module import (
             AnsibleTurboModule as AnsibleModule,
-        )
+        )  # noqa: F401
 
         AnsibleModule.collection_name = "kubernetes.core"
     except ImportError:

plugins/module_utils/apply.py

@@ -17,8 +17,8 @@ from __future__ import absolute_import, division, print_function
 
 __metaclass__ = type
 
-import json
 from collections import OrderedDict
+import json
 
 from ansible.module_utils.common.dict_transformations import dict_merge
 from ansible_collections.kubernetes.core.plugins.module_utils.exceptions import (
@@ -31,6 +31,7 @@ from ansible_collections.kubernetes.core.plugins.module_utils.version import (
     LooseVersion,
 )
 
+
 try:
     from kubernetes.dynamic.exceptions import NotFoundError
 except ImportError:
@@ -149,7 +150,6 @@ def k8s_apply(resource, definition, **kwargs):
             force_conflicts=kwargs.get("force_conflicts"),
             field_manager=kwargs.get("field_manager"),
             dry_run=kwargs.get("dry_run"),
-            serialize=kwargs.get("serialize"),
         )
     if not existing:
         return resource.create(
@@ -159,7 +159,6 @@ def k8s_apply(resource, definition, **kwargs):
         return resource.get(
             name=definition["metadata"]["name"],
             namespace=definition["metadata"].get("namespace"),
-            **kwargs
         )
     return resource.patch(
         body=desired,

plugins/module_utils/client/discovery.py

@@ -13,18 +13,15 @@
 # limitations under the License.
 
 
-import hashlib
 import json
 import os
-import tempfile
 from collections import defaultdict
+import hashlib
+import tempfile
 from functools import partial
 
 import kubernetes.dynamic
 import kubernetes.dynamic.discovery
-from ansible_collections.kubernetes.core.plugins.module_utils.client.resource import (
-    ResourceList,
-)
 from kubernetes import __version__
 from kubernetes.dynamic.exceptions import (
     ResourceNotFoundError,
@@ -32,6 +29,10 @@ from kubernetes.dynamic.exceptions import (
     ServiceUnavailableError,
 )
 
+from ansible_collections.kubernetes.core.plugins.module_utils.client.resource import (
+    ResourceList,
+)
+
 
 class Discoverer(kubernetes.dynamic.discovery.Discoverer):
     def __init__(self, client, cache_file):
@@ -113,7 +114,7 @@ class Discoverer(kubernetes.dynamic.discovery.Discoverer):
             filter(lambda resource: "/" in resource["name"], resources_response)
         )
         for subresource in subresources_raw:
-            resource, name = subresource["name"].split("/", 1)
+            resource, name = subresource["name"].split("/")
             subresources[resource][name] = subresource
 
         for resource in resources_raw:

plugins/module_utils/copy.py

@@ -18,26 +18,25 @@ from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
 import os
-import tarfile
-from abc import ABCMeta, abstractmethod
+from tempfile import TemporaryFile, NamedTemporaryFile
 from select import select
-from tempfile import NamedTemporaryFile, TemporaryFile
-
-from ansible.module_utils._text import to_native
+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:
     from kubernetes.client.api import core_v1_api
     from kubernetes.stream import stream
     from kubernetes.stream.ws_client import (
-        ABNF,
-        ERROR_CHANNEL,
-        STDERR_CHANNEL,
         STDOUT_CHANNEL,
+        STDERR_CHANNEL,
+        ERROR_CHANNEL,
+        ABNF,
     )
 except ImportError:
     pass

plugins/module_utils/hashes.py

@@ -19,8 +19,8 @@ from __future__ import absolute_import, division, print_function
 
 __metaclass__ = type
 
-import hashlib
 import json
+import hashlib
 
 try:
     import string
@@ -37,7 +37,7 @@ except ImportError:
 
 def sorted_dict(unsorted_dict):
     result = OrderedDict()
-    for k, v in sorted(unsorted_dict.items()):
+    for (k, v) in sorted(unsorted_dict.items()):
         if isinstance(v, dict):
             v = sorted_dict(v)
         result[k] = v

plugins/module_utils/helm.py

@@ -7,18 +7,19 @@ from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
 
-import copy
-import json
 import os
-import re
 import tempfile
 import traceback
+import re
+import json
+import copy
 
-from ansible.module_utils.basic import AnsibleModule, missing_required_lib
+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
@@ -83,6 +84,7 @@ class AnsibleHelmModule(object):
     """
 
     def __init__(self, **kwargs):
+
         self._module = None
         if "module" in kwargs:
             self._module = kwargs.get("module")
@@ -115,7 +117,7 @@ class AnsibleHelmModule(object):
         kubeconfig = self.params.get("kubeconfig")
         if kubeconfig:
             if isinstance(kubeconfig, string_types):
-                with open(os.path.expanduser(kubeconfig)) as fd:
+                with open(kubeconfig) as fd:
                     kubeconfig_content = yaml.safe_load(fd)
             elif isinstance(kubeconfig, dict):
                 kubeconfig_content = kubeconfig
@@ -182,6 +184,7 @@ class AnsibleHelmModule(object):
         )
 
     def get_helm_version(self):
+
         command = self.get_helm_binary() + " version"
         rc, out, err = self.run_command(command)
         m = re.match(r'version.BuildInfo{Version:"v([0-9\.]*)",', out)
@@ -213,6 +216,7 @@ class AnsibleHelmModule(object):
         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)
 
@@ -224,6 +228,7 @@ class AnsibleHelmModule(object):
             )
 
     def get_manifest(self, release_name):
+
         command = [
             self.get_helm_binary(),
             "get",
@@ -236,6 +241,7 @@ class AnsibleHelmModule(object):
         return self.parse_yaml_content(out)
 
     def get_notes(self, release_name):
+
         command = [
             self.get_helm_binary(),
             "get",

plugins/module_utils/k8s/client.py

@@ -1,11 +1,12 @@
 # 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 hashlib
 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,

plugins/module_utils/k8s/core.py

@@ -1,12 +1,15 @@
 import traceback
+
 from typing import Optional
 
-from ansible.module_utils.basic import AnsibleModule, missing_required_lib
-from ansible.module_utils.common.text.converters import to_text
 from ansible_collections.kubernetes.core.plugins.module_utils.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.
@@ -35,7 +38,7 @@ class AnsibleK8SModule:
 
         if self.settings["check_k8s"]:
             self.requires("kubernetes")
-            self.has_at_least("kubernetes", "24.2.0", warn=True)
+            self.has_at_least("kubernetes", "12.0.0", warn=True)
 
         if self.settings["check_pyyaml"]:
             self.requires("pyyaml")

plugins/module_utils/k8s/resource.py

@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 import os
-from typing import Dict, Iterable, List, Optional, Union, cast
+from typing import cast, Dict, Iterable, List, Optional, Union
 
 from ansible.module_utils.six import string_types
 from ansible.module_utils.urls import Request

plugins/module_utils/k8s/runner.py

@@ -4,12 +4,12 @@
 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,
-    ResourceTimeout,
 )
 from ansible_collections.kubernetes.core.plugins.module_utils.k8s.resource import (
     create_definitions,
@@ -17,7 +17,9 @@ from ansible_collections.kubernetes.core.plugins.module_utils.k8s.resource impor
 from ansible_collections.kubernetes.core.plugins.module_utils.k8s.service import (
     K8sService,
     diff_objects,
-    hide_fields,
+)
+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 (
@@ -44,51 +46,16 @@ def validate(client, module, resource):
     return [_prepend_resource_info(resource, msg) for msg in warnings + errors]
 
 
-def get_definitions(svc, params):
-    try:
-        definitions = create_definitions(params)
-    except Exception as e:
-        msg = "Failed to load resource definition: {0}".format(e)
-        raise CoreException(msg) from e
-
-    delete_all = params.get("delete_all")
-    src = params.get("src")
-    resource_definition = params.get("resource_definition")
-    name = params.get("name")
-    state = params.get("state")
-
-    if (
-        delete_all
-        and state == "absent"
-        and name is None
-        and resource_definition is None
-        and src is None
-    ):
-        # Delete all resources in the namespace for the specified resource type
-        if params.get("kind") is None:
-            raise CoreException(
-                "'kind' option is required to specify the resource type."
-            )
-
-        resource = svc.find_resource(
-            params.get("kind"), params.get("api_version"), fail=True
-        )
-        definitions = svc.retrieve_all(
-            resource,
-            params.get("namespace"),
-            params.get("label_selectors"),
-        )
-
-    return definitions
-
-
 def run_module(module) -> None:
     results = []
     changed = False
     client = get_api_client(module)
     svc = K8sService(client, module)
-
-    definitions = get_definitions(svc, module.params)
+    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": {}}
@@ -135,11 +102,9 @@ def perform_action(svc, definition: Dict, params: Dict) -> Dict:
     state = params.get("state", None)
     kind = definition.get("kind")
     api_version = definition.get("apiVersion")
-    hidden_fields = params.get("hidden_fields")
 
     result = {"changed": False, "result": {}}
     instance = {}
-    warnings = []
 
     resource = svc.find_resource(kind, api_version, fail=True)
     definition["kind"] = resource.kind
@@ -173,7 +138,7 @@ def perform_action(svc, definition: Dict, params: Dict) -> Dict:
                 return result
 
         if params.get("apply"):
-            instance, warnings = svc.apply(resource, definition, existing)
+            instance = svc.apply(resource, definition, existing)
             result["method"] = "apply"
         elif not existing:
             if state == "patched":
@@ -184,19 +149,16 @@ def perform_action(svc, definition: Dict, params: Dict) -> Dict:
                     )
                 )
                 return result
-            instance, warnings = svc.create(resource, definition)
+            instance = svc.create(resource, definition)
             result["method"] = "create"
             result["changed"] = True
         elif params.get("force", False):
-            instance, warnings = svc.replace(resource, definition, existing)
+            instance = svc.replace(resource, definition, existing)
             result["method"] = "replace"
         else:
-            instance, warnings = svc.update(resource, definition, existing)
+            instance = svc.update(resource, definition, existing)
             result["method"] = "update"
 
-    if warnings:
-        result["warnings"] = warnings
-
     # If needed, wait and/or create diff
     success = True
 
@@ -215,7 +177,7 @@ def perform_action(svc, definition: Dict, params: Dict) -> Dict:
             existing = existing.to_dict()
         else:
             existing = {}
-        match, diffs = diff_objects(existing, instance, hidden_fields)
+        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 "
@@ -225,7 +187,7 @@ def perform_action(svc, definition: Dict, params: Dict) -> Dict:
         if svc.module._diff:
             result["diff"] = diffs
 
-    result["result"] = hide_fields(instance, hidden_fields)
+    result["result"] = instance
     if not success:
         raise ResourceTimeout(
             '"{0}" "{1}": Timed out waiting on resource'.format(

plugins/module_utils/k8s/service.py

@@ -1,35 +1,38 @@
 # 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 copy
-from json import loads
-from re import compile
 from typing import Any, Dict, List, Optional, Tuple
 
-from ansible.module_utils.common.dict_transformations import dict_merge
 from ansible_collections.kubernetes.core.plugins.module_utils.hashes import (
     generate_hash,
 )
-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_collections.kubernetes.core.plugins.module_utils.k8s.waiter import (
     Waiter,
     exists,
-    get_waiter,
     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 (
-        BadRequestError,
-        ConflictError,
-        ForbiddenError,
-        MethodNotAllowedError,
         NotFoundError,
         ResourceNotFoundError,
         ResourceNotUniqueError,
+        ConflictError,
+        ForbiddenError,
+        MethodNotAllowedError,
+        BadRequestError,
     )
 except ImportError:
     # Handled in module setup
@@ -144,12 +147,18 @@ class K8sService:
         name: str,
         namespace: str,
         merge_type: str = None,
-    ) -> Tuple[Dict, List[str]]:
+    ) -> Dict:
+        if merge_type == "json":
+            self.module.deprecate(
+                msg="json as a merge_type value is deprecated. Please use the k8s_json_patch module instead.",
+                version="3.0.0",
+                collection_name="kubernetes.core",
+            )
         try:
-            params = dict(name=name, namespace=namespace, serialize=False)
+            params = dict(name=name, namespace=namespace)
             if merge_type:
                 params["content_type"] = "application/{0}-patch+json".format(merge_type)
-            return decode_response(self.client.patch(resource, definition, **params))
+            return self.client.patch(resource, definition, **params).to_dict()
         except Exception as e:
             reason = e.body if hasattr(e, "body") else e
             msg = "Failed to patch object: {0}".format(reason)
@@ -202,30 +211,6 @@ class K8sService:
 
         return existing
 
-    def retrieve_all(
-        self, resource: Resource, namespace: str, label_selectors: List[str] = None
-    ) -> List[Dict]:
-        definitions: List[ResourceInstance] = []
-
-        try:
-            params = dict(namespace=namespace)
-            if label_selectors:
-                params["label_selector"] = ",".join(label_selectors)
-            resource_list = self.client.get(resource, **params)
-            for item in resource_list.items:
-                existing = self.client.get(
-                    resource, name=item.metadata.name, namespace=namespace
-                )
-                definitions.append(existing.to_dict())
-        except (NotFoundError, MethodNotAllowedError):
-            pass
-        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 definitions
-
     def find(
         self,
         kind: str,
@@ -239,7 +224,6 @@ class K8sService:
         wait_timeout: Optional[int] = 120,
         state: Optional[str] = "present",
         condition: Optional[Dict] = None,
-        hidden_fields: Optional[List] = None,
     ) -> Dict:
         resource = self.find_resource(kind, api_version)
         api_found = bool(resource)
@@ -302,9 +286,7 @@ class K8sService:
         instances = resources.get("items") or [resources]
 
         if not wait:
-            result["resources"] = [
-                hide_fields(instance, hidden_fields) for instance in instances
-            ]
+            result["resources"] = instances
             return result
 
         # Now wait for the specified state of any resource instances we have found.
@@ -323,22 +305,20 @@ class K8sService:
                     "Failed to gather information about %s(s) even"
                     " after waiting for %s seconds" % (res.get("kind"), duration)
                 )
-            result["resources"].append(hide_fields(res, hidden_fields))
+            result["resources"].append(res)
         return result
 
-    def create(self, resource: Resource, definition: Dict) -> Tuple[Dict, List[str]]:
+    def create(self, resource: Resource, definition: Dict) -> Dict:
         namespace = definition["metadata"].get("namespace")
         name = definition["metadata"].get("name")
 
         if self._client_side_dry_run:
-            return _encode_stringdata(definition), []
-
+            k8s_obj = _encode_stringdata(definition)
+        else:
             try:
-            return decode_response(
-                self.client.create(
-                    resource, definition, namespace=namespace, serialize=False
-                )
-            )
+                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
@@ -349,101 +329,102 @@ class K8sService:
                         name
                     )
                 )
-            return dict(), []
+                return dict()
             except Exception as e:
                 reason = e.body if hasattr(e, "body") else e
                 msg = "Failed to create object: {0}".format(reason)
                 raise CoreException(msg) from e
+        return k8s_obj
 
     def apply(
         self,
         resource: Resource,
         definition: Dict,
         existing: Optional[ResourceInstance] = None,
-    ) -> Tuple[Dict, List[str]]:
+    ) -> Dict:
         namespace = definition["metadata"].get("namespace")
 
         server_side_apply = self.module.params.get("server_side_apply")
         if server_side_apply:
             requires("kubernetes", "19.15.0", reason="to use server side apply")
-
         if self._client_side_dry_run:
             ignored, patch = apply_object(resource, _encode_stringdata(definition))
             if existing:
-                return dict_merge(existing.to_dict(), patch), []
+                k8s_obj = dict_merge(existing.to_dict(), patch)
+            else:
+                k8s_obj = patch
         else:
-                return patch, []
-
             try:
                 params = {}
                 if server_side_apply:
                     params["server_side"] = True
                     params.update(server_side_apply)
-            return decode_response(
-                self.client.apply(
-                    resource, definition, namespace=namespace, serialize=False, **params
-                )
-            )
+                k8s_obj = self.client.apply(
+                    resource, definition, namespace=namespace, **params
+                ).to_dict()
             except Exception as e:
                 reason = e.body if hasattr(e, "body") else e
                 msg = "Failed to apply object: {0}".format(reason)
                 raise CoreException(msg) from e
+        return k8s_obj
 
     def replace(
         self,
         resource: Resource,
         definition: Dict,
         existing: ResourceInstance,
-    ) -> Tuple[Dict, List[str]]:
+    ) -> Dict:
         append_hash = self.module.params.get("append_hash", False)
         name = definition["metadata"].get("name")
         namespace = definition["metadata"].get("namespace")
 
         if self._client_side_dry_run:
-            return _encode_stringdata(definition), []
-
+            k8s_obj = _encode_stringdata(definition)
+        else:
             try:
-            return decode_response(
-                self.client.replace(
+                k8s_obj = self.client.replace(
                     resource,
                     definition,
                     name=name,
                     namespace=namespace,
                     append_hash=append_hash,
-                    serialize=False,
-                )
-            )
+                ).to_dict()
             except Exception as e:
                 reason = e.body if hasattr(e, "body") else e
                 msg = "Failed to replace object: {0}".format(reason)
                 raise CoreException(msg) from e
+        return k8s_obj
 
     def update(
         self, resource: Resource, definition: Dict, existing: ResourceInstance
-    ) -> Tuple[Dict, List[str]]:
+    ) -> Dict:
         name = definition["metadata"].get("name")
         namespace = definition["metadata"].get("namespace")
 
         if self._client_side_dry_run:
-            return dict_merge(existing.to_dict(), _encode_stringdata(definition)), []
-
+            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:
-                return self.patch_resource(
+                    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,
@@ -490,9 +471,7 @@ class K8sService:
         return k8s_obj
 
 
-def diff_objects(
-    existing: Dict, new: Dict, hidden_fields: Optional[list] = None
-) -> Tuple[bool, Dict]:
+def diff_objects(existing: Dict, new: Dict) -> Tuple[bool, Dict]:
     result = {}
     diff = recursive_diff(existing, new)
     if not diff:
@@ -514,109 +493,4 @@ def diff_objects(
     if not set(result["before"]["metadata"].keys()).issubset(ignored_keys):
         return False, result
 
-    result["before"] = hide_fields(result["before"], hidden_fields)
-    result["after"] = hide_fields(result["after"], hidden_fields)
-
     return True, result
-
-
-def hide_fields(definition: dict, hidden_fields: Optional[list]) -> dict:
-    if not hidden_fields:
-        return definition
-    result = copy.deepcopy(definition)
-    for hidden_field in hidden_fields:
-        result = hide_field(result, hidden_field)
-    return result
-
-
-# hide_field is not hugely sophisticated and designed to cope
-# with e.g. status or metadata.managedFields rather than e.g.
-# spec.template.spec.containers[0].env[3].value
-def hide_field(definition: dict, hidden_field: str) -> dict:
-    split = hidden_field.split(".", 1)
-    if split[0] in definition:
-        if len(split) == 2:
-            definition[split[0]] = hide_field(definition[split[0]], split[1])
-        else:
-            del definition[split[0]]
-    return definition
-
-
-def decode_response(resp) -> Tuple[Dict, List[str]]:
-    """
-    This function decodes unserialized responses from the Kubernetes python
-    client and decodes the RFC2616 14.46 warnings found in the response
-    headers.
-    """
-    obj = ResourceInstance(None, loads(resp.data.decode("utf8"))).to_dict()
-    warnings = []
-    if (
-        resp.headers is not None
-        and "warning" in resp.headers
-        and resp.headers["warning"] is not None
-    ):
-        warnings = resp.headers["warning"].split(", ")
-    return obj, decode_warnings(warnings)
-
-
-def decode_warnings(warnings: str) -> List[str]:
-    """
-    This function decodes RFC2616 14.46 warnings in a simplified way, where
-    only the warn-texts are returned in a list.
-    """
-    p = compile('\\d{3} .+ (".+")')
-
-    decoded = []
-    for warning in warnings:
-        m = p.match(warning)
-        if m:
-            try:
-                parsed, unused = parse_quoted_string(m.group(1))
-                decoded.append(parsed)
-            except ValueError:
-                continue
-
-    return decoded
-
-
-def parse_quoted_string(quoted_string: str) -> Tuple[str, str]:
-    """
-    This function was adapted from:
-    https://github.com/kubernetes/apimachinery/blob/bb8822152cabfb4f34dbc26270f874ce53db50de/pkg/util/net/http.go#L609
-    """
-    if len(quoted_string) == 0:
-        raise ValueError("invalid quoted string: 0-length")
-
-    if quoted_string[0] != '"':
-        raise ValueError("invalid quoted string: missing initial quote")
-
-    quoted_string = quoted_string[1:]
-    remainder = ""
-    escaping = False
-    closed_quote = False
-    result = []
-
-    for i, b in enumerate(quoted_string):
-        if b == '"':
-            if escaping:
-                result.append(b)
-                escaping = False
-            else:
-                closed_quote = True
-                remainder_start = i + 1
-                remainder = quoted_string[remainder_start:].strip()
-                break
-        elif b == "\\":
-            if escaping:
-                result.append(b)
-                escaping = False
-            else:
-                escaping = True
-        else:
-            result.append(b)
-            escaping = False
-
-    if not closed_quote:
-        raise ValueError("invalid quoted string: missing closing quote")
-
-    return "".join(result), remainder

plugins/module_utils/k8s/waiter.py

@@ -3,6 +3,7 @@ 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,
 )
@@ -60,13 +61,6 @@ def daemonset_ready(daemonset: ResourceInstance) -> bool:
 
 
 def statefulset_ready(statefulset: ResourceInstance) -> bool:
-    if statefulset.spec.updateStrategy.type == "OnDelete":
-        return bool(
-            statefulset.status
-            and statefulset.status.observedGeneration
-            == (statefulset.metadata.generation or 0)
-            and statefulset.status.replicas == statefulset.spec.replicas
-        )
     # These may be None
     updated_replicas = statefulset.status.updatedReplicas or 0
     ready_replicas = statefulset.status.readyReplicas or 0

plugins/module_utils/k8sdynamicclient.py

@@ -18,11 +18,12 @@ from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
 
+from kubernetes.dynamic import DynamicClient
+
 from ansible_collections.kubernetes.core.plugins.module_utils.apply import k8s_apply
 from ansible_collections.kubernetes.core.plugins.module_utils.exceptions import (
     ApplyException,
 )
-from kubernetes.dynamic import DynamicClient
 
 
 class K8SDynamicClient(DynamicClient):

plugins/module_utils/selector.py

@@ -16,6 +16,7 @@ import re
 
 
 class Selector(object):
+
     equality_based_operators = ("==", "!=", "=")
 
     def __init__(self, data):

plugins/modules/helm.py

@@ -14,7 +14,7 @@ module: helm
 
 short_description: Manages Kubernetes packages with the Helm package manager
 
-version_added: 0.11.0
+version_added: "0.11.0"
 
 author:
   - Lucas Boisserie (@LucasBoisserie)
@@ -61,7 +61,7 @@ options:
     default: false
     type: bool
     aliases: [ dep_up ]
-    version_added: 2.4.0
+    version_added: "2.4.0"
   release_name:
     description:
       - Release name to manage.
@@ -99,7 +99,7 @@ options:
     default: []
     type: list
     elements: str
-    version_added: 1.1.0
+    version_added: '1.1.0'
   update_repo_cache:
     description:
       - Run C(helm repo update) before the operation. Can be run as part of the package installation or as a separate step (see Examples).
@@ -129,22 +129,7 @@ options:
           - string
           - json
           - file
-    version_added: 2.4.0
-  reuse_values:
-    description:
-      - When upgrading package, specifies wether to reuse the last release's values and merge in any overrides from parameters I(release_values),
-        I(values_files) or I(set_values).
-      - If I(reset_values) is set to C(True), this is ignored.
-    type: bool
-    required: false
-    version_added: 2.5.0
-  reset_values:
-    description:
-      - When upgrading package, reset the values to the ones built into the chart.
-    type: bool
-    required: false
-    default: True
-    version_added: 2.5.0
+    version_added: '2.4.0'
 
 #Helm options
   disable_hook:
@@ -181,7 +166,7 @@ options:
       - similar to C(wait_timeout) but does not required C(wait) to be activated.
       - Mutually exclusive with C(wait_timeout).
     type: str
-    version_added: 2.3.0
+    version_added: "2.3.0"
   atomic:
     description:
       - If set, the installation process deletes the installation on failure.
@@ -192,12 +177,12 @@ options:
       - Create the release namespace if not present.
     type: bool
     default: False
-    version_added: 0.11.1
+    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
+    version_added: "2.4.0"
   replace:
     description:
       - Reuse the given name, only if that name is a deleted release which remains in the history.
@@ -205,19 +190,19 @@ options:
       - mutually exclusive with with C(history_max).
     type: bool
     default: False
-    version_added: 1.11.0
+    version_added: "1.11.0"
   skip_crds:
     description:
       - Skip custom resource definitions when installing or upgrading.
     type: bool
     default: False
-    version_added: 1.2.0
+    version_added: "1.2.0"
   history_max:
     description:
       - Limit the maximum number of revisions saved per release.
       - mutually exclusive with with C(replace).
     type: int
-    version_added: 2.2.0
+    version_added: "2.2.0"
 extends_documentation_fragment:
   - kubernetes.core.helm_common_options
 """
@@ -325,17 +310,6 @@ EXAMPLES = r"""
         enabled: True
       logging:
         enabled: True
-
-# Deploy latest version
-- name: Deploy latest version of Grafana chart using reuse_values
-  kubernetes.core.helm:
-    name: test
-    chart_ref: stable/grafana
-    release_namespace: monitoring
-    reuse_values: true
-    values:
-      replicas: 2
-      version: 3e8ec0b2dffa40fb97d5342e4af887de95faa8c61a62480dd7f8aa03dffcf533
 """
 
 RETURN = r"""
@@ -393,11 +367,10 @@ command:
   sample: helm upgrade ...
 """
 
-import copy
 import re
 import tempfile
 import traceback
-
+import copy
 from ansible_collections.kubernetes.core.plugins.module_utils.version import (
     LooseVersion,
 )
@@ -433,20 +406,14 @@ def get_release(state, release_name):
     return None
 
 
-def get_release_status(module, release_name, all_status=False):
+def get_release_status(module, release_name):
     """
-    Get Release state from all release status (deployed, failed, pending-install, etc)
+    Get Release state from deployed release
     """
 
-    list_command = [
-        module.get_helm_binary(),
-        "list",
-        "--output=yaml",
-        "--filter",
-        release_name,
-    ]
-    if all_status:
-        list_command.append("--all")
+    list_command = (
+        module.get_helm_binary() + " list --output=yaml --filter " + release_name
+    )
 
     rc, out, err = module.run_helm_command(list_command)
 
@@ -472,7 +439,7 @@ def run_dep_update(module, chart_ref):
     """
     Run dependency update
     """
-    dep_update = module.get_helm_binary() + f" dependency update '{chart_ref}'"
+    dep_update = module.get_helm_binary() + " dependency update " + chart_ref
     rc, out, err = module.run_helm_command(dep_update)
 
 
@@ -480,7 +447,7 @@ def fetch_chart_info(module, command, chart_ref):
     """
     Get chart info
     """
-    inspect_command = command + f" show chart '{chart_ref}'"
+    inspect_command = command + " show chart " + chart_ref
 
     rc, out, err = module.run_helm_command(inspect_command)
 
@@ -488,7 +455,6 @@ def fetch_chart_info(module, command, chart_ref):
 
 
 def deploy(
-    module,
     command,
     release_name,
     release_values,
@@ -507,8 +473,6 @@ def deploy(
     timeout=None,
     dependency_update=None,
     set_value_args=None,
-    reuse_values=None,
-    reset_values=True,
 ):
     """
     Install/upgrade/rollback release chart
@@ -520,11 +484,9 @@ def deploy(
             deploy_command += " --dependency-update"
     else:
         deploy_command = command + " upgrade -i"  # install/upgrade
-        if reset_values:
-            deploy_command += " --reset-values"
 
-    if reuse_values is not None:
-        deploy_command += " --reuse-values=" + str(reuse_values)
+        # Always reset values to keep release_values equal to values released
+        deploy_command += " --reset-values"
 
     if wait:
         deploy_command += " --wait"
@@ -558,10 +520,9 @@ def deploy(
         with open(path, "w") as yaml_file:
             yaml.dump(release_values, yaml_file, default_flow_style=False)
         deploy_command += " -f=" + path
-        module.add_cleanup_file(path)
 
     if post_renderer:
-        deploy_command += " --post-renderer=" + post_renderer
+        deploy_command = " --post-renderer=" + post_renderer
 
     if skip_crds:
         deploy_command += " --skip-crds"
@@ -572,7 +533,7 @@ def deploy(
     if set_value_args:
         deploy_command += " " + set_value_args
 
-    deploy_command += " " + release_name + f" '{chart_name}'"
+    deploy_command += " " + release_name + " " + chart_name
     return deploy_command
 
 
@@ -638,10 +599,6 @@ def helmdiff_check(
     chart_version=None,
     replace=False,
     chart_repo_url=None,
-    post_renderer=False,
-    set_value_args=None,
-    reuse_values=None,
-    reset_values=True,
 ):
     """
     Use helm diff to determine if a release would change by upgrading a chart.
@@ -655,13 +612,7 @@ def helmdiff_check(
     if chart_version is not None:
         cmd += " " + "--version=" + chart_version
     if not replace:
-        cmd += " " + "--reset-values=" + str(reset_values)
-    if post_renderer:
-        cmd += " --post-renderer=" + post_renderer
-
-    if values_files:
-        for value_file in values_files:
-            cmd += " --values=" + value_file
+        cmd += " " + "--reset-values"
 
     if release_values != {}:
         fd, path = tempfile.mkstemp(suffix=".yml")
@@ -670,11 +621,9 @@ def helmdiff_check(
         cmd += " -f=" + path
         module.add_cleanup_file(path)
 
-    if set_value_args:
-        cmd += " " + set_value_args
-
-    if reuse_values:
-        cmd += " --reuse-values"
+    if values_files:
+        for values_file in values_files:
+            cmd += " -f=" + values_file
 
     rc, out, err = module.run_helm_command(cmd)
     return (len(out.strip()) > 0, out.strip())
@@ -733,8 +682,6 @@ def argument_spec():
             skip_crds=dict(type="bool", default=False),
             history_max=dict(type="int"),
             set_values=dict(type="list", elements="dict"),
-            reuse_values=dict(type="bool"),
-            reset_values=dict(type="bool", default=True),
         )
     )
     return arg_spec
@@ -785,21 +732,16 @@ def main():
     history_max = module.params.get("history_max")
     timeout = module.params.get("timeout")
     set_values = module.params.get("set_values")
-    reuse_values = module.params.get("reuse_values")
-    reset_values = module.params.get("reset_values")
 
     if update_repo_cache:
         run_repo_update(module)
 
     # Get real/deployed release status
-    all_status = release_state == "absent"
-    release_status = get_release_status(module, release_name, all_status=all_status)
+    release_status = get_release_status(module, release_name)
 
     helm_cmd = module.get_helm_binary()
     opt_result = {}
     if release_state == "absent" and release_status is not None:
-        # skip release statuses 'uninstalled' and 'uninstalling'
-        if not release_status["status"].startswith("uninstall"):
         if replace:
             module.fail_json(msg="replace is not applicable when state is absent")
 
@@ -817,6 +759,7 @@ def main():
         )
         changed = True
     elif release_state == "present":
+
         if chart_version is not None:
             helm_cmd += " --version=" + chart_version
 
@@ -856,13 +799,12 @@ def main():
                     "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)
 
-        if release_status is None:  # Not installed
             helm_cmd = deploy(
-                module,
                 helm_cmd,
                 release_name,
                 release_values,
@@ -881,12 +823,11 @@ def main():
                 history_max=history_max,
                 timeout=timeout,
                 set_value_args=set_value_args,
-                reuse_values=reuse_values,
-                reset_values=reset_values,
             )
             changed = True
 
         else:
+
             helm_diff_version = get_plugin_version("diff")
             if helm_diff_version and (
                 not chart_repo_url
@@ -904,10 +845,6 @@ def main():
                     chart_version,
                     replace,
                     chart_repo_url,
-                    post_renderer,
-                    set_value_args,
-                    reuse_values=reuse_values,
-                    reset_values=reset_values,
                 )
                 if would_change and module._diff:
                     opt_result["diff"] = {"prepared": prepared}
@@ -921,8 +858,11 @@ 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(
-                    module,
                     helm_cmd,
                     release_name,
                     release_values,
@@ -941,8 +881,6 @@ def main():
                     timeout=timeout,
                     dependency_update=dependency_update,
                     set_value_args=set_value_args,
-                    reuse_values=reuse_values,
-                    reset_values=reset_values,
                 )
                 changed = True
 
@@ -976,7 +914,7 @@ def main():
         changed=changed,
         stdout=out,
         stderr=err,
-        status=get_release_status(module, release_name, all_status=True),
+        status=get_release_status(module, release_name),
         command=helm_cmd,
         **opt_result,
     )

plugins/modules/helm_info.py

@@ -14,7 +14,7 @@ module: helm_info
 
 short_description: Get information from Helm package deployed inside the cluster
 
-version_added: 0.11.0
+version_added: "0.11.0"
 
 author:
   - Lucas Boisserie (@LucasBoisserie)
@@ -53,7 +53,7 @@ options:
     type: list
     elements: str
     default: []
-    version_added: 2.3.0
+    version_added: "2.3.0"
   get_all_values:
     description:
       - Set to C(True) if you want to get all (computed) values of the release.
@@ -61,7 +61,7 @@ options:
     required: false
     default: false
     type: bool
-    version_added: 2.4.0
+    version_added: "2.4.0"
 extends_documentation_fragment:
   - kubernetes.core.helm_common_options
 """
@@ -123,22 +123,22 @@ status:
       elements: dict
       description: Hooks of the release
       returned: always
-      version_added: 2.4.0
+      version_added: "2.4.0"
     notes:
       type: str
       description: Notes of the release
       returned: always
-      version_added: 2.4.0
+      version_added: "2.4.0"
     manifest:
       type: list
       elements: dict
       description: Manifest of the release
       returned: always
-      version_added: 2.4.0
+      version_added: "2.4.0"
 """
 
-import copy
 import traceback
+import copy
 
 try:
     import yaml

plugins/modules/helm_plugin.py

@@ -12,7 +12,7 @@ DOCUMENTATION = r"""
 ---
 module: helm_plugin
 short_description: Manage Helm plugins
-version_added: 1.0.0
+version_added: "1.0.0"
 author:
   - Abhijeet Kasurde (@Akasurde)
 requirements:
@@ -47,7 +47,7 @@ options:
       - Ignored when C(state=absent) or C(state=latest).
     required: false
     type: str
-    version_added: 2.3.0
+    version_added: "2.3.0"
 extends_documentation_fragment:
   - kubernetes.core.helm_common_options
 """
@@ -109,7 +109,6 @@ rc:
 """
 
 import copy
-
 from ansible_collections.kubernetes.core.plugins.module_utils.helm import (
     AnsibleHelmModule,
     parse_helm_plugin_list,

plugins/modules/helm_plugin_info.py

@@ -12,7 +12,7 @@ DOCUMENTATION = r"""
 ---
 module: helm_plugin_info
 short_description: Gather information about Helm plugins
-version_added: 1.0.0
+version_added: "1.0.0"
 author:
   - Abhijeet Kasurde (@Akasurde)
 requirements:
@@ -71,10 +71,9 @@ rc:
 """
 
 import copy
-
 from ansible_collections.kubernetes.core.plugins.module_utils.helm import (
-    AnsibleHelmModule,
     parse_helm_plugin_list,
+    AnsibleHelmModule,
 )
 from ansible_collections.kubernetes.core.plugins.module_utils.helm_args_common import (
     HELM_AUTH_ARG_SPEC,
@@ -83,6 +82,7 @@ from ansible_collections.kubernetes.core.plugins.module_utils.helm_args_common i
 
 
 def main():
+
     argument_spec = copy.deepcopy(HELM_AUTH_ARG_SPEC)
     argument_spec.update(
         dict(

plugins/modules/helm_pull.py

@@ -12,7 +12,7 @@ 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
+version_added: "2.4.0"
 author:
   - Aubin Bikouo (@abikouo)
 description:

plugins/modules/helm_repository.py

@@ -14,7 +14,7 @@ module: helm_repository
 
 short_description: Manage Helm repositories.
 
-version_added: 0.11.0
+version_added: "0.11.0"
 
 author:
   - Lucas Boisserie (@LucasBoisserie)
@@ -76,12 +76,12 @@ options:
     description:
     - Provide a URL for accessing the API. Can also be specified via C(K8S_AUTH_HOST) environment variable.
     type: str
-    version_added: 2.3.0
+    version_added: "2.3.0"
   api_key:
     description:
     - Token used to authenticate with the API. Can also be specified via C(K8S_AUTH_API_KEY) environment variable.
     type: str
-    version_added: 2.3.0
+    version_added: "2.3.0"
   validate_certs:
     description:
     - Whether or not to verify the API server's SSL certificates. Can also be specified via C(K8S_AUTH_VERIFY_SSL)
@@ -89,21 +89,21 @@ options:
     type: bool
     aliases: [ verify_ssl ]
     default: True
-    version_added: 2.3.0
+    version_added: "2.3.0"
   ca_cert:
     description:
     - 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 C(K8S_AUTH_SSL_CA_CERT) environment variable.
     type: path
     aliases: [ ssl_ca_cert ]
-    version_added: 2.3.0
+    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
+    version_added: "2.4.0"
   kubeconfig:
     description:
       - Helm option to specify kubeconfig path to use.
@@ -111,14 +111,14 @@ options:
       - The configuration can be provided as dictionary.
     type: raw
     aliases: [ kubeconfig_path ]
-    version_added: 2.4.0
+    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
+    version_added: "2.4.0"
 """
 
 EXAMPLES = r"""
@@ -166,8 +166,8 @@ msg:
   sample: 'Repository already have a repository named bitnami'
 """
 
-import copy
 import traceback
+import copy
 
 try:
     import yaml

plugins/modules/helm_template.py

@@ -53,7 +53,7 @@ options:
     default: false
     type: bool
     aliases: [ dep_up ]
-    version_added: 2.4.0
+    version_added: "2.4.0"
   disable_hook:
     description:
       - Prevent hooks from running during install.
@@ -139,7 +139,7 @@ options:
           - string
           - json
           - file
-    version_added: 2.4.0
+    version_added: '2.4.0'
 """
 
 EXAMPLES = r"""

plugins/modules/k8s.py

@@ -57,14 +57,15 @@ options:
     - Whether to override the default patch merge approach with a specific type. By default, the strategic
       merge will typically be used.
     - For example, Custom Resource Definitions typically aren't updatable by the usual strategic merge. You may
-      want to use C(merge) if you see "strategic merge patch format is not supported".
+      want to use C(merge) if you see "strategic merge patch format is not supported"
     - See U(https://kubernetes.io/docs/tasks/run-application/update-api-object-kubectl-patch/#use-a-json-merge-patch-to-update-a-deployment)
     - If more than one C(merge_type) is given, the merge_types will be tried in order. This defaults to
       C(['strategic-merge', 'merge']), which is ideal for using the same parameters on resource kinds that
       combine Custom Resources and built-in resources.
-    - Mutually exclusive with C(apply).
-    - I(merge_type=json) has been removed in version 4.0.0. Please use M(kubernetes.core.k8s_json_patch) instead.
+    - mutually exclusive with C(apply)
+    - I(merge_type=json) is deprecated and will be removed in version 3.0.0. Please use M(kubernetes.core.k8s_json_patch) instead.
     choices:
+    - json
     - merge
     - strategic-merge
     type: list
@@ -100,7 +101,7 @@ options:
     - C(apply) compares the desired resource definition with the previously supplied resource definition,
       ignoring properties that are automatically generated
     - C(apply) works better with Services than 'force=yes'
-    - Mutually exclusive with C(merge_type).
+    - mutually exclusive with C(merge_type)
     default: False
     type: bool
   template:
@@ -171,31 +172,10 @@ options:
         - When set to True, server-side apply will force the changes against conflicts.
         type: bool
         default: False
-  delete_all:
-    description:
-    - When this option is set to I(true) and I(state=absent),
-      module will delete all resources of the specified resource type in the requested namespace.
-    - Ignored when C(state) is not set to I(absent) or when one of (src),
-      C(name)  or C(resource_definition) is provided.
-    - Parameter C(kind) is required to use this option.
-    - This parameter can be used with C(label_selectors) to restrict the resources to be deleted.
-    type: bool
-    default: false
-    version_added: 2.5.0
-    aliases:
-    - all
-  hidden_fields:
-    description:
-      - Hide fields matching this option in the result
-      - An example might be C(hidden_fields=[metadata.managedFields])
-      - Only field definitions that don't reference list items are supported (so V(spec.containers[0]) would not work)
-    type: list
-    elements: str
-    version_added: 2.5.0
 
 requirements:
-  - "python >= 3.9"
-  - "kubernetes >= 24.2.0"
+  - "python >= 3.6"
+  - "kubernetes >= 12.0.0"
   - "PyYAML >= 3.11"
   - "jsonpatch"
 """
@@ -363,14 +343,6 @@ EXAMPLES = r"""
     apply: yes
     server_side_apply:
       field_manager: ansible
-
-# Delete all Deployment from specified namespace
-- name: Delete all Deployment from specified namespace
-  kubernetes.core.k8s:
-    api_version: apps/v1
-    namespace: testing
-    kind: Deployment
-    delete_all: true
 """
 
 RETURN = r"""
@@ -422,10 +394,10 @@ from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule impo
 )
 from ansible_collections.kubernetes.core.plugins.module_utils.args_common import (
     AUTH_ARG_SPEC,
-    DELETE_OPTS_ARG_SPEC,
+    WAIT_ARG_SPEC,
     NAME_ARG_SPEC,
     RESOURCE_ARG_SPEC,
-    WAIT_ARG_SPEC,
+    DELETE_OPTS_ARG_SPEC,
 )
 from ansible_collections.kubernetes.core.plugins.module_utils.k8s.core import (
     AnsibleK8SModule,
@@ -459,7 +431,7 @@ def argspec():
     argument_spec.update(copy.deepcopy(AUTH_ARG_SPEC))
     argument_spec.update(copy.deepcopy(WAIT_ARG_SPEC))
     argument_spec["merge_type"] = dict(
-        type="list", elements="str", choices=["merge", "strategic-merge"]
+        type="list", elements="str", choices=["json", "merge", "strategic-merge"]
     )
     argument_spec["validate"] = dict(type="dict", default=None, options=validate_spec())
     argument_spec["append_hash"] = dict(type="bool", default=False)
@@ -478,8 +450,6 @@ def argspec():
     argument_spec["server_side_apply"] = dict(
         type="dict", default=None, options=server_apply_spec()
     )
-    argument_spec["delete_all"] = dict(type="bool", default=False, aliases=["all"])
-    argument_spec["hidden_fields"] = dict(type="list", elements="str")
 
     return argument_spec
 

plugins/modules/k8s_cluster_info.py

@@ -11,7 +11,7 @@ __metaclass__ = type
 DOCUMENTATION = r"""
 module: k8s_cluster_info
 
-version_added: 0.11.1
+version_added: "0.11.1"
 
 short_description: Describe Kubernetes (K8s) cluster, APIs available and their respective versions
 
@@ -34,8 +34,8 @@ extends_documentation_fragment:
   - kubernetes.core.k8s_auth_options
 
 requirements:
-  - "python >= 3.9"
-  - "kubernetes >= 24.2.0"
+  - "python >= 3.6"
+  - "kubernetes >= 12.0.0"
   - "PyYAML >= 3.11"
 """
 
@@ -154,15 +154,15 @@ except ImportError:
 from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import (
     AnsibleModule,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.args_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.exceptions import (
     CoreException,
 )
+from ansible_collections.kubernetes.core.plugins.module_utils.args_common import (
+    AUTH_ARG_SPEC,
+)
 
 
 def execute_module(module, client):

plugins/modules/k8s_cp.py

@@ -14,7 +14,7 @@ module: k8s_cp
 
 short_description: Copy files and directories to and from pod.
 
-version_added: 2.2.0
+version_added: "2.2.0"
 
 author:
     - Aubin Bikouo (@abikouo)
@@ -26,8 +26,8 @@ extends_documentation_fragment:
   - kubernetes.core.k8s_auth_options
 
 requirements:
-  - "python >= 3.9"
-  - "kubernetes >= 24.2.0"
+  - "python >= 3.6"
+  - "kubernetes >= 12.0.0"
 
 options:
   namespace:
@@ -139,18 +139,9 @@ result:
 
 import copy
 
-from ansible.module_utils._text import to_native
 from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import (
     AnsibleModule,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.args_common import (
-    AUTH_ARG_SPEC,
-)
-from ansible_collections.kubernetes.core.plugins.module_utils.copy import (
-    K8SCopyFromPod,
-    K8SCopyToPod,
-    check_pod,
-)
 from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
     get_api_client,
 )
@@ -164,6 +155,16 @@ 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,
+)
+from ansible_collections.kubernetes.core.plugins.module_utils.copy import (
+    K8SCopyFromPod,
+    K8SCopyToPod,
+    check_pod,
+)
+from ansible.module_utils._text import to_native
+
 
 def argspec():
     argument_spec = copy.deepcopy(AUTH_ARG_SPEC)

plugins/modules/k8s_drain.py

@@ -15,7 +15,7 @@ module: k8s_drain
 
 short_description: Drain, Cordon, or Uncordon node in k8s cluster
 
-version_added: 2.2.0
+version_added: "2.2.0"
 
 author: Aubin Bikouo (@abikouo)
 
@@ -41,21 +41,12 @@ options:
       - The name of the node.
     required: true
     type: str
-  pod_selectors:
-    description:
-      - Label selector to filter pods on the node.
-      - This option has effect only when C(state) is set to I(drain).
-    type: list
-    elements: str
-    version_added: 2.5.0
-    aliases:
-    - label_selectors
   delete_options:
     type: dict
-    default: {}
     description:
       - Specify options to delete pods.
       - This option has effect only when C(state) is set to I(drain).
+    default: {}
     suboptions:
         terminate_grace_period:
             description:
@@ -97,8 +88,8 @@ options:
             type: int
 
 requirements:
-  - python >= 3.9
-  - kubernetes >= 24.2.0
+  - python >= 3.6
+  - kubernetes >= 12.0.0
 """
 
 EXAMPLES = r"""
@@ -124,14 +115,6 @@ EXAMPLES = r"""
   kubernetes.core.k8s_drain:
     state: cordon
     name: foo
-
-- name: Drain node "foo" using label selector to filter the list of pods to be drained.
-  kubernetes.core.k8s_drain:
-    state: drain
-    name: foo
-    pod_selectors:
-    - 'app!=csi-attacher'
-    - 'app!=csi-provisioner'
 """
 
 RETURN = r"""
@@ -145,9 +128,8 @@ result:
 import copy
 import time
 import traceback
-from datetime import datetime
 
-from ansible.module_utils._text import to_native
+from datetime import datetime
 from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import (
     AnsibleModule,
 )
@@ -164,10 +146,12 @@ from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions imp
     CoreException,
 )
 
+from ansible.module_utils._text import to_native
+
 try:
     from kubernetes.client.api import core_v1_api
-    from kubernetes.client.exceptions import ApiException
     from kubernetes.client.models import V1DeleteOptions, V1ObjectMeta
+    from kubernetes.client.exceptions import ApiException
 except ImportError:
     # ImportError are managed by the common module already.
     pass
@@ -344,17 +328,6 @@ class K8sDrainAnsible(object):
                     )
                 )
 
-    def list_pods(self):
-        params = {
-            "field_selector": "spec.nodeName={name}".format(
-                name=self._module.params.get("name")
-            )
-        }
-        pod_selectors = self._module.params.get("pod_selectors")
-        if pod_selectors:
-            params["label_selector"] = ",".join(pod_selectors)
-        return self._api_instance.list_pod_for_all_namespaces(**params)
-
     def delete_or_evict_pods(self, node_unschedulable):
         # Mark node as unschedulable
         result = []
@@ -377,7 +350,12 @@ class K8sDrainAnsible(object):
                 self.patch_node(unschedulable=False)
 
         try:
-            pod_list = self.list_pods()
+            field_selector = "spec.nodeName={name}".format(
+                name=self._module.params.get("name")
+            )
+            pod_list = self._api_instance.list_pod_for_all_namespaces(
+                field_selector=field_selector
+            )
             # Filter pods
             force = self._drain_options.get("force", False)
             ignore_daemonset = self._drain_options.get("ignore_daemonsets", False)
@@ -428,6 +406,7 @@ class K8sDrainAnsible(object):
         return dict(result=" ".join(result))
 
     def patch_node(self, unschedulable):
+
         body = {"spec": {"unschedulable": unschedulable}}
         try:
             self._api_instance.patch_node(
@@ -439,6 +418,7 @@ class K8sDrainAnsible(object):
             )
 
     def execute_module(self):
+
         state = self._module.params.get("state")
         name = self._module.params.get("name")
         try:
@@ -506,11 +486,6 @@ def argspec():
                     wait_sleep=dict(type="int", default=5),
                 ),
             ),
-            pod_selectors=dict(
-                type="list",
-                elements="str",
-                aliases=["label_selectors"],
-            ),
         )
     )
     return argument_spec

plugins/modules/k8s_exec.py

@@ -15,7 +15,7 @@ module: k8s_exec
 
 short_description: Execute command in Pod
 
-version_added: 0.10.0
+version_added: "0.10.0"
 
 author: "Tristan de Cacqueray (@tristanC)"
 
@@ -26,8 +26,8 @@ extends_documentation_fragment:
   - kubernetes.core.k8s_auth_options
 
 requirements:
-  - "python >= 3.9"
-  - "kubernetes >= 24.2.0"
+  - "python >= 3.6"
+  - "kubernetes >= 12.0.0"
   - "PyYAML >= 3.11"
 
 notes:
@@ -131,27 +131,27 @@ except ImportError:
     # ImportError are managed by the common module already.
     pass
 
-from ansible.module_utils._text import to_native
 from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import (
     AnsibleModule,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.args_common import (
+from ansible.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.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.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
-    from kubernetes.client.exceptions import ApiException
     from kubernetes.stream import stream
+    from kubernetes.client.exceptions import ApiException
 except ImportError:
     # ImportError are managed by the common module already.
     pass
@@ -219,6 +219,12 @@ def execute_module(module, client):
     else:
         rc = int(err["details"]["causes"][0]["message"])
 
+    module.deprecate(
+        "The 'return_code' return key is being renamed to 'rc'. "
+        "Both keys are being returned for now to allow users to migrate their automation.",
+        version="4.0.0",
+        collection_name="kubernetes.core",
+    )
     module.exit_json(
         # Some command might change environment, but ultimately failing at end
         changed=True,

plugins/modules/k8s_info.py

@@ -44,14 +44,6 @@ options:
     type: list
     elements: str
     default: []
-  hidden_fields:
-    description:
-      - Hide fields matching any of the field definitions in the result
-      - An example might be C(hidden_fields=[metadata.managedFields])
-      - Only field definitions that don't reference list items are supported (so V(spec.containers[0]) would not work)
-    type: list
-    elements: str
-    version_added: 2.5.0
 
 extends_documentation_fragment:
   - kubernetes.core.k8s_auth_options
@@ -59,8 +51,8 @@ extends_documentation_fragment:
   - kubernetes.core.k8s_wait_options
 
 requirements:
-  - "python >= 3.9"
-  - "kubernetes >= 24.2.0"
+  - "python >= 3.6"
+  - "kubernetes >= 12.0.0"
   - "PyYAML >= 3.11"
 """
 
@@ -165,12 +157,12 @@ 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 (
-    get_api_client,
-)
 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,
 )
@@ -191,7 +183,6 @@ def execute_module(module, svc):
         wait_sleep=module.params["wait_sleep"],
         wait_timeout=module.params["wait_timeout"],
         condition=module.params["wait_condition"],
-        hidden_fields=module.params["hidden_fields"],
     )
     module.exit_json(changed=False, **facts)
 
@@ -207,7 +198,6 @@ def argspec():
             namespace=dict(),
             label_selectors=dict(type="list", elements="str", default=[]),
             field_selectors=dict(type="list", elements="str", default=[]),
-            hidden_fields=dict(type="list", elements="str"),
         )
     )
     return args

plugins/modules/k8s_json_patch.py

@@ -62,8 +62,8 @@ extends_documentation_fragment:
   - kubernetes.core.k8s_wait_options
 
 requirements:
-  - "python >= 3.9"
-  - "kubernetes >= 24.2.0"
+  - "python >= 3.6"
+  - "kubernetes >= 12.0.0"
   - "PyYAML >= 3.11"
   - "jsonpatch"
 """
@@ -127,8 +127,8 @@ error:
 import copy
 import traceback
 
-from ansible.module_utils._text import to_native
 from ansible.module_utils.basic import missing_required_lib
+from ansible.module_utils._text import to_native
 from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import (
     AnsibleModule,
 )
@@ -152,6 +152,7 @@ from ansible_collections.kubernetes.core.plugins.module_utils.k8s.waiter import
     get_waiter,
 )
 
+
 try:
     from kubernetes.dynamic.exceptions import DynamicApiError
 except ImportError:

plugins/modules/k8s_log.py

@@ -14,7 +14,7 @@ module: k8s_log
 
 short_description: Fetch logs from Kubernetes resources
 
-version_added: 0.10.0
+version_added: "0.10.0"
 
 author:
     - "Fabian von Feilitzsch (@fabianvf)"
@@ -61,30 +61,30 @@ options:
     - A relative time in seconds before the current time from which to show logs.
     required: no
     type: str
-    version_added: 2.2.0
+    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
+    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
+    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
+    version_added: '2.4.0'
 
 requirements:
-  - "python >= 3.9"
-  - "kubernetes >= 24.2.0"
+  - "python >= 3.6"
+  - "kubernetes >= 12.0.0"
   - "PyYAML >= 3.11"
 """
 

plugins/modules/k8s_rollback.py

@@ -12,7 +12,7 @@ __metaclass__ = type
 DOCUMENTATION = r"""
 module: k8s_rollback
 short_description: Rollback Kubernetes (K8S) Deployments and DaemonSets
-version_added: 1.0.0
+version_added: "1.0.0"
 author:
     - "Julien Huon (@julienhuon)"
 description:
@@ -34,8 +34,8 @@ extends_documentation_fragment:
   - kubernetes.core.k8s_auth_options
   - kubernetes.core.k8s_name_options
 requirements:
-  - "python >= 3.9"
-  - "kubernetes >= 24.2.0"
+  - "python >= 3.6"
+  - "kubernetes >= 12.0.0"
   - "PyYAML >= 3.11"
 """
 

plugins/modules/k8s_scale.py

@@ -6,6 +6,7 @@
 
 from __future__ import absolute_import, division, print_function
 
+
 __metaclass__ = type
 
 
@@ -45,8 +46,8 @@ options:
     version_added: 2.0.0
 
 requirements:
-    - "python >= 3.9"
-    - "kubernetes >= 24.2.0"
+    - "python >= 3.6"
+    - "kubernetes >= 12.0.0"
     - "PyYAML >= 3.11"
 """
 
@@ -150,13 +151,14 @@ except ImportError:
     pass
 
 from ansible.module_utils._text import to_native
+
 from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import (
     AnsibleModule,
 )
 from ansible_collections.kubernetes.core.plugins.module_utils.args_common import (
     AUTH_ARG_SPEC,
-    NAME_ARG_SPEC,
     RESOURCE_ARG_SPEC,
+    NAME_ARG_SPEC,
 )
 from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
     get_api_client,
@@ -168,15 +170,15 @@ from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions imp
     CoreException,
     ResourceTimeout,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.resource import (
-    create_definitions,
-)
 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},
@@ -389,7 +391,7 @@ def scale(
                 namespace=namespace,
             )
             if not success:
-                raise ResourceTimeout("Resource scaling timed out", result)
+                raise ResourceTimeout("Resource scaling timed out", **result)
 
     match, diffs = diff_objects(existing.to_dict(), result["result"])
     result["changed"] = not match

plugins/modules/k8s_service.py

@@ -83,8 +83,8 @@ options:
     type: bool
 
 requirements:
-  - python >= 3.9
-  - kubernetes >= 24.2.0
+  - python >= 3.6
+  - kubernetes >= 12.0.0
 """
 
 EXAMPLES = r"""
@@ -143,6 +143,7 @@ result:
 """
 
 import copy
+
 from collections import defaultdict
 
 from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import (
@@ -153,24 +154,25 @@ 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.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.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,
 )
-from ansible_collections.kubernetes.core.plugins.module_utils.k8s.service import (
-    K8sService,
-)
+
 
 SERVICE_ARG_SPEC = {
     "apply": {"type": "bool", "default": False},

plugins/modules/k8s_taint.py

@@ -13,7 +13,7 @@ __metaclass__ = type
 DOCUMENTATION = r"""
 module: k8s_taint
 short_description: Taint a node in a Kubernetes/OpenShift cluster
-version_added: 2.3.0
+version_added: "2.3.0"
 author: Alina Buzachis (@alinabuzachis)
 description:
     - Taint allows a node to refuse Pod to be scheduled unless that Pod has a matching toleration.
@@ -60,8 +60,8 @@ options:
         default: false
         type: bool
 requirements:
-  - python >= 3.9
-  - kubernetes >= 24.2.0
+  - python >= 3.6
+  - kubernetes >= 12.0.0
 """
 
 EXAMPLES = r"""
@@ -127,6 +127,7 @@ result:
 import copy
 
 from ansible.module_utils._text import to_native
+
 from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import (
     AnsibleModule,
 )

requirements.txt

@@ -1,3 +1,3 @@
-kubernetes>=24.2.0
+kubernetes>=12.0.0
 requests-oauthlib
 jsonpatch

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

@@ -24,5 +24,3 @@ test_namespace:
   - "helm-local-path-003"
   - "helm-from-repository"
   - "helm-from-url"
-  - "helm-reuse-values"
-  - "helm-chart-with-space-into-name"

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

@@ -1,130 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# Copyright: (c) 2023, 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_test_pending
-short_description: created pending-install release
-author:
-  - Aubin Bikouo (@abikouo)
-requirements:
-  - "helm (https://github.com/helm/helm/releases)"
-description:
-  - This module is used to create a pending install release for integration testing
-  - The scope of this module is the integration testing of the kubernetes.core collection only.
-options:
-  binary_path:
-    description:
-      - The path of a helm binary to use.
-    required: true
-    type: path
-  chart_ref:
-    description:
-      - chart reference on chart repository (e.g. my-repo/my-chart-ref)
-    required: true
-    type: str
-  chart_release:
-    description:
-      - Release name to manage.
-    required: true
-    type: str
-  chart_release_namespace:
-    description:
-      - Kubernetes namespace where the chart should be installed.
-    required: true
-    type: str
-"""
-
-EXAMPLES = r"""
-"""
-
-RETURN = r"""
-"""
-
-import json
-import subprocess
-import time
-
-from ansible.module_utils.basic import AnsibleModule
-
-
-class HelmReleaseNotFoundError(Exception):
-    def __init__(self, message):
-        super().__init__(message)
-
-
-def create_pending_install_release(helm_binary, chart_ref, chart_release, namespace):
-    # create pending-install release
-    command = [
-        helm_binary,
-        "install",
-        chart_release,
-        chart_ref,
-        "--namespace",
-        namespace,
-        "--wait",
-    ]
-    proc = subprocess.Popen(command)
-    time.sleep(2)
-    proc.kill()
-    # ensure release status is pending-install
-    command = [
-        helm_binary,
-        "list",
-        "--all",
-        "--output=json",
-        "--namespace",
-        namespace,
-        "--filter",
-        chart_release,
-    ]
-    cmd = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    out, err = cmd.communicate()
-
-    data = json.loads(out)
-    if not data:
-        error = "Release %s not found." % chart_release
-        raise HelmReleaseNotFoundError(message=error)
-    return data[0]["status"] == "pending-install", data[0]["status"]
-
-
-def main():
-    module = AnsibleModule(
-        argument_spec=dict(
-            binary_path=dict(type="path", required=True),
-            chart_ref=dict(type="str", required=True),
-            chart_release=dict(type="str", required=True),
-            chart_release_namespace=dict(type="str", required=True),
-        ),
-    )
-
-    params = dict(
-        helm_binary=module.params.get("binary_path"),
-        chart_release=module.params.get("chart_release"),
-        chart_ref=module.params.get("chart_ref"),
-        namespace=module.params.get("chart_release_namespace"),
-    )
-
-    try:
-        result, status = create_pending_install_release(**params)
-        if not result:
-            module.fail_json(
-                msg="unable to create pending-install release, current status is %s"
-                % status
-            )
-        module.exit_json(changed=True, msg="Release created with status '%s'" % status)
-    except HelmReleaseNotFoundError as err:
-        module.fail_json(
-            msg="Error while trying to create pending-install release due to '%s'" % err
-        )
-
-
-if __name__ == "__main__":
-    main()

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

@@ -52,12 +52,12 @@ result:
 """
 
 import re
-
-from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.kubernetes.core.plugins.module_utils.version import (
     LooseVersion,
 )
 
+from ansible.module_utils.basic import AnsibleModule
+
 
 def main():
     module = AnsibleModule(

tests/integration/targets/helm/playbook.yaml

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

tests/integration/targets/helm/runme.sh

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

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

@@ -25,18 +25,12 @@
     - from_repository
     - from_url
 
-- name: test helm upgrade with reuse_values
-  include_tasks: test_helm_reuse_values.yml
-
 - name: test helm dependency update
   include_tasks: test_up_dep.yml
 
 - name: Test helm uninstall
   include_tasks: test_helm_uninstall.yml
 
-- name: Test helm install with chart name containing space
-  include_tasks: test_helm_with_space_into_chart_name.yml
-
 # https://github.com/ansible-collections/community.kubernetes/issues/296
 - name: Test Skip CRDS feature in helm chart install
   include_tasks: test_crds.yml

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

@@ -1,75 +0,0 @@
----
-- name: Test helm reuse_values
-  vars:
-    helm_namespace: "{{ test_namespace[9] }}"
-    chart_release_values:
-      replica:
-        replicaCount: 3
-      master:
-        count: 1
-        kind: Deployment
-    chart_reuse_values:
-      replica:
-        replicaCount: 1
-      master:
-        count: 3
-  block:
-    - name: Initial chart installation
-      helm:
-        binary_path: "{{ helm_binary }}"
-        chart_ref: redis
-        chart_repo_url: https://charts.bitnami.com/bitnami
-        release_name: test-redis
-        release_namespace: "{{ helm_namespace }}"
-        create_namespace: true
-        release_values: "{{ chart_release_values }}"
-      register: install
-
-    - name: Get value set as string
-      helm_info:
-        binary_path: "{{ helm_binary }}"
-        release_name: test-redis
-        release_namespace: "{{ helm_namespace }}"
-      register: release_value
-
-    - name: Validate that chart values are as expected
-      assert:
-        that:
-          - install is changed
-          - '"--reuse-values=True" not in install.command'
-          - release_value["status"]["values"] == chart_release_values
-
-    - name: Upgrade chart using reuse_values=true
-      helm:
-        binary_path: "{{ helm_binary }}"
-        chart_ref: redis
-        chart_repo_url: https://charts.bitnami.com/bitnami
-        release_name: test-redis
-        release_namespace: "{{ helm_namespace }}"
-        reuse_values: true
-        reset_values: false
-        release_values: "{{ chart_reuse_values }}"
-      register: upgrade
-
-    - name: Get value set as string
-      helm_info:
-        binary_path: "{{ helm_binary }}"
-        release_name: test-redis
-        release_namespace: "{{ helm_namespace }}"
-      register: release_value
-
-    - name: Validate that chart values are as expected
-      assert:
-        that:
-          - upgrade is changed
-          - '"--reuse-values=True" in upgrade.command'
-          - '"--reset-values" not in upgrade.command'
-          - release_value["status"]["values"] == chart_release_values | combine(chart_reuse_values, recursive=true)
-
-  always:
-    - name: Remove helm namespace
-      k8s:
-        api_version: v1
-        kind: Namespace
-        name: "{{ helm_namespace }}"
-        state: absent

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

@@ -7,7 +7,6 @@
 - 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"
-    chart_name_pending: "test-uninstall-pending-release"
     helm_namespace: "{{ test_namespace[1] }}"
   block:
 
@@ -65,36 +64,6 @@
       wait: yes
     register: uninstall
 
-  # Test uninstall chart release with 'pending-install' status
-  - name: Create chart release with 'pending-install' status
-    helm_test_pending:
-      binary_path: "{{ helm_binary }}"
-      chart_ref: "{{ chart_source }}"
-      chart_release: "{{ chart_name_pending }}"
-      chart_release_namespace: "{{ helm_namespace }}"
-
-  - name: Uninstall chart release with 'pending-install' status
-    helm:
-      binary_path: "{{ helm_binary }}"
-      release_name: "{{ chart_name_pending }}"
-      namespace: "{{ helm_namespace }}"
-      release_state: absent
-    register: _uninstall
-
-  - name: Get Helm release details
-    helm_info:
-      binary_path: "{{ helm_binary }}"
-      release_namespace: "{{ helm_namespace }}"
-      release_state: pending
-      release_name: "{{ chart_name_pending }}"
-    register: _info
-
-  - name: assert release does not exist anymore
-    assert:
-      that:
-      - _uninstall is changed
-      - _info.status is undefined
-
   always:
   - name: Delete temp directory
     file:

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

@@ -1,58 +0,0 @@
----
-- name: Create test directory
-  ansible.builtin.tempfile:
-    state: directory
-    suffix: .helm
-  register: test_dir
-
-- name: Test helm using directory with space
-  vars:
-    helm_dir: "{{ test_dir.path }}/Deploy Chart"
-    helm_namespace: "{{ test_namespace[10] }}"
-    chart_release_name: "deploy-chart-with-space-into-name"
-    helm_local_src: "test-chart"
-  block:
-    - name: Copy helm file into destination
-      ansible.builtin.copy:
-        src: "{{ helm_local_src }}"
-        dest: "{{ helm_dir }}"
-
-    - name: Install chart from local source with Space into name
-      helm:
-        binary_path: "{{ helm_binary }}"
-        name: "{{ chart_release_name }}"
-        chart_ref: "{{ helm_dir }}/{{ helm_local_src | basename }}"
-        namespace: "{{ helm_namespace }}"
-        create_namespace: true
-      register: install_chart
-
-    - name: Assert that chart is installed
-      assert:
-        that:
-          - install_chart is changed
-          - install_chart.status.status | lower == 'deployed'
-
-    - name: Check helm_info content
-      helm_info:
-        binary_path: "{{ helm_binary }}"
-        name: "{{ chart_release_name }}"
-        namespace: "{{ helm_namespace }}"
-      register: chart_info
-
-    - name: Assert that Chart is installed (using helm_info)
-      assert:
-        that:
-          - chart_info.status.status | lower == 'deployed'
-
-  always:
-    - name: Delete temporary directory
-      ansible.builtin.file:
-        state: absent
-        name: "{{ test_dir.path }}"
-
-    - name: Remove helm namespace
-      k8s:
-        api_version: v1
-        kind: Namespace
-        name: "{{ helm_namespace }}"
-        state: absent

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

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

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

@@ -1,24 +0,0 @@
-apiVersion: v2
-name: chart-reuse-values
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "1.16.0"

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

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: cmap
-data:
-  ansible_version: {{ .Values.ansible_version }}
-  phase: {{ .Values.phase }}

tests/integration/targets/helm_diff/files/test-chart-reuse-values/values.yaml

@@ -1,2 +0,0 @@
-ansible_version: milestone
-phase: uat

tests/integration/targets/helm_diff/playbook.yaml

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

tests/integration/targets/helm_diff/runme.sh

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

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

@@ -143,8 +143,6 @@
         chart_ref: "{{ test_chart_ref }}"
         values:
           foo: gaz
-        values_files:
-          - "{{ test_chart_ref }}/values.yml"
       register: install
 
     - assert:
@@ -159,46 +157,6 @@
         chart_ref: "{{ test_chart_ref }}"
         values:
           foo: gaz
-        values_files:
-          - "{{ test_chart_ref }}/values.yml"
-      register: install
-
-    - assert:
-        that:
-          - install is not changed
-
-    - name: Upgrade with set_values
-      helm:
-        binary_path: "{{ helm_binary }}"
-        name: test-chart
-        namespace: "{{ helm_namespace }}"
-        chart_ref: "{{ test_chart_ref }}"
-        values:
-          foo: gaz
-        values_files:
-          - "{{ test_chart_ref }}/values.yml"
-        set_values:
-          - value: foo=qux
-            value_type: string
-      register: install
-
-    - assert:
-        that:
-          - install is changed
-
-    - name: Upgrade with set_values idempotency check
-      helm:
-        binary_path: "{{ helm_binary }}"
-        name: test-chart
-        namespace: "{{ helm_namespace }}"
-        chart_ref: "{{ test_chart_ref }}"
-        values:
-          foo: gaz
-        values_files:
-          - "{{ test_chart_ref }}/values.yml"
-        set_values:
-          - value: foo=qux
-            value_type: string
       register: install
 
     - assert:
@@ -298,7 +256,4 @@
         kind: Namespace
         name: "{{ helm_namespace }}"
         state: absent
-        wait: true
       ignore_errors: yes
-
-- include_tasks: reuse_values.yml