Skip to content
This repository has been archived by the owner on Jun 13, 2024. It is now read-only.

Fix dry runs (--check) erroneously reporting changes #99

Merged
merged 6 commits into from
Sep 22, 2020
7 changes: 6 additions & 1 deletion plugins/module_utils/raw.py
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ def perform_action(self, resource, definition):
return result

# Differences exist between the existing obj and requested params
if self.check_mode:
if self.check_mode and LooseVersion(self.openshift_version) < LooseVersion("0.11.1"):
k8s_obj = dict_merge(existing.to_dict(), definition)
else:
if LooseVersion(self.openshift_version) < LooseVersion("0.6.2"):
Expand Down Expand Up @@ -399,6 +399,11 @@ def patch_resource(self, resource, definition, existing, name, namespace, merge_
params = dict(name=name, namespace=namespace)
if merge_type:
params['content_type'] = 'application/{0}-patch+json'.format(merge_type)

# Pass dry_run=All to openshift
if self.check_mode:
params['dry_run'] = 'All'

k8s_obj = resource.patch(definition, **params).to_dict()
match, diffs = self.diff_objects(existing.to_dict(), k8s_obj)
error = {}
Expand Down