helm - expand kubeconfig path with user's home dir (#654 ) (#696 )

[backport/stable-2.4] helm - expand kubeconfig path with user's home dir (#654) helm - expand kubeconfig path with user's home dir SUMMARY Currently the helm module fails when providing the default kubeconfig path explicitly, while the same path is fine for the k8s module. ISSUE TYPE Bugfix Pull Request COMPONENT NAME helm ADDITIONAL INFORMATION name: Deploy kubelet-csr-approver delegate_to: client run_once: true kubernetes.core.helm: update_repo_cache: true kubeconfig: "~/.kube/config" state: present name: kubelet-csr-approver namespace: kubelet-csr-approver create_namespace: true chart_ref: kubelet-csr-approver/kubelet-csr-approver chart_version: 1.0.5 values: "{{ lookup('template', 'values.yaml.j2') | from_yaml }}" atomic: true Before change: TASK [kubernetes/kubelet_csr_approver : Deploy kubelet-csr-approver] *** An exception occurred during task execution. To see the full traceback, use -vvv. The error was: FileNotFoundError: [Errno 2] No such file or directory: '/.kube/config' fatal: [node-1 -> client(192.168.121.56)]: FAILED! => {"changed": false, "module_stderr": "", "module_stdout": "Traceback (most recent call last):\r\n File "/home/vagrant/.ansible/tmp/ansible-tmp-1697293347.7135417-118207-9805169252135/AnsiballZ_helm.py", line 107, in \r\n _ansiballz_main()\r\n File "/home/vagrant/.ansible/tmp/ansible-tmp-1697293347.7135417-118207-9805169252135/AnsiballZ_helm.py", line 99, in _ansiballz_main\r\n invoke_module(zipped_mod, temp_path, ANSIBALLZ_PARAMS)\r\n File "/home/vagrant/.ansible/tmp/ansible-tmp-1697293347.7135417-118207-9805169252135/AnsiballZ_helm.py", line 47, in invoke_module\r\n runpy.run_module(mod_name='ansible_collections.kubernetes.core.plugins.modules.helm', init_globals=dict(_module_fqn='ansible_collections.kubernetes.core.plugins.modules.helm', _modlib_path=modlib_path),\r\n File "/usr/lib/python3.10/runpy.py", line 224, in run_module\r\n return _run_module_code(code, init_globals, run_name, mod_spec)\r\n File "/usr/lib/python3.10/runpy.py", line 96, in _run_module_code\r\n _run_code(code, mod_globals, init_globals,\r\n File "/usr/lib/python3.10/runpy.py", line 86, in _run_code\r\n exec(code, run_globals)\r\n File "/tmp/ansible_kubernetes.core.helm_payload_o8s36dti/ansible_kubernetes.core.helm_payload.zip/ansible_collections/kubernetes/core/plugins/modules/helm.py", line 924, in \r\n File "/tmp/ansible_kubernetes.core.helm_payload_o8s36dti/ansible_kubernetes.core.helm_payload.zip/ansible_collections/kubernetes/core/plugins/modules/helm.py", line 737, in main\r\n File "/tmp/ansible_kubernetes.core.helm_payload_o8s36dti/ansible_kubernetes.core.helm_payload.zip/ansible_collections/kubernetes/core/plugins/modules/helm.py", line 435, in run_repo_update\r\n File "/tmp/ansible_kubernetes.core.helm_payload_o8s36dti/ansible_kubernetes.core.helm_payload.zip/ansible_collections/kubernetes/core/plugins/module_utils/helm.py", line 169, in run_helm_command\r\n File "/tmp/ansible_kubernetes.core.helm_payload_o8s36dti/ansible_kubernetes.core.helm_payload.zip/ansible_collections/kubernetes/core/plugins/module_utils/helm.py", line 162, in env_update\r\n File "/tmp/ansible_kubernetes.core.helm_payload_o8s36dti/ansible_kubernetes.core.helm_payload.zip/ansible_collections/kubernetes/core/plugins/module_utils/helm.py", line 120, in _prepare_helm_environment\r\nFileNotFoundError: [Errno 2] No such file or directory: '/.kube/config'\r\n", "msg": "MODULE FAILURE\nSee stdout/stderr for the exact error", "rc": 1} After change: TASK [kubernetes/kubelet_csr_approver : Deploy kubelet-csr-approver] *** changed: [node-1 -> client(192.168.121.56)] Reviewed-by: Mike Graves mgraves@redhat.com Reviewed-by: Bikouo Aubin (cherry picked from commit 9f7c865)
Prepare release 2.4.2 (#691 )
2026-05-12 12:32:05 +00:00 · 2024-03-13 13:58:51 +00:00 · 2024-03-04 11:02:22 +01:00 · 2024-03-01 17:42:08 +01:00
14 changed files with 81 additions and 238 deletions
--- a/.github/workflows/integration-tests.yaml
+++ b/.github/workflows/integration-tests.yaml
@@ -132,6 +132,8 @@ 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
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,18 @@ Kubernetes Collection Release Notes

 .. contents:: Topics

+v2.4.2
+======
+
+Release Summary
+---------------
+
+fix resource discovery when complex subresources present
+
+Bugfixes
+--------
+
+- Resolve Collections util resource discovery fails when complex subresources present (https://github.com/ansible-collections/kubernetes.core/pull/676).

 v2.4.1
 ======
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -764,7 +764,18 @@ releases:
    release_date: '2023-01-24'
  2.4.1:
    changes:
-      release_summary: The kubernetes.core 2.4.1 release includes several trivial bug fixes related to sanity.
+      release_summary: The kubernetes.core 2.4.1 release includes several trivial
+        bug fixes related to sanity.
    fragments:
    - fix_sanity_errors.yml
    release_date: '2024-02-06'
+  2.4.2:
+    changes:
+      bugfixes:
+      - Resolve Collections util resource discovery fails when complex subresources
+        present (https://github.com/ansible-collections/kubernetes.core/pull/676).
+      release_summary: fix resource discovery when complex subresources present
+    fragments:
+    - 2.4.2.yml
+    - 20240222-Collections-util-resource-discovery-fails-when-complex-subresources-present.yml
+    release_date: '2024-03-01'
--- a/changelogs/fragments/654-helm-expand-user.yml
+++ b/changelogs/fragments/654-helm-expand-user.yml
@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - helm - expand kubeconfig path with user's home directory for consistency with k8s
--- a/plugins/module_utils/client/discovery.py
+++ b/plugins/module_utils/client/discovery.py
@@ -114,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("/")
+            resource, name = subresource["name"].split("/", 1)
            subresources[resource][name] = subresource

        for resource in resources_raw:
--- a/plugins/module_utils/helm.py
+++ b/plugins/module_utils/helm.py
@@ -117,7 +117,7 @@ class AnsibleHelmModule(object):
        kubeconfig = self.params.get("kubeconfig")
        if kubeconfig:
            if isinstance(kubeconfig, string_types):
-                with open(kubeconfig) as fd:
+                with open(os.path.expanduser(kubeconfig)) as fd:
                    kubeconfig_content = yaml.safe_load(fd)
            elif isinstance(kubeconfig, dict):
                kubeconfig_content = kubeconfig
--- a/tests/integration/targets/helm_kubeconfig/tasks/main.yml
+++ b/tests/integration/targets/helm_kubeconfig/tasks/main.yml
@@ -1,6 +1,10 @@
 ---
 - name: Test helm with in-memory kubeconfig
  include_tasks: "from_in_memory_kubeconfig.yml"
+  loop_control:
+    loop_var: test_helm_version
+  with_items:
+    - "v3.10.3"

 - name: Test helm with custom kubeconfig and validate_certs=false
  include_tasks: "from_kubeconfig_with_validate_certs.yml"
@@ -8,12 +12,10 @@
    loop_var: test_helm_version
  with_items:
    - "v3.10.3"
-    - "v3.8.2"

 - name: Test helm with custom kubeconfig and ca_cert
  include_tasks: "from_kubeconfig_with_cacert.yml"
  loop_control:
    loop_var: test_helm_version
  with_items:
-    - "v3.5.1"
-    - "v3.4.2"
+    - "v3.10.3"
--- a/tests/integration/targets/k8s_info/tasks/discovery.yml
+++ b/tests/integration/targets/k8s_info/tasks/discovery.yml
@@ -0,0 +1,32 @@
+---
+# Testing fix for issue https://github.com/ansible-collections/kubernetes.core/pull/676
+- vars:
+    kubevirt_release: "v1.1.1"
+  block:
+    - name: Delete existing namespace
+      kubernetes.core.k8s:
+        kind: namespace
+        namespace: kubevirt
+        state: absent
+
+    - name: Create kubevirt resources
+      kubernetes.core.k8s:
+        state: present
+        apply: true
+        src: "{{ item }}"
+      with_items:
+        - "https://github.com/kubevirt/kubevirt/releases/download/{{ kubevirt_release }}/kubevirt-operator.yaml"
+        - "https://github.com/kubevirt/kubevirt/releases/download/{{ kubevirt_release }}/kubevirt-cr.yaml"
+
+    - name: Read kubevirt Deployment
+      k8s_info:
+        kind: Deployment
+        namespace: kubevirt
+  always:
+    - name: Delete existing namespace
+      kubernetes.core.k8s:
+        kind: namespace
+        namespace: kubevirt
+        state: absent
+        wait: true
+      ignore_errors: true
--- a/tests/integration/targets/k8s_info/tasks/main.yml
+++ b/tests/integration/targets/k8s_info/tasks/main.yml
@@ -3,3 +3,4 @@
  with_items:
    - wait
    - api-server-caching
+    - discovery
--- a/tests/sanity/ignore-2.14.txt
+++ b/tests/sanity/ignore-2.14.txt
@@ -1,9 +1,18 @@
+plugins/module_utils/client/discovery.py import-3.6!skip
+plugins/module_utils/client/discovery.py import-3.7!skip
+plugins/module_utils/client/discovery.py import-3.8!skip
 plugins/module_utils/client/discovery.py import-3.9!skip
 plugins/module_utils/client/discovery.py import-3.10!skip
 plugins/module_utils/client/discovery.py import-3.11!skip
+plugins/module_utils/client/resource.py import-3.6!skip
+plugins/module_utils/client/resource.py import-3.7!skip
+plugins/module_utils/client/resource.py import-3.8!skip
 plugins/module_utils/client/resource.py import-3.9!skip
 plugins/module_utils/client/resource.py import-3.10!skip
 plugins/module_utils/client/resource.py import-3.11!skip
+plugins/module_utils/k8sdynamicclient.py import-3.6!skip
+plugins/module_utils/k8sdynamicclient.py import-3.7!skip
+plugins/module_utils/k8sdynamicclient.py import-3.8!skip
 plugins/module_utils/k8sdynamicclient.py import-3.9!skip
 plugins/module_utils/k8sdynamicclient.py import-3.10!skip
 plugins/module_utils/k8sdynamicclient.py import-3.11!skip
@@ -19,7 +28,6 @@ tests/integration/targets/helm/files/test-chart-v2/templates/configmap.yaml yaml
 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
-tests/sanity/refresh_ignore_files shebang!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
--- a/tests/sanity/ignore-2.15.txt
+++ b/tests/sanity/ignore-2.15.txt
@@ -1,4 +1,3 @@
-plugins/module_utils/version.py pylint!skip
 plugins/module_utils/client/discovery.py import-3.6!skip
 plugins/module_utils/client/discovery.py import-3.7!skip
 plugins/module_utils/client/discovery.py import-3.8!skip
@@ -17,6 +16,7 @@ plugins/module_utils/k8sdynamicclient.py import-3.8!skip
 plugins/module_utils/k8sdynamicclient.py import-3.9!skip
 plugins/module_utils/k8sdynamicclient.py import-3.10!skip
 plugins/module_utils/k8sdynamicclient.py import-3.11!skip
+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
@@ -29,7 +29,6 @@ tests/integration/targets/helm/files/test-chart-v2/templates/configmap.yaml yaml
 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
-tests/sanity/refresh_ignore_files shebang!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
--- a/tests/sanity/ignore-2.16.txt
+++ b/tests/sanity/ignore-2.16.txt
@@ -1,4 +1,3 @@
-plugins/module_utils/version.py pylint!skip
 plugins/module_utils/client/discovery.py import-3.6!skip
 plugins/module_utils/client/discovery.py import-3.7!skip
 plugins/module_utils/client/discovery.py import-3.8!skip
@@ -20,6 +19,7 @@ plugins/module_utils/k8sdynamicclient.py import-3.9!skip
 plugins/module_utils/k8sdynamicclient.py import-3.10!skip
 plugins/module_utils/k8sdynamicclient.py import-3.11!skip
 plugins/module_utils/k8sdynamicclient.py import-3.12!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
@@ -32,7 +32,6 @@ tests/integration/targets/helm/files/test-chart-v2/templates/configmap.yaml yaml
 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
-tests/sanity/refresh_ignore_files shebang!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
--- a/tests/sanity/ignore-2.17.txt
+++ b/tests/sanity/ignore-2.17.txt
@@ -1,25 +1,16 @@
-plugins/module_utils/version.py pylint!skip
-plugins/module_utils/client/discovery.py import-3.6!skip
-plugins/module_utils/client/discovery.py import-3.7!skip
-plugins/module_utils/client/discovery.py import-3.8!skip
 plugins/module_utils/client/discovery.py import-3.9!skip
 plugins/module_utils/client/discovery.py import-3.10!skip
 plugins/module_utils/client/discovery.py import-3.11!skip
 plugins/module_utils/client/discovery.py import-3.12!skip
-plugins/module_utils/client/resource.py import-3.6!skip
-plugins/module_utils/client/resource.py import-3.7!skip
-plugins/module_utils/client/resource.py import-3.8!skip
 plugins/module_utils/client/resource.py import-3.9!skip
 plugins/module_utils/client/resource.py import-3.10!skip
 plugins/module_utils/client/resource.py import-3.11!skip
 plugins/module_utils/client/resource.py import-3.12!skip
-plugins/module_utils/k8sdynamicclient.py import-3.6!skip
-plugins/module_utils/k8sdynamicclient.py import-3.7!skip
-plugins/module_utils/k8sdynamicclient.py import-3.8!skip
 plugins/module_utils/k8sdynamicclient.py import-3.9!skip
 plugins/module_utils/k8sdynamicclient.py import-3.10!skip
 plugins/module_utils/k8sdynamicclient.py import-3.11!skip
 plugins/module_utils/k8sdynamicclient.py import-3.12!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
@@ -32,7 +23,6 @@ tests/integration/targets/helm/files/test-chart-v2/templates/configmap.yaml yaml
 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
-tests/sanity/refresh_ignore_files shebang!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
--- a/tests/sanity/refresh_ignore_files
+++ b/tests/sanity/refresh_ignore_files
@@ -1,216 +0,0 @@
-#!/usr/bin/env python3
-
-
-import itertools
-
-from pathlib import Path
-
-
-# Mapping of Ansible versions to supported Python versions
-ANSIBLE_VERSIONS = {
-    "2.9": ["3.6", "3.7", "3.8"],
-    "2.10": ["3.6", "3.7", "3.8", "3.9"],
-    "2.11": ["3.6", "3.7", "3.8", "3.9"],
-    "2.12": ["3.6", "3.7", "3.8", "3.9", "3.10"],
-    "2.13": ["3.6", "3.7", "3.8", "3.9", "3.10"],
-    "2.14": ["3.6", "3.7", "3.8", "3.9", "3.10"],
-    "2.15": ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"],
-}
-
-IMPORT_SKIPS = [
-    "plugins/module_utils/client/discovery.py",
-    "plugins/module_utils/client/resource.py",
-    "plugins/module_utils/k8sdynamicclient.py",
-]
-
-# Adds validate-modules:parameter-type-not-in-doc
-PARAM_TYPE_SKIPS = [
-    "plugins/modules/k8s.py",
-    "plugins/modules/k8s_scale.py",
-    "plugins/modules/k8s_service.py",
-]
-
-# Adds validate-modules:return-syntax-error
-RETURN_SYNTAX_SKIPS = [
-    "plugins/modules/k8s.py",
-    "plugins/modules/k8s_scale.py",
-    "plugins/modules/k8s_service.py",
-    "plugins/modules/k8s_taint.py",
-]
-
-YAML_LINT_SKIPS = [
-    "tests/unit/module_utils/fixtures/definitions.yml",
-    "tests/unit/module_utils/fixtures/deployments.yml",
-    "tests/unit/module_utils/fixtures/pods.yml",
-    "tests/integration/targets/helm/files/appversionless-chart-v2/templates/configmap.yaml",
-    "tests/integration/targets/helm/files/appversionless-chart/templates/configmap.yaml",
-    "tests/integration/targets/helm/files/test-chart-v2/templates/configmap.yaml",
-    "tests/integration/targets/helm/files/test-chart/templates/configmap.yaml",
-    "tests/integration/targets/helm_diff/files/test-chart/templates/configmap.yaml",
-    "tests/integration/targets/k8s_scale/files/deployment.yaml",
-]
-
-# Add shebang!skip
-SHEBANG_SKIPS = [
-    "tests/sanity/refresh_ignore_files",
-]
-
-# Add validate-modules:import-error
-VALIDATE_IMPORT_SKIPS = [
-    "plugins/modules/k8s.py",
-    "plugins/modules/k8s_cp.py",
-    "plugins/modules/k8s_drain.py",
-    "plugins/modules/k8s_exec.py",
-    "plugins/modules/k8s_info.py",
-    "plugins/modules/k8s_json_patch.py",
-    "plugins/modules/k8s_log.py",
-    "plugins/modules/k8s_rollback.py",
-    "plugins/modules/k8s_scale.py",
-    "plugins/modules/k8s_service.py",
-    "plugins/modules/k8s_taint.py",
-]
-
-
-def import_skips(*versions):
-    for f in IMPORT_SKIPS:
-        for v in versions:
-            yield f"{f} import-{v}!skip"
-
-def param_type_skips(ansible_version):
-    if ansible_version not in ("2.9", "2.10"):
-        for f in PARAM_TYPE_SKIPS:
-            yield f"{f} validate-modules:parameter-type-not-in-doc"
-
-
-def return_syntax_skips(ansible_version):
-    if ansible_version not in ("2.9", "2.10"):
-        for f in RETURN_SYNTAX_SKIPS:
-            yield f"{f} validate-modules:return-syntax-error"
-    else:
-        yield
-
-
-def yaml_lint_skips():
-    for f in YAML_LINT_SKIPS:
-        yield f"{f} yamllint!skip"
-
-
-def shebang_skips():
-    for f in SHEBANG_SKIPS:
-        yield f"{f} shebang!skip"
-
-
-def import_boilerplate(path, ansible_version):
-    if ansible_version in ("2.9", "2.10", "2.11"):
-        for f in (p for p in path.glob("**/*.py") if not p.is_symlink()):
-            yield f"{f} future-import-boilerplate!skip"
-    else:
-        yield
-
-
-def metaclass_boilerplate(path, ansible_version):
-    if ansible_version in ("2.9", "2.10", "2.11"):
-        for f in (p for p in path.glob("**/*.py") if not p.is_symlink()):
-            yield f"{f} metaclass-boilerplate!skip"
-    else:
-        yield
-
-
-def unsupported_compile_skips(path, ansible_version):
-    """This adds rules for compile skips for all unsupported versions of python.
-
-    These aren't needed for Ansible version 2.12+ as that can be managed on a
-    global level in tests/config.yml.
-    """
-    if ansible_version in ("2.9", "2.10", "2.11"):
-        for f in (p for p in path.glob("**/*.py") if not p.is_symlink()):
-            yield (
-                f"{f} compile-2.6!skip\n"
-                f"{f} compile-2.7!skip\n"
-                f"{f} compile-3.5!skip"
-            )
-
-
-def unsupported_import_skips(path, ansible_version):
-    """This adds rules for import skips for all unsupported versions of python.
-
-    These aren't needed for Ansible version 2.12+ as that can be managed on a
-    global level in tests/config.yml.
-    """
-    if ansible_version in ("2.9", "2.10", "2.11"):
-        if ansible_version in ("2.9", "2.10") and path.name == "plugins":
-            pathglob = itertools.chain(
-                path.joinpath("modules").glob("**/*.py"),
-                path.joinpath("module_utils").glob("**/*.py")
-            )
-        else:
-            pathglob = path.glob("**/*.py")
-        for f in (p for p in pathglob if not p.is_symlink()):
-            yield (
-                f"{f} import-2.6!skip\n"
-                f"{f} import-2.7!skip\n"
-                f"{f} import-3.5!skip"
-            )
-
-
-def unsupported_pylint_skips(path, ansible_version):
-    """This adds rules to skip pylint checks.
-
-    This is only a problem on Ansible version 2.9 and 2.10 with python 3.5,
-    but there's no way to restrict this to a specific version of python.
-    """
-    if ansible_version in ("2.9", "2.10"):
-        pathglob = itertools.chain(
-            path.joinpath("plugins/modules").glob("**/*.py"),
-            path.joinpath("plugins/module_utils").glob("**/*.py"),
-            path.joinpath("tests").glob("**/*.py"),
-        )
-        for f in (p for p in pathglob if not p.is_symlink()):
-            yield f"{f} pylint!skip"
-
-
-def unsupported_validate_modules_skips(ansible_version):
-    """Disable validate-modules test.
-
-    Unfortunately, this is overly broad. Applying a validate-modules:import-error
-    skip fixes ansible 2.9 and python <3.6, but causes validation of the ignores
-    file itself to fail in python 3.6+. The only solution here is to simply
-    skip validate-modules altogether.
-    """
-    if ansible_version in ("2.9", "2.10"):
-        for f in VALIDATE_IMPORT_SKIPS:
-            yield f"{f} validate-modules!skip"
-
-
-def main():
-    target_dir = Path('.')
-    sanity_dir = target_dir / "tests" / "sanity"
-    plugins = target_dir / "plugins"
-    units = target_dir / "tests" / "unit"
-    integration = target_dir / "tests" / "integration"
-
-    for ansible, python in ANSIBLE_VERSIONS.items():
-        with open(sanity_dir / f"ignore-{ansible}.txt", "w") as fp:
-            ignores = itertools.chain(
-                import_skips(*python),
-                param_type_skips(ansible),
-                yaml_lint_skips(),
-                shebang_skips(),
-                return_syntax_skips(ansible),
-                import_boilerplate(plugins, ansible),
-                import_boilerplate(units, ansible),
-                metaclass_boilerplate(plugins, ansible),
-                metaclass_boilerplate(units, ansible),
-                unsupported_import_skips(plugins, ansible),
-                unsupported_compile_skips(plugins, ansible),
-                unsupported_compile_skips(units, ansible),
-                unsupported_compile_skips(integration, ansible),
-                unsupported_pylint_skips(target_dir, ansible),
-                unsupported_validate_modules_skips(ansible),
-            )
-            for f in filter(None, ignores):
-                fp.write(f + "\n")
-
-
-if __name__ == "__main__":
-    main()