From 9fb808c7f37caea0300db1b466117ad0367db492 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Thu, 25 Jun 2020 04:41:03 +0530 Subject: [PATCH] k8s: Fix a bug when manifest file ends with '---' (#139) Any kubernetes manifest file ending with '---' will generate an error when applied using 'k8s' module. Although this may not be 'legal' YAML, this is quite frequent, specially on helm's generated manifest files. migrated from https://github.com/ansible/ansible/pull/59160 Signed-off-by: Abhijeet Kasurde --- changelogs/fragments/59160_handle_none_def.yml | 2 ++ plugins/module_utils/raw.py | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 changelogs/fragments/59160_handle_none_def.yml diff --git a/changelogs/fragments/59160_handle_none_def.yml b/changelogs/fragments/59160_handle_none_def.yml new file mode 100644 index 00000000..2c756499 --- /dev/null +++ b/changelogs/fragments/59160_handle_none_def.yml @@ -0,0 +1,2 @@ +bugfixes: +- raw - handle condition when definition is none (https://github.com/ansible/ansible/pull/59160). diff --git a/plugins/module_utils/raw.py b/plugins/module_utils/raw.py index 59dbdf3b..806d1200 100644 --- a/plugins/module_utils/raw.py +++ b/plugins/module_utils/raw.py @@ -171,6 +171,8 @@ class KubernetesRawModule(KubernetesAnsibleModule): flattened_definitions = [] for definition in self.resource_definitions: + if definition is None: + continue kind = definition.get('kind', self.kind) api_version = definition.get('apiVersion', self.api_version) if kind.endswith('List'):