Ensure compatibility with Helm v4 for the collection (#1090) (#1096)

This is a backport of PR #1090 as merged into main (e6076e5).
SUMMARY

Ensure compatibility with Helm v4 for modules helm_plugin and helm_plugin_info
Partially addresses #1038

ISSUE TYPE


Feature Pull Request

COMPONENT NAME

helm_plugin
helm_plugin_info
helm_info
helm_pull
helm_registry_auth
helm
helm_template

Reviewed-by: Bikouo Aubin
Reviewed-by: Matthew Johnson

tests/integration/targets/helm_repository/aliases

@@ -1,5 +1,2 @@
-time=20
-helm_repository
-helm_info
-helm
-helm_template
+time=1
+helm_repository

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

@@ -1,3 +1,5 @@
 ---
 chart_test_repo: "https://kubernetes.github.io/ingress-nginx"
-helm_binary: "/tmp/helm/{{ ansible_system | lower }}-amd64/helm"
+helm_versions:
+  - v3.20.0
+  - v4.0.0

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

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

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

@@ -1,101 +1,6 @@
 ---
-- name: "Ensure test_helm_repo doesn't exist"
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    state: absent
-
-- name: Add test_helm_repo chart repository
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    repo_url: "{{ chart_test_repo }}"
-  register: repository
-
-- name: Assert that test_helm_repo repository is added
-  assert:
-    that:
-      - repository is changed
-      - '"--insecure-skip-tls-verify" not in repository.command'
-
-- name: Check idempotency
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    repo_url: "{{ chart_test_repo }}"
-  register: repository
-
-- name: Assert idempotency
-  assert:
-    that:
-      - repository is not changed
-
-- name: Failed to add repository with the same name
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    repo_url: "https://other-charts.url"
-  register: repository_errors
-  ignore_errors: yes
-
-- name: Assert that adding repository with the same name failed
-  assert:
-    that:
-      - repository_errors is failed
-
-- name: Succesfully add repository with the same name when forcing
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    repo_url: "{{ chart_test_repo }}"
-    force: true
-  register: repository
-
-- name: Assert that test_helm_repo repository is changed
-  assert:
-    that:
-      - repository is changed
-
-- name: Remove test_helm_repo chart repository
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    state: absent
-  register: repository
-
-- name: Assert that test_helm_repo repository is removed
-  assert:
-    that:
-      - repository is changed
-
-- name: Check idempotency after remove
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    state: absent
-  register: repository
-
-- name: Assert idempotency
-  assert:
-    that:
-      - repository is not changed
-
-- name: Add test_helm_repo chart repository as insecure
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    repo_url: "{{ chart_test_repo }}"
-    insecure_skip_tls_verify: true
-  register: repository
-
-- name: Assert that repository added and flag set
-  assert:
-    that:
-      - repository is changed
-      - '"--insecure-skip-tls-verify" in repository.command'
-
-- name: Clean test_helm_repo chart repository
-  helm_repository:
-    binary_path: "{{ helm_binary }}"
-    name: test_helm_repo
-    state: absent
+- name: Run test for helm_repository module
+  ansible.builtin.include_tasks: run_tests.yml
+  loop: "{{ helm_versions }}"
+  loop_control:
+    loop_var: helm_version

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

@@ -0,0 +1,105 @@
+---
+- name: "Install helm version {{ helm_version }}"
+  ansible.builtin.include_role:
+    name: install_helm
+
+- name: "Ensure test_helm_repo doesn't exist"
+  helm_repository:
+    binary_path: "{{ helm_binary }}"
+    name: test_helm_repo
+    state: absent
+
+- name: Add test_helm_repo chart repository
+  helm_repository:
+    binary_path: "{{ helm_binary }}"
+    name: test_helm_repo
+    repo_url: "{{ chart_test_repo }}"
+  register: repository
+
+- name: Assert that test_helm_repo repository is added
+  assert:
+    that:
+      - repository is changed
+      - '"--insecure-skip-tls-verify" not in repository.command'
+
+- name: Check idempotency
+  helm_repository:
+    binary_path: "{{ helm_binary }}"
+    name: test_helm_repo
+    repo_url: "{{ chart_test_repo }}"
+  register: repository
+
+- name: Assert idempotency
+  assert:
+    that:
+      - repository is not changed
+
+- name: Failed to add repository with the same name
+  helm_repository:
+    binary_path: "{{ helm_binary }}"
+    name: test_helm_repo
+    repo_url: "https://other-charts.url"
+  register: repository_errors
+  ignore_errors: true
+
+- name: Assert that adding repository with the same name failed
+  assert:
+    that:
+      - repository_errors is failed
+
+- name: Succesfully add repository with the same name when forcing
+  helm_repository:
+    binary_path: "{{ helm_binary }}"
+    name: test_helm_repo
+    repo_url: "{{ chart_test_repo }}"
+    force: true
+  register: repository
+
+- name: Assert that test_helm_repo repository is changed
+  assert:
+    that:
+      - repository is changed
+
+- name: Remove test_helm_repo chart repository
+  helm_repository:
+    binary_path: "{{ helm_binary }}"
+    name: test_helm_repo
+    state: absent
+  register: repository
+
+- name: Assert that test_helm_repo repository is removed
+  assert:
+    that:
+      - repository is changed
+
+- name: Check idempotency after remove
+  helm_repository:
+    binary_path: "{{ helm_binary }}"
+    name: test_helm_repo
+    state: absent
+  register: repository
+
+- name: Assert idempotency
+  assert:
+    that:
+      - repository is not changed
+
+- name: Add test_helm_repo chart repository as insecure
+  helm_repository:
+    binary_path: "{{ helm_binary }}"
+    name: test_helm_repo
+    repo_url: "{{ chart_test_repo }}"
+    insecure_skip_tls_verify: true
+  register: repository
+
+- name: Assert that repository added and flag set
+  assert:
+    that:
+      - repository is changed
+      - '"--insecure-skip-tls-verify" in repository.command'
+
+- name: Clean test_helm_repo chart repository
+  helm_repository:
+    binary_path: "{{ helm_binary }}"
+    name: test_helm_repo
+    state: absent