From eaffde63bb3c4f99c8f43a2642ee2804583be02f Mon Sep 17 00:00:00 2001 From: Mike Graves Date: Thu, 13 Jan 2022 21:19:37 -0500 Subject: [PATCH] [backport/2.2] Fix for common non-ASCII characters in CRDs (#334) Co-authored-by: Alessandro Rossi <4215912+kubealex@users.noreply.github.com> --- .../308-fix-for-common-non-ascii-characters-in-resources.yaml | 2 ++ plugins/module_utils/common.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/308-fix-for-common-non-ascii-characters-in-resources.yaml diff --git a/changelogs/fragments/308-fix-for-common-non-ascii-characters-in-resources.yaml b/changelogs/fragments/308-fix-for-common-non-ascii-characters-in-resources.yaml new file mode 100644 index 00000000..d9730f8f --- /dev/null +++ b/changelogs/fragments/308-fix-for-common-non-ascii-characters-in-resources.yaml @@ -0,0 +1,2 @@ +bugfixes: + - module_utils.common - change default opening mode to read-bytes to avoid bad interpretation of non ascii characters and strings, often present in 3rd party manifests. diff --git a/plugins/module_utils/common.py b/plugins/module_utils/common.py index 37884589..a232344d 100644 --- a/plugins/module_utils/common.py +++ b/plugins/module_utils/common.py @@ -331,7 +331,7 @@ class K8sAnsibleMixin(object): if not os.path.exists(path): self.fail(msg="Error accessing {0}. Does the file exist?".format(path)) try: - with open(path, 'r') as f: + with open(path, "rb") as f: result = list(yaml.safe_load_all(f)) except (IOError, yaml.YAMLError) as exc: self.fail(msg="Error loading resource_definition: {0}".format(exc))