Release 3.3.1 (#890)

Release 3.3.1

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

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

.ansible-lint-ignore

@@ -1,2 +1,7 @@
+# https://docs.ansible.com/ansible-lint/docs/rules/
 # no-changed-when is not requried for examples
 plugins/connection/kubectl.py no-changed-when
+# false positive result
+plugins/connection/kubectl.py var-naming[no-reserved]
+# stable-3 branch support ansible-core>=2.14.0
+meta/runtime.yml meta-runtime[unsupported-version]

.config/ansible-lint.yml

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

.github/stale.yml

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

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

@@ -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/linters.yaml

@@ -19,6 +19,5 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-
-      - name: Run ansible-lint
-        uses: ansible/ansible-lint@v24.2.3
+      - name: run-ansible-lint
+        uses: ansible/ansible-lint@v24.12.2

.gitignore

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

.yamllint

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

CHANGELOG.rst

@@ -4,18 +4,48 @@ Kubernetes Collection Release Notes
 
 .. contents:: Topics
 
+v3.3.1
+======
+
+Release Summary
+---------------
+
+This release fixes the CI issues with the ``linters`` workflow.
+
+v3.3.0
+======
+
+Minor Changes
+-------------
+
+- inventory/k8s.py - Defer removal of k8s inventory plugin to version 5.0 (https://github.com/ansible-collections/kubernetes.core/pull/723).
+- inventory/k8s.py - Defer removal of k8s inventory plugin to version 6.0.0 (https://github.com/ansible-collections/kubernetes.core/pull/734).
+- k8s_drain - Improve error message for pod disruption budget when draining a node (https://github.com/ansible-collections/kubernetes.core/issues/797).
+
+Bugfixes
+--------
+
+- helm - Helm version checks did not support RC versions. They now accept any version tags. (https://github.com/ansible-collections/kubernetes.core/pull/745).
+- helm_pull - Apply no_log=True to pass_credentials to silence false positive warning.. (https://github.com/ansible-collections/kubernetes.core/pull/796).
+- k8s_drain - Fix k8s_drain does not wait for single pod (https://github.com/ansible-collections/kubernetes.core/issues/769).
+- k8s_drain - Fix k8s_drain runs into a timeout when evicting a pod which is part of a stateful set  (https://github.com/ansible-collections/kubernetes.core/issues/792).
+- kubeconfig option should not appear in module invocation log (https://github.com/ansible-collections/kubernetes.core/issues/782).
+- kustomize - kustomize plugin fails with deprecation warnings (https://github.com/ansible-collections/kubernetes.core/issues/639).
+- waiter - Fix waiting for daemonset when desired number of pods is 0. (https://github.com/ansible-collections/kubernetes.core/pull/756).
+
 v3.2.0
 ======
 
 Release Summary
 ---------------
+
 This release comes with documentation updates.
 
 Minor Changes
 -------------
 
-- inventory/k8s.py - Defer removal of k8s inventory plugin to version 6.0.0 (https://github.com/ansible-collections/kubernetes.core/pull/734).
 - connection/kubectl.py - Added an example of using the kubectl connection plugin to the documentation (https://github.com/ansible-collections/kubernetes.core/pull/741).
+- inventory/k8s.py - Defer removal of k8s inventory plugin to version 6.0.0 (https://github.com/ansible-collections/kubernetes.core/pull/734).
 
 v3.1.0
 ======

Makefile

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

README.md

@@ -4,10 +4,14 @@
 
 This repository hosts the `kubernetes.core` (formerly known as `community.kubernetes`) Ansible Collection.
 
+## Description
+
 The collection includes a variety of Ansible content to help automate the management of applications in Kubernetes and OpenShift clusters, as well as the provisioning and maintenance of clusters themselves.
 
+## Requirements
+
 <!--start requires_ansible-->
-## Ansible version compatibility
+### Ansible version compatibility
 
 This collection has been tested against following Ansible versions: **>=2.14.0**.
 
@@ -18,43 +22,43 @@ A collection may contain metadata that identifies these versions.
 PEP440 is the schema used to describe the versions of Ansible.
 <!--end requires_ansible-->
 
-## Python Support
+### Python Support
 
 * Collection supports 3.9+
 
 Note: Python2 is deprecated from [1st January 2020](https://www.python.org/doc/sunset-python-2/). Please switch to Python3.
 
-## Kubernetes Version Support
+### Kubernetes Version Support
 
 This collection supports Kubernetes versions >= 1.24.
 
-## Included content
+### Included content
 
 Click on the name of a plugin or module to view that content's documentation:
 
 <!--start collection content-->
-### Connection plugins
+#### Connection plugins
 Name | Description
 --- | ---
 [kubernetes.core.kubectl](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.kubectl_connection.rst)|Execute tasks in pods running on Kubernetes.
 
-### K8s filter plugins
+#### K8s filter plugins
 Name | Description
 --- | ---
 kubernetes.core.k8s_config_resource_name|Generate resource name for the given resource of type ConfigMap, Secret
 
-### Inventory plugins
+#### Inventory plugins
 Name | Description
 --- | ---
 [kubernetes.core.k8s](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.k8s_inventory.rst)|Kubernetes (K8s) inventory source
 
-### Lookup plugins
+#### Lookup plugins
 Name | Description
 --- | ---
 [kubernetes.core.k8s](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.k8s_lookup.rst)|Query the K8s API
 [kubernetes.core.kustomize](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.kustomize_lookup.rst)|Build a set of kubernetes resources using a 'kustomization.yaml' file.
 
-### Modules
+#### Modules
 Name | Description
 --- | ---
 [kubernetes.core.helm](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/kubernetes.core.helm_module.rst)|Manages Kubernetes packages with the Helm package manager
@@ -79,9 +83,7 @@ Name | Description
 
 <!--end collection content-->
 
-## Installation and Usage
-
-### Installing the Collection from Ansible Galaxy
+## Installation
 
 Before using the Kubernetes collection, you need to install it with the Ansible Galaxy CLI:
 
@@ -93,7 +95,7 @@ You can also include it in a `requirements.yml` file and install it via `ansible
 ---
 collections:
   - name: kubernetes.core
-    version: 3.2.0
+    version: 3.3.1
 ```
 
 ### Installing the Kubernetes Python Library
@@ -102,7 +104,7 @@ Content in this collection requires the [Kubernetes Python client](https://pypi.
 
     pip3 install kubernetes
 
-### Using modules from the Kubernetes Collection in your playbooks
+## Use Cases
 
 It's preferable to use content in this collection using their Fully Qualified Collection Namespace (FQCN), for example `kubernetes.core.k8s_info`:
 
@@ -189,12 +191,16 @@ defined in the playbook using `environment` keyword as above, you must set it us
 
 Please read more about Ansible Turbo mode - [here](https://github.com/ansible-collections/kubernetes.core/blob/main/docs/ansible_turbo_mode.rst).
 
-## Testing and Development
+## Contributing to this collection
 
 If you want to develop new content for this collection or improve what's already here, the easiest way to work on the collection is to clone it into one of the configured [`COLLECTIONS_PATHS`](https://docs.ansible.com/ansible/latest/reference_appendices/config.html#collections-paths), and work on it there.
 
 See [Contributing to kubernetes.core](CONTRIBUTING.md).
 
+## Testing
+
+[![Linters](https://img.shields.io/github/actions/workflow/status/ansible-collections/kubernetes.core/linters.yaml?label=linters)](https://github.com/ansible-collections/kubernetes.core/actions/workflows/linters.yaml) [![Integration tests](https://img.shields.io/github/actions/workflow/status/ansible-collections/kubernetes.core/integration-tests.yaml?label=integration%20tests)](https://github.com/ansible-collections/kubernetes.core/actions/workflows/integration-tests.yaml) [![Sanity tests](https://img.shields.io/github/actions/workflow/status/ansible-collections/kubernetes.core/sanity-tests.yaml?label=sanity%20tests)](https://github.com/ansible-collections/kubernetes.core/actions/workflows/sanity-tests.yaml) [![Unit tests](https://img.shields.io/github/actions/workflow/status/ansible-collections/kubernetes.core/unit-tests.yaml?label=unit%20tests)](https://github.com/ansible-collections/kubernetes.core/actions/workflows/unit-tests.yaml) [![Codecov](https://img.shields.io/codecov/c/github/ansible-collections/kubernetes.core)](https://app.codecov.io/gh/ansible-collections/kubernetes.core)
+
 ### Testing with `ansible-test`
 
 The `tests` directory contains configuration for running sanity and integration tests using [`ansible-test`](https://docs.ansible.com/ansible/latest/dev_guide/testing_integration.html).
@@ -231,10 +237,36 @@ After the version is published, verify it exists on the [Kubernetes Collection G
 
 The process for uploading a supported release to Automation Hub is documented separately.
 
+## Support
+
+<!--List available communication channels. In addition to channels specific to your collection, we also recommend to use the following ones.-->
+
+We announce releases and important changes through Ansible's [The Bullhorn newsletter](https://github.com/ansible/community/wiki/News#the-bullhorn). Be sure you are [subscribed](https://eepurl.com/gZmiEP).
+
+We take part in the global quarterly [Ansible Contributor Summit](https://github.com/ansible/community/wiki/Contributor-Summit) virtually or in-person. Track [The Bullhorn newsletter](https://eepurl.com/gZmiEP) and join us.
+
+For more information about communication, refer to the [Ansible Communication guide](https://docs.ansible.com/ansible/devel/community/communication.html).
+
+For the latest supported versions, refer to the release notes below.
+
+If you encounter issues or have questions, you can submit a support request through the following channels:
+ - GitHub Issues: Report bugs, request features, or ask questions by opening an issue in the [GitHub repository]((https://github.com/ansible-collections/kubernetes.core/).
+
+## Release notes
+
+See the [raw generated changelog](https://github.com/ansible-collections/kubernetes.core/blob/main/CHANGELOG.rst).
+
 ## More Information
 
 For more information about Ansible's Kubernetes integration, join the `#ansible-kubernetes` channel on [libera.chat](https://libera.chat/) IRC, and browse the resources in the [Kubernetes Working Group](https://github.com/ansible/community/wiki/Kubernetes) Community wiki page.
 
+## Code of Conduct
+
+We follow the [Ansible Code of Conduct](https://docs.ansible.com/ansible/devel/community/code_of_conduct.html) in all our interactions within this project.
+
+If you encounter abusive behavior, please refer to the [policy violations](https://docs.ansible.com/ansible/devel/community/code_of_conduct.html#policy-violations) section of the Code for information on how to raise a complaint.
+
+
 ## License
 
 GNU General Public License v3.0 or later

changelogs/changelog.yaml

@@ -857,11 +857,51 @@ releases:
   3.2.0:
     changes:
       minor_changes:
-      - inventory/k8s.py - Defer removal of k8s inventory plugin to version 6.0.0 (https://github.com/ansible-collections/kubernetes.core/pull/734).
-      - connection/kubectl.py - Added an example of using the kubectl connection plugin to the documentation (https://github.com/ansible-collections/kubernetes.core/pull/741).
+      - connection/kubectl.py - Added an example of using the kubectl connection plugin
+        to the documentation (https://github.com/ansible-collections/kubernetes.core/pull/741).
+      - inventory/k8s.py - Defer removal of k8s inventory plugin to version 5.0 (https://github.com/ansible-collections/kubernetes.core/pull/723).
+      - inventory/k8s.py - Defer removal of k8s inventory plugin to version 6.0.0
+        (https://github.com/ansible-collections/kubernetes.core/pull/734).
       release_summary: This release comes with documentation updates.
     fragments:
     - 20240530-defer-removal-and-ansible-core-support-update.yaml
     - 20240601-doc-example-of-using-kubectl.yaml
     - 3.2.0.yml
+    - inventory-update_removal_date.yml
     release_date: '2024-06-14'
+  3.3.0:
+    changes:
+      bugfixes:
+      - helm - Helm version checks did not support RC versions. They now accept any
+        version tags. (https://github.com/ansible-collections/kubernetes.core/pull/745).
+      - helm_pull - Apply no_log=True to pass_credentials to silence false positive
+        warning. (https://github.com/ansible-collections/kubernetes.core/pull/796).
+      - k8s_drain - Fix k8s_drain does not wait for single pod (https://github.com/ansible-collections/kubernetes.core/issues/769).
+      - k8s_drain - Fix k8s_drain runs into a timeout when evicting a pod which is
+        part of a stateful set  (https://github.com/ansible-collections/kubernetes.core/issues/792).
+      - kubeconfig option should not appear in module invocation log (https://github.com/ansible-collections/kubernetes.core/issues/782).
+      - kustomize - kustomize plugin fails with deprecation warnings (https://github.com/ansible-collections/kubernetes.core/issues/639).
+      - waiter - Fix waiting for daemonset when desired number of pods is 0. (https://github.com/ansible-collections/kubernetes.core/pull/756).
+      minor_changes:
+      - k8s_drain - Improve error message for pod disruption budget when draining
+        a node (https://github.com/ansible-collections/kubernetes.core/issues/797).
+      release_summary: This release comes with improvements to the error messages in the k8s_drain module and several bug fixes.
+    fragments:
+    - 20240530-ansible-core-support-update.yaml
+    - 20240611-helm-rc-version.yaml
+    - 20240620-fix-kustomize-plugin-fails-with-deprecation-warnings.yml
+    - 20241102-fix-ci-post-2.18-issue.yaml
+    - 20241213-kubeconfig-set-no_log-true.yaml
+    - 756-fix-daemonset-waiting.yaml
+    - 770-fix-k8s-drain-doesnt-wait-for-single-pod.yaml
+    - 793-fix-k8s-drain-runs-into-timeout.yaml
+    - 796-false-positive-helmull.yaml
+    - 798-drain-pdb-error-message.yaml
+    - readme_template_update.yml
+    release_date: '2025-01-22'
+  3.3.1:
+    changes:
+      release_summary: This release fixes the CI issues with the ``linters`` workflow.
+    fragments:
+    - release_summary.yml
+    release_date: '2025-03-26'

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

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

changelogs/fragments/inventory-update_removal_date.yml

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

docs/kubernetes.core.helm_module.rst

@@ -443,7 +443,7 @@ Parameters
                     <div style="font-size: small">
                         <span style="color: purple">boolean</span>
                     </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.5.0</div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 3.0.0</div>
                 </td>
                 <td>
                         <ul style="margin: 0; padding: 0"><b>Choices:</b>
@@ -463,7 +463,7 @@ Parameters
                     <div style="font-size: small">
                         <span style="color: purple">boolean</span>
                     </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.5.0</div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 3.0.0</div>
                 </td>
                 <td>
                         <ul style="margin: 0; padding: 0"><b>Choices:</b>

docs/kubernetes.core.k8s_drain_module.rst

@@ -423,7 +423,7 @@ Parameters
                         <span style="color: purple">list</span>
                          / <span style="color: purple">elements=string</span>
                     </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.5.0</div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 3.0.0</div>
                 </td>
                 <td>
                 </td>

docs/kubernetes.core.k8s_info_module.rst

@@ -168,7 +168,7 @@ Parameters
                         <span style="color: purple">list</span>
                          / <span style="color: purple">elements=string</span>
                     </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.5.0</div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 3.0.0</div>
                 </td>
                 <td>
                 </td>

docs/kubernetes.core.k8s_module.rst

@@ -216,7 +216,7 @@ Parameters
                     <div style="font-size: small">
                         <span style="color: purple">boolean</span>
                     </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.5.0</div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 3.0.0</div>
                 </td>
                 <td>
                         <ul style="margin: 0; padding: 0"><b>Choices:</b>
@@ -389,7 +389,7 @@ Parameters
                         <span style="color: purple">list</span>
                          / <span style="color: purple">elements=string</span>
                     </div>
-                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 2.5.0</div>
+                    <div style="font-style: italic; font-size: small; color: darkgreen">added in 3.0.0</div>
                 </td>
                 <td>
                 </td>

galaxy.yml

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

plugins/lookup/kustomize.py

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

plugins/module_utils/args_common.py

@@ -18,7 +18,7 @@ AUTH_PROXY_HEADERS_SPEC = dict(
 )
 
 AUTH_ARG_SPEC = {
-    "kubeconfig": {"type": "raw"},
+    "kubeconfig": {"type": "raw", "no_log": True},
     "context": {},
     "host": {},
     "api_key": {"no_log": True},

plugins/module_utils/helm.py

@@ -77,7 +77,6 @@ def write_temp_kubeconfig(server, validate_certs=True, ca_cert=None, kubeconfig=
 
 
 class AnsibleHelmModule(object):
-
     """
     An Ansible module class for Kubernetes.core helm modules
     """
@@ -184,10 +183,10 @@ class AnsibleHelmModule(object):
     def get_helm_version(self):
         command = self.get_helm_binary() + " version"
         rc, out, err = self.run_command(command)
-        m = re.match(r'version.BuildInfo{Version:"v([0-9\.]*)",', out)
+        m = re.match(r'version.BuildInfo{Version:"v(.*?)",', out)
         if m:
             return m.group(1)
-        m = re.match(r'Client: &version.Version{SemVer:"v([0-9\.]*)", ', out)
+        m = re.match(r'Client: &version.Version{SemVer:"v(.*?)", ', out)
         if m:
             return m.group(1)
         return None

plugins/module_utils/helm_args_common.py

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

plugins/module_utils/k8s/waiter.py

@@ -51,7 +51,7 @@ def daemonset_ready(daemonset: ResourceInstance) -> bool:
     return bool(
         daemonset.status
         and daemonset.status.desiredNumberScheduled is not None
-        and daemonset.status.updatedNumberScheduled
+        and (daemonset.status.updatedNumberScheduled or 0)
         == daemonset.status.desiredNumberScheduled
         and daemonset.status.numberReady == daemonset.status.desiredNumberScheduled
         and daemonset.status.observedGeneration == daemonset.metadata.generation

plugins/modules/helm.py

@@ -137,14 +137,14 @@ options:
       - If I(reset_values) is set to C(True), this is ignored.
     type: bool
     required: false
-    version_added: 2.5.0
+    version_added: 3.0.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: 3.0.0
 
 #Helm options
   disable_hook:

plugins/modules/helm_pull.py

@@ -189,7 +189,7 @@ def main():
         repo_password=dict(
             type="str", no_log=True, aliases=["password", "chart_repo_password"]
         ),
-        pass_credentials=dict(type="bool", default=False),
+        pass_credentials=dict(type="bool", default=False, no_log=False),
         skip_tls_certs_check=dict(type="bool", default=False),
         chart_devel=dict(type="bool"),
         untar_chart=dict(type="bool", default=False),

plugins/modules/k8s.py

@@ -182,7 +182,7 @@ options:
     - 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
+    version_added: 3.0.0
     aliases:
     - all
   hidden_fields:
@@ -192,7 +192,7 @@ options:
       - 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
+    version_added: 3.0.0
 
 requirements:
   - "python >= 3.9"

plugins/modules/k8s_drain.py

@@ -47,7 +47,7 @@ options:
       - This option has effect only when C(state) is set to I(drain).
     type: list
     elements: str
-    version_added: 2.5.0
+    version_added: 3.0.0
     aliases:
     - label_selectors
   delete_options:
@@ -143,6 +143,7 @@ result:
 """
 
 import copy
+import json
 import time
 import traceback
 from datetime import datetime
@@ -187,6 +188,17 @@ except ImportError:
         HAS_EVICTION_API = False
 
 
+def format_dynamic_api_exc(exc):
+    if exc.body:
+        if exc.headers and exc.headers.get("Content-Type") == "application/json":
+            message = json.loads(exc.body).get("message")
+            if message:
+                return message
+        return exc.body
+    else:
+        return "%s Reason: %s" % (exc.status, exc.reason)
+
+
 def filter_pods(pods, force, ignore_daemonset, delete_emptydir_data):
     k8s_kind_mirror = "kubernetes.io/config.mirror"
     daemonSet, unmanaged, mirror, localStorage, to_delete = [], [], [], [], []
@@ -291,16 +303,19 @@ class K8sDrainAnsible(object):
             return (datetime.now() - start).seconds
 
         response = None
-        pod = pods.pop()
+        pod = None
         while (_elapsed_time() < wait_timeout or wait_timeout == 0) and pods:
             if not pod:
-                pod = pods.pop()
+                pod = pods[-1]
             try:
                 response = self._api_instance.read_namespaced_pod(
                     namespace=pod[0], name=pod[1]
                 )
-                if not response:
+                if not response or response.spec.node_name != self._module.params.get(
+                    "name"
+                ):
                     pod = None
+                    del pods[-1]
                 time.sleep(wait_sleep)
             except ApiException as exc:
                 if exc.reason != "Not Found":
@@ -308,6 +323,7 @@ class K8sDrainAnsible(object):
                         msg="Exception raised: {0}".format(exc.reason)
                     )
                 pod = None
+                del pods[-1]
             except Exception as e:
                 self._module.fail_json(msg="Exception raised: {0}".format(to_native(e)))
         if not pods:
@@ -334,7 +350,7 @@ class K8sDrainAnsible(object):
                 if exc.reason != "Not Found":
                     self._module.fail_json(
                         msg="Failed to delete pod {0}/{1} due to: {2}".format(
-                            namespace, name, exc.reason
+                            namespace, name, to_native(format_dynamic_api_exc(exc))
                         )
                     )
             except Exception as exc:

plugins/modules/k8s_info.py

@@ -51,7 +51,7 @@ options:
       - 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
+    version_added: 3.0.0
 
 extends_documentation_fragment:
   - kubernetes.core.k8s_auth_options

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

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

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

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

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

@@ -374,8 +374,8 @@
         chart_ref: "{{ chart_source }}"
         chart_version: "{{ chart_source_version | default(omit) }}"
         disable_hook: True
-        release_name: "MyRelease"
-        release_namespace: "MyReleaseNamespace"
+        release_name: "myrelease"
+        release_namespace: "myreleasenamespace"
         show_only:
           - "templates/configmap.yaml"
         release_values:
@@ -388,7 +388,7 @@
           - result is changed
           - result is not failed
           - result.rc == 0
-          - result.command is match("{{ helm_binary }} template MyRelease {{ chart_source }}")
+          - result.command is match(helm_binary+" template myrelease "+chart_source)
           - result.stdout is search("ThisValue")
       when: chart_source is search("test-chart")
       # limit assertion of test result to controlled (local) chart_source

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

tests/integration/targets/push_to_helm_registry/aliases

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

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

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

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

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

tests/integration/targets/setup_helm_registry/aliases

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

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

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

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

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

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

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

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

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

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

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

tests/sanity/ignore-2.14.txt

@@ -34,3 +34,4 @@ plugins/modules/k8s_service.py validate-modules:return-syntax-error
 plugins/modules/k8s_taint.py validate-modules:return-syntax-error
 tests/integration/targets/k8s_delete/files/deployments.yaml yamllint!skip
 tests/integration/targets/helm_diff/files/test-chart-reuse-values/templates/configmap.yaml yamllint!skip
+tests/integration/targets/helm_diff/files/test-chart-deployment-time/templates/configmap.yaml yamllint!skip

tests/sanity/ignore-2.15.txt

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

tests/sanity/ignore-2.16.txt

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

tests/sanity/ignore-2.17.txt

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

tests/sanity/ignore-2.18.txt

@@ -1,15 +1,12 @@
-plugins/module_utils/client/discovery.py import-3.9!skip
-plugins/module_utils/client/discovery.py import-3.10!skip
 plugins/module_utils/client/discovery.py import-3.11!skip
 plugins/module_utils/client/discovery.py import-3.12!skip
-plugins/module_utils/client/resource.py import-3.9!skip
-plugins/module_utils/client/resource.py import-3.10!skip
+plugins/module_utils/client/discovery.py import-3.13!skip
 plugins/module_utils/client/resource.py import-3.11!skip
 plugins/module_utils/client/resource.py import-3.12!skip
-plugins/module_utils/k8sdynamicclient.py import-3.9!skip
-plugins/module_utils/k8sdynamicclient.py import-3.10!skip
+plugins/module_utils/client/resource.py import-3.13!skip
 plugins/module_utils/k8sdynamicclient.py import-3.11!skip
 plugins/module_utils/k8sdynamicclient.py import-3.12!skip
+plugins/module_utils/k8sdynamicclient.py import-3.13!skip
 plugins/module_utils/version.py pylint!skip
 plugins/modules/k8s.py validate-modules:parameter-type-not-in-doc
 plugins/modules/k8s_scale.py validate-modules:parameter-type-not-in-doc
@@ -29,3 +26,4 @@ plugins/modules/k8s_scale.py validate-modules:return-syntax-error
 plugins/modules/k8s_service.py validate-modules:return-syntax-error
 plugins/modules/k8s_taint.py validate-modules:return-syntax-error
 tests/integration/targets/helm_diff/files/test-chart-reuse-values/templates/configmap.yaml yamllint!skip
+tests/integration/targets/helm_diff/files/test-chart-deployment-time/templates/configmap.yaml yamllint!skip

tests/sanity/ignore-2.19.txt

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

tests/unit/module_utils/test_helm.py

@@ -200,6 +200,10 @@ def test_module_get_values(_ansible_helm_module, no_values, get_all):
             'version.BuildInfo{Version:"v3.10.3", GitCommit:7870ab3ed4135f136eec, GoVersion:"go1.18.9"}',
             "3.10.3",
         ),
+        (
+            'version.BuildInfo{Version:"v3.15.0-rc.1", GitCommit:"d7afa3b6b432c09a02cd07342e908ba5bed34940", GitTreeState:"clean", GoVersion:"go1.22.4"}',
+            "3.15.0-rc.1",
+        ),
         ('Client: &version.Version{SemVer:"v3.12.3", ', "3.12.3"),
         ('Client: &version.Version{SemVer:"v3.12.3"', None),
     ],

tools/kubevirt_list_targets.py

@@ -1,22 +0,0 @@
-import os
-import sys
-from pathlib import PosixPath
-
-
-def main():
-
-    src = sys.argv[1]
-    path = PosixPath(src) / PosixPath("tests/integration/targets/")
-
-    def _is_disable(path):
-        flags = ("unsupported", "disabled", "unstable", "hidden")
-        aliases_path = path / PosixPath("aliases")
-        return (aliases_path.exists() and any((d.startswith(flags) for d in aliases_path.read_text().split("\n"))))
-
-    targets = [i.stem for i in path.glob("*") if i.is_dir() and not _is_disable(i)]
-    with open(os.environ.get("GITHUB_OUTPUT"), "a", encoding="utf-8") as fw:
-        fw.write(f"kubevirt_targets={targets}\n")
-
-
-if __name__ == "__main__":
-    main()