From b3974399724f186d3e02c5fe4f3255128ac89f66 Mon Sep 17 00:00:00 2001 From: Mike Graves Date: Thu, 9 Sep 2021 11:26:58 -0400 Subject: [PATCH] Fix resource cache not being used (#228) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix resource cache not being used SUMMARY This was some bad copy/paste from the openshift client. The resource cache was never being used resulting in unnecessary HTTP requests. ISSUE TYPE Bugfix Pull Request COMPONENT NAME ADDITIONAL INFORMATION Reviewed-by: None Reviewed-by: Gonéri Le Bouder Reviewed-by: None --- changelogs/fragments/228-fix-resource-cache.yml | 3 +++ plugins/module_utils/client/discovery.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/228-fix-resource-cache.yml diff --git a/changelogs/fragments/228-fix-resource-cache.yml b/changelogs/fragments/228-fix-resource-cache.yml new file mode 100644 index 00000000..807bc66f --- /dev/null +++ b/changelogs/fragments/228-fix-resource-cache.yml @@ -0,0 +1,3 @@ +--- +bugfixes: + - fix resource cache not being used (https://github.com/ansible-collections/kubernetes.core/pull/228). diff --git a/plugins/module_utils/client/discovery.py b/plugins/module_utils/client/discovery.py index d67ee8eb..ffefab43 100644 --- a/plugins/module_utils/client/discovery.py +++ b/plugins/module_utils/client/discovery.py @@ -18,6 +18,7 @@ import os from collections import defaultdict import hashlib import tempfile +from functools import partial import kubernetes.dynamic import kubernetes.dynamic.discovery @@ -74,7 +75,7 @@ class Discoverer(kubernetes.dynamic.discovery.Discoverer): else: try: with open(self.__cache_file, 'r') as f: - self._cache = json.load(f, cls=CacheDecoder(self.client)) + self._cache = json.load(f, cls=partial(CacheDecoder, self.client)) if self._cache.get('library_version') != __version__: # Version mismatch, need to refresh cache self.invalidate_cache()