Rename kubevirt dependency

The community.kubernetes collection has been renamed to kubernetes.core and this commit just makes sure the collection will not get stuck with the old name.
ansible-collections · Sep 2, 2021 · e9b159e · e9b159e
1 parent 2aa18fa
commit e9b159e
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 25 deletions.
diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml
@@ -57,7 +57,7 @@ jobs:
         run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
 
       - name: Install collection dependencies
-        run: ansible-galaxy collection install 'community.kubernetes:<2.0.0' -p .
+        run: ansible-galaxy collection install 'kubernetes.core:<2.0.0' -p .
 
       # run ansible-test sanity inside of Docker.
       # The docker container has all the pinned dependencies that are required
@@ -98,7 +98,7 @@ jobs:
         run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
 
       - name: Install collection dependencies
-        run: ansible-galaxy collection install 'community.kubernetes:<2.0.0' -p .
+        run: ansible-galaxy collection install 'kubernetes.core:<2.0.0' -p .
 
       # Run the unit tests
       - name: Run unit test
@@ -162,7 +162,7 @@ jobs:
         run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
 
       - name: Install collection dependencies
-        run: ansible-galaxy collection install 'community.kubernetes:<2.0.0' -p .
+        run: ansible-galaxy collection install 'kubernetes.core:<2.0.0' -p .
 
       # Run the integration tests
       - name: Run integration test

diff --git a/galaxy.yml b/galaxy.yml
@@ -8,7 +8,7 @@ authors:
   - kubevirt (github.com/kubevirt)
   - tima (github.com/tima)
 dependencies:
-  community.kubernetes: '>=1.0.0,<2.0.0'
+  kubernetes.core: '>=1.0.0,<2.0.0'
 description: 
 license_file: LICENSE
 tags:

diff --git a/plugins/inventory/kubevirt.py b/plugins/inventory/kubevirt.py
@@ -140,7 +140,7 @@
 
 import json
 
-from ansible_collections.community.kubernetes.plugins.inventory.k8s import K8sInventoryException, InventoryModule as K8sInventoryModule, format_dynamic_api_exc
+from ansible_collections.kubernetes.core.plugins.inventory.k8s import K8sInventoryException, InventoryModule as K8sInventoryModule, format_dynamic_api_exc
 
 try:
     from openshift.dynamic.exceptions import DynamicApiError

diff --git a/plugins/module_utils/kubevirt.py b/plugins/module_utils/kubevirt.py
@@ -11,8 +11,8 @@
 
 from ansible.module_utils.common import dict_transformations
 from ansible.module_utils.common._collections_compat import Sequence
-from ansible_collections.community.kubernetes.plugins.module_utils.common import list_dict_str
-from ansible_collections.community.kubernetes.plugins.module_utils.raw import KubernetesRawModule
+from ansible_collections.kubernetes.core.plugins.module_utils.common import list_dict_str
+from ansible_collections.kubernetes.core.plugins.module_utils.raw import KubernetesRawModule
 
 import copy
 import re

diff --git a/plugins/modules/kubevirt_cdi_upload.py b/plugins/modules/kubevirt_cdi_upload.py
@@ -53,7 +53,7 @@
     choices: [ json, merge, strategic-merge ]
 
 extends_documentation_fragment:
-- community.kubernetes.k8s_auth_options
+- kubernetes.core.k8s_auth_options
 
 
 requirements:
@@ -79,8 +79,8 @@
 
 from collections import defaultdict
 
-from ansible_collections.community.kubernetes.plugins.module_utils.common import AUTH_ARG_SPEC
-from ansible_collections.community.kubernetes.plugins.module_utils.raw import KubernetesRawModule
+from ansible_collections.kubernetes.core.plugins.module_utils.common import AUTH_ARG_SPEC
+from ansible_collections.kubernetes.core.plugins.module_utils.raw import KubernetesRawModule
 
 # 3rd party imports
 try:

diff --git a/plugins/modules/kubevirt_preset.py b/plugins/modules/kubevirt_preset.py
@@ -45,7 +45,7 @@
         type: dict
 
 extends_documentation_fragment:
-- community.kubernetes.k8s_auth_options
+- kubernetes.core.k8s_auth_options
 - community.kubevirt.kubevirt_vm_options
 - community.kubevirt.kubevirt_common_options
 
@@ -88,7 +88,7 @@
 import traceback
 
 
-from ansible_collections.community.kubernetes.plugins.module_utils.common import AUTH_ARG_SPEC
+from ansible_collections.kubernetes.core.plugins.module_utils.common import AUTH_ARG_SPEC
 
 from ansible_collections.community.kubevirt.plugins.module_utils.kubevirt import (
     virtdict,

diff --git a/plugins/modules/kubevirt_pvc.py b/plugins/modules/kubevirt_pvc.py
@@ -138,7 +138,7 @@
     default: 300
 
 extends_documentation_fragment:
-- community.kubernetes.k8s_auth_options
+- kubernetes.core.k8s_auth_options
 
 
 requirements:
@@ -250,8 +250,8 @@
 
 from collections import defaultdict
 
-from ansible_collections.community.kubernetes.plugins.module_utils.common import AUTH_ARG_SPEC
-from ansible_collections.community.kubernetes.plugins.module_utils.raw import KubernetesRawModule
+from ansible_collections.kubernetes.core.plugins.module_utils.common import AUTH_ARG_SPEC
+from ansible_collections.kubernetes.core.plugins.module_utils.raw import KubernetesRawModule
 from ansible_collections.community.kubevirt.plugins.module_utils.kubevirt import virtdict, KubeVirtRawModule
 
 

diff --git a/plugins/modules/kubevirt_rs.py b/plugins/modules/kubevirt_rs.py
@@ -51,7 +51,7 @@
         type: int
 
 extends_documentation_fragment:
-- community.kubernetes.k8s_auth_options
+- kubernetes.core.k8s_auth_options
 - community.kubevirt.kubevirt_vm_options
 - community.kubevirt.kubevirt_common_options
 
@@ -107,7 +107,7 @@
 import traceback
 
 
-from ansible_collections.community.kubernetes.plugins.module_utils.common import AUTH_ARG_SPEC
+from ansible_collections.kubernetes.core.plugins.module_utils.common import AUTH_ARG_SPEC
 
 from ansible_collections.community.kubevirt.plugins.module_utils.kubevirt import (
     virtdict,

diff --git a/plugins/modules/kubevirt_template.py b/plugins/modules/kubevirt_template.py
@@ -133,8 +133,8 @@
         type: str
 
 extends_documentation_fragment:
-- community.kubernetes.k8s_auth_options
-- community.kubernetes.k8s_state_options
+- kubernetes.core.k8s_auth_options
+- kubernetes.core.k8s_state_options
 
 
 requirements:
@@ -201,7 +201,7 @@
 import copy
 import traceback
 
-from ansible_collections.community.kubernetes.plugins.module_utils.common import AUTH_ARG_SPEC
+from ansible_collections.kubernetes.core.plugins.module_utils.common import AUTH_ARG_SPEC
 
 from ansible_collections.community.kubevirt.plugins.module_utils.kubevirt import (
     virtdict,

diff --git a/plugins/modules/kubevirt_vm.py b/plugins/modules/kubevirt_vm.py
@@ -67,7 +67,7 @@
         type: dict
 
 extends_documentation_fragment:
-- community.kubernetes.k8s_auth_options
+- kubernetes.core.k8s_auth_options
 - community.kubevirt.kubevirt_vm_options
 - community.kubevirt.kubevirt_common_options
 
@@ -245,7 +245,7 @@
 import copy
 import traceback
 
-from ansible_collections.community.kubernetes.plugins.module_utils.common import AUTH_ARG_SPEC
+from ansible_collections.kubernetes.core.plugins.module_utils.common import AUTH_ARG_SPEC
 from ansible_collections.community.kubevirt.plugins.module_utils.kubevirt import (
     virtdict,
     KubeVirtRawModule,

diff --git a/tests/unit/plugins/modules/kubevirt_fixtures.py b/tests/unit/plugins/modules/kubevirt_fixtures.py
@@ -6,8 +6,8 @@
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.kubevirt.tests.unit.compat.mock import MagicMock
 
-from ansible_collections.community.kubernetes.plugins.module_utils.common import K8sAnsibleMixin
-from ansible_collections.community.kubernetes.plugins.module_utils.raw import KubernetesRawModule
+from ansible_collections.kubernetes.core.plugins.module_utils.common import K8sAnsibleMixin
+from ansible_collections.kubernetes.core.plugins.module_utils.raw import KubernetesRawModule
 from ansible_collections.community.kubevirt.plugins.module_utils.kubevirt import KubeVirtRawModule
 
 import openshift.dynamic

diff --git a/tests/unit/plugins/modules/test_kubevirt_rs.py b/tests/unit/plugins/modules/test_kubevirt_rs.py
@@ -8,7 +8,7 @@
 from ansible_collections.community.kubevirt.tests.unit.plugins.modules.utils import set_module_args
 from .kubevirt_fixtures import base_fixture, RESOURCE_DEFAULT_ARGS, AnsibleExitJson
 
-from ansible_collections.community.kubernetes.plugins.module_utils.raw import KubernetesRawModule
+from ansible_collections.kubernetes.core.plugins.module_utils.raw import KubernetesRawModule
 from ansible_collections.community.kubevirt.plugins.modules import kubevirt_rs as mymodule
 
 KIND = 'VirtualMachineInstanceReplicaSet'