internet/kubernetes.core
3
0
Fork 0
mirror of https://github.com/ansible-collections/kubernetes.core.git synced 2026-05-08 14:02:38 +00:00
Code Issues Projects Releases Wiki Activity

Revert back to the old logic when openshift version < 0.11.1

Browse Source
This commit is contained in:
Mridul Gogoi
2020-05-20 17:35:46 -07:00
parent b44b8e4746
commit 88206b2e39
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/module_utils/raw.py
View File

@@ -379,16 +379,21 @@ class KubernetesRawModule(KubernetesAnsibleModule):
self.fail_json(msg="Resource replacement timed out", **result) self.fail_json(msg="Resource replacement timed out", **result)
return result return result
# Handle check mode inside of self.patch_resource() # Differences exist between the existing obj and requested params
if LooseVersion(self.openshift_version) < LooseVersion("0.6.2"): if self.check_mode and LooseVersion(self.openshift_version) < LooseVersion("0.11.1"):
k8s_obj, error = self.patch_resource(resource, definition, existing, name, k8s_obj = dict_merge(existing.to_dict(), definition)
namespace)
else: else:
for merge_type in self.params['merge_type'] or ['strategic-merge', 'merge']: if LooseVersion(self.openshift_version) < LooseVersion("0.6.2"):
k8s_obj, error = self.patch_resource(resource, definition, existing, name, k8s_obj, error = self.patch_resource(resource, definition, existing, name,
namespace, merge_type=merge_type) namespace)
if not error: else:
break for merge_type in self.params['merge_type'] or ['strategic-merge', 'merge']:
k8s_obj, error = self.patch_resource(resource, definition, existing, name,
namespace, merge_type=merge_type)
if not error:
break
if error:
self.fail_json(**error)
success = True success = True
result['result'] = k8s_obj result['result'] = k8s_obj