Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
bugfixes:
- module_utils/k8s/service - hide fields first before creating diffs (https://github.com/ansible-collections/kubernetes.core/pull/915).
7 changes: 2 additions & 5 deletions plugins/module_utils/k8s/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -498,8 +498,8 @@ def diff_objects(
if not diff:
return True, result

result["before"] = diff[0]
result["after"] = diff[1]
result["before"] = hide_fields(diff[0], hidden_fields)
result["after"] = hide_fields(diff[1], hidden_fields)

if list(result["after"].keys()) == ["metadata"] and list(
result["before"].keys()
Expand All @@ -512,9 +512,6 @@ def diff_objects(
).issubset(ignored_keys):
return True, result

result["before"] = hide_fields(result["before"], hidden_fields)
result["after"] = hide_fields(result["after"], hidden_fields)

return False, result


Expand Down
6 changes: 3 additions & 3 deletions tests/integration/targets/k8s_hide_fields/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
- "'managedFields' not in hf4.resources[0]['metadata']"


- name: Hiding a changed field should still result in a change
- name: Hiding a changed field should not result in a change
k8s:
definition: "{{ hide_fields_base_configmap | combine({'data':{'hello':'different'}}) }}"
hidden_fields:
Expand All @@ -67,10 +67,10 @@
register: hf5
diff: true

- name: Ensure that hidden changed field changed
- name: Ensure that hidden changed field not changed
assert:
that:
- hf5.changed
- not hf5.changed

- name: Apply works with hidden fields
k8s:
Expand Down
Loading