From 07cdb709aeaaaa4b0bf3769479952b4fa175d852 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Mon, 7 Dec 2020 23:58:42 +0100
Subject: [PATCH] Adjust action groups to moved modules (#72428) (#72496)

* Support docker and k8s action groups for moved modules in community.docker and community.kubevirt.

* Also support k8s action group for community.okd.

* Also add kubernetes.core.

* Fix changelog fragment.

* Remove community.okd.

* Revert "Remove community.okd."

This reverts commit 812b5aa6e2bc2894db455fd5e2bcdcc9bd6fa3f8.

(cherry picked from commit c7a4b39633de482d555ae60b469ca3127acf7fb1)
---
 changelogs/fragments/72428-action-groups-docker-k8s.yml | 2 ++
 lib/ansible/executor/module_common.py                   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/fragments/72428-action-groups-docker-k8s.yml

diff --git a/changelogs/fragments/72428-action-groups-docker-k8s.yml b/changelogs/fragments/72428-action-groups-docker-k8s.yml
new file mode 100644
index 00000000000..bde0a0d0221
--- /dev/null
+++ b/changelogs/fragments/72428-action-groups-docker-k8s.yml
@@ -0,0 +1,2 @@
+bugfixes:
+- "The ``docker`` and ``k8s`` action groups / module default groups now also support the moved modules in `community.docker <https://galaxy.ansible.com/community/docker>`_, `community.kubevirt <https://github.com/ansible-collections/community.kubevirt>`_, `community.okd <https://galaxy.ansible.com/community/okd>`_, and `kubernetes.core <https://galaxy.ansible.com/kubernetes/core>`_ (https://github.com/ansible/ansible/pull/72428)."
diff --git a/lib/ansible/executor/module_common.py b/lib/ansible/executor/module_common.py
index 61b89291e3c..15f2506a75b 100644
--- a/lib/ansible/executor/module_common.py
+++ b/lib/ansible/executor/module_common.py
@@ -1338,9 +1338,9 @@ def get_action_args_with_defaults(action, args, defaults, templar, redirected_na
         'aws': ['amazon.aws', 'community.aws'],
         'azure': ['azure.azcollection'],
         'cpm': ['wti.remote'],
-        'docker': ['community.general'],
+        'docker': ['community.general', 'community.docker'],
         'gcp': ['google.cloud'],
-        'k8s': ['community.kubernetes', 'community.general'],
+        'k8s': ['community.kubernetes', 'community.general', 'community.kubevirt', 'community.okd', 'kubernetes.core'],
         'os': ['openstack.cloud'],
         'ovirt': ['ovirt.ovirt', 'community.general'],
         'vmware': ['community.vmware'],