diff options
| author | Mariusz Mazur <mmazur@redhat.com> | 2018-11-06 14:43:55 +0100 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2018-11-12 20:32:04 -0800 |
| commit | 642cd53857525d96d34016852ce1904f00fb1d61 (patch) | |
| tree | 6ad5fd5b796b62aaa9150496cd347c516fde28bf | |
| parent | 84db20ea07436f1ba14f980af789e379b0f71ba8 (diff) | |
| download | ansible-642cd53857525d96d34016852ce1904f00fb1d61.tar.gz | |
k8s_facts: fix handling of unknown resource types (#47857)
(cherry picked from commit a5c8e952e8dbea9c9b5140e0b1c8680b2a1cdbf7)
| -rw-r--r-- | changelogs/fragments/k8s_facts_fix.yaml | 1 | ||||
| -rw-r--r-- | lib/ansible/module_utils/k8s/common.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/changelogs/fragments/k8s_facts_fix.yaml b/changelogs/fragments/k8s_facts_fix.yaml index bfef56a34e..796c083a45 100644 --- a/changelogs/fragments/k8s_facts_fix.yaml +++ b/changelogs/fragments/k8s_facts_fix.yaml @@ -1,3 +1,4 @@ --- bugfixes: - k8s_facts now returns a resources key in all situations +- "k8s_facts: fix handling of unknown resource types" diff --git a/lib/ansible/module_utils/k8s/common.py b/lib/ansible/module_utils/k8s/common.py index a49497577f..5e7936077d 100644 --- a/lib/ansible/module_utils/k8s/common.py +++ b/lib/ansible/module_utils/k8s/common.py @@ -198,6 +198,8 @@ class K8sAnsibleMixin(object): def kubernetes_facts(self, kind, api_version, name=None, namespace=None, label_selectors=None, field_selectors=None): resource = self.find_resource(kind, api_version) + if not resource: + return dict(resources=[]) try: result = resource.get(name=name, namespace=namespace, |