Initial update to 6.0.0-dev0: remove support of ansible-core<2.16.0 and k8s inventory plugin (#867)

SUMMARY This is initial to prepare the main branch to version 6.0.0 (6.0.0-dev0 in galaxy.yml) and includes following braking changes: removed support of ansible-core<2.16.0 as 2.15 reach EOL in Nov 2024; removed the k8s inventory plugin that was deprecated in release 3.0.0. ISSUE TYPE Feature Pull Request COMPONENT NAME Documentation galaxy.yml inventory/k8s.py ADDITIONAL INFORMATION The initial version of this PR doesn't remove tests/sanity/ignore-2.14.txt and tests/sanity/ignore-2.15.txt, and CI part will require removing version 2.15 from the matrix in https://github.com/ansible-network/github_actions, so, we have external dependency here. Reviewed-by: Bianca Henderson <beeankha@gmail.com> Reviewed-by: Yuriy Novostavskiy Reviewed-by: Mike Graves <mgraves@redhat.com>
2026-03-26 21:33:02 +00:00 · 2025-04-29 20:23:11 +02:00
parent b594d35931
commit cb2070c93f
20 changed files with 21 additions and 1228 deletions
--- a/tests/integration/targets/inventory_k8s/aliases
+++ b/tests/integration/targets/inventory_k8s/aliases
@@ -1,3 +0,0 @@
-context/target
-time=42
-k8s
--- a/tests/integration/targets/inventory_k8s/playbooks/create_resources.yml
+++ b/tests/integration/targets/inventory_k8s/playbooks/create_resources.yml
@@ -1,46 +0,0 @@
---
- name: Create inventory files
-  hosts: localhost
-  gather_facts: false
-
-  collections:
-    - kubernetes.core
-
-  roles:
-    - role: setup_kubeconfig
-      kubeconfig_operation: 'save'
-
-  tasks:
-    - name: Create inventory files
-      copy:
-        content: "{{ item.content }}"
-        dest: "{{ item.path }}"
-      vars:
-        hostname: "{{ lookup('file', user_credentials_dir + '/host_data.txt') }}"
-        test_cert_file: "{{ user_credentials_dir | realpath + '/cert_file_data.txt' }}"
-        test_key_file: "{{ user_credentials_dir | realpath + '/key_file_data.txt' }}"
-        test_ca_cert: "{{ user_credentials_dir | realpath + '/ssl_ca_cert_data.txt' }}"
-      with_items:
-        - path: "test_inventory_aliases_with_ssl_k8s.yml"
-          content: |
-            ---
-            plugin: kubernetes.core.k8s
-            connections:
-              - namespaces:
-                - inventory
-                host: "{{ hostname }}"
-                cert_file: "{{ test_cert_file }}"
-                key_file: "{{ test_key_file }}"
-                verify_ssl: true
-                ssl_ca_cert: "{{ test_ca_cert }}"
-        - path: "test_inventory_aliases_no_ssl_k8s.yml"
-          content: |
-            ---
-            plugin: kubernetes.core.k8s
-            connections:
-              - namespaces:
-                - inventory
-                host: "{{ hostname }}"
-                cert_file: "{{ test_cert_file }}"
-                key_file: "{{ test_key_file }}"
-                verify_ssl: false
--- a/tests/integration/targets/inventory_k8s/playbooks/delete_resources.yml
+++ b/tests/integration/targets/inventory_k8s/playbooks/delete_resources.yml
@@ -1,30 +0,0 @@
---
- name: Delete inventory namespace
-  hosts: localhost
-  connection: local
-  gather_facts: true
-
-  roles:
-    - role: setup_kubeconfig
-      kubeconfig_operation: 'revert'
-
-  tasks:
-    - name: Delete temporary files
-      file:
-        state: absent
-        path: "{{ user_credentials_dir ~ '/' ~ item }}"
-      ignore_errors: true
-      with_items:
-        - test_inventory_aliases_with_ssl_k8s.yml
-        - test_inventory_aliases_no_ssl_k8s.yml
-        - ssl_ca_cert_data.txt
-        - key_file_data.txt
-        - cert_file_data.txt
-        - host_data.txt
-
-    - name: Remove inventory namespace
-      k8s:
-        api_version: v1
-        kind: Namespace
-        name: inventory
-        state: absent
--- a/tests/integration/targets/inventory_k8s/playbooks/play.yml
+++ b/tests/integration/targets/inventory_k8s/playbooks/play.yml
@@ -1,90 +0,0 @@
---
- name: Converge
-  hosts: localhost
-  connection: local
-
-  collections:
-    - kubernetes.core
-
-  vars_files:
-    - vars/main.yml
-
-  tasks:
-    - name: Delete existing namespace
-      k8s:
-        api_version: v1
-        kind: Namespace
-        name: inventory
-        wait: yes
-        state: absent
-
-    - name: Ensure namespace exists
-      k8s:
-        api_version: v1
-        kind: Namespace
-        name: inventory
-
-    - name: Add a deployment
-      k8s:
-        definition:
-          apiVersion: apps/v1
-          kind: Deployment
-          metadata:
-            name: inventory
-            namespace: inventory
-          spec:
-            replicas: 1
-            selector:
-              matchLabels:
-                app: "{{ k8s_pod_name }}"
-            template: "{{ k8s_pod_template }}"
-        wait: yes
-        wait_timeout: 400
-      vars:
-        k8s_pod_name: inventory
-        k8s_pod_image: python
-        k8s_pod_command:
-          - python
-          - '-m'
-          - http.server
-        k8s_pod_env:
-          - name: TEST
-            value: test
-
-    - meta: refresh_inventory
-
- name: Verify inventory and connection plugins
-  hosts: namespace_inventory_pods
-  gather_facts: no
-
-  vars:
-    file_content: |
-      Hello world
-
-  tasks:
-    - name: End play if host not running (TODO should we not add these to the inventory?)
-      meta: end_host
-      when: pod_phase != "Running"
-
-    - debug: var=hostvars
-    - setup:
-
-    - debug: var=ansible_facts
-
-    - name: Assert the TEST environment variable was retrieved
-      assert:
-        that: ansible_facts.env.TEST == 'test'
-
-    - name: Copy a file into the host
-      copy:
-        content: '{{ file_content }}'
-        dest: /tmp/test_file
-
-    - name: Retrieve the file from the host
-      slurp:
-        src: /tmp/test_file
-      register: slurped_file
-
-    - name: Assert the file content matches expectations
-      assert:
-        that: (slurped_file.content|b64decode) == file_content
--- a/tests/integration/targets/inventory_k8s/playbooks/test.inventory_k8s.yml
+++ b/tests/integration/targets/inventory_k8s/playbooks/test.inventory_k8s.yml
@@ -1,2 +0,0 @@
---
-plugin: kubernetes.core.k8s
--- a/tests/integration/targets/inventory_k8s/playbooks/vars/main.yml
+++ b/tests/integration/targets/inventory_k8s/playbooks/vars/main.yml
@@ -1,38 +0,0 @@
---
-k8s_pod_metadata:
-  labels:
-    app: "{{ k8s_pod_name }}"
-
-k8s_pod_spec:
-  serviceAccount: "{{ k8s_pod_service_account }}"
-  containers:
-    - image: "{{ k8s_pod_image }}"
-      imagePullPolicy: Always
-      name: "{{ k8s_pod_name }}"
-      command: "{{ k8s_pod_command }}"
-      readinessProbe:
-        initialDelaySeconds: 15
-        exec:
-          command:
-            - /bin/true
-      resources: "{{ k8s_pod_resources }}"
-      ports: "{{ k8s_pod_ports }}"
-      env: "{{ k8s_pod_env }}"
-
-
-k8s_pod_service_account: default
-
-k8s_pod_resources:
-  limits:
-    cpu: "100m"
-    memory: "100Mi"
-
-k8s_pod_command: []
-
-k8s_pod_ports: []
-
-k8s_pod_env: []
-
-k8s_pod_template:
-  metadata: "{{ k8s_pod_metadata }}"
-  spec: "{{ k8s_pod_spec }}"
--- a/tests/integration/targets/inventory_k8s/runme.sh
+++ b/tests/integration/targets/inventory_k8s/runme.sh
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-set -eux
-
-export ANSIBLE_ROLES_PATH="../"
-USER_CREDENTIALS_DIR=$(pwd)
-
-ansible-playbook playbooks/delete_resources.yml -e "user_credentials_dir=${USER_CREDENTIALS_DIR}" "$@"
-
-{
-export ANSIBLE_CALLBACKS_ENABLED=profile_tasks
-export ANSIBLE_INVENTORY_ENABLED=kubernetes.core.k8s,yaml
-export ANSIBLE_PYTHON_INTERPRETER=auto_silent
-
-ansible-playbook playbooks/play.yml -i playbooks/test.inventory_k8s.yml "$@" &&
-
-ansible-playbook playbooks/create_resources.yml -e "user_credentials_dir=${USER_CREDENTIALS_DIR}" "$@" &&
-
-ansible-inventory -i playbooks/test_inventory_aliases_with_ssl_k8s.yml --list "$@" &&
-
-ansible-inventory -i playbooks/test_inventory_aliases_no_ssl_k8s.yml --list "$@" &&
-
-unset ANSIBLE_INVENTORY_ENABLED &&
-
-ansible-playbook playbooks/delete_resources.yml -e "user_credentials_dir=${USER_CREDENTIALS_DIR}" "$@"
-
-} || {
-    ansible-playbook playbooks/delete_resources.yml -e "user_credentials_dir=${USER_CREDENTIALS_DIR}" "$@"
-    exit 1
-}
--- a/tests/sanity/ignore-2.14.txt
+++ b/tests/sanity/ignore-2.14.txt
@@ -1,31 +0,0 @@
-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.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.9!skip
-plugins/module_utils/k8sdynamicclient.py import-3.10!skip
-plugins/module_utils/k8sdynamicclient.py import-3.11!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/clusteroperator.yml yamllint!skip
-tests/unit/module_utils/fixtures/definitions.yml yamllint!skip
-tests/unit/module_utils/fixtures/deployments.yml 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/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_registry_auth/tasks/main.yaml yamllint!skip
-tests/integration/targets/helm_diff/files/test-chart-deployment-time/templates/configmap.yaml yamllint!skip
-
--- a/tests/sanity/ignore-2.20.txt
+++ b/tests/sanity/ignore-2.20.txt
@@ -1,12 +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/resource.py import-3.9!skip
-plugins/module_utils/client/resource.py import-3.10!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/k8sdynamicclient.py import-3.9!skip
-plugins/module_utils/k8sdynamicclient.py import-3.10!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