k8s support diff mode

changelogs/fragments/146-k8s-add-support-diff-mode.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - k8s - Add support for diff mode, diff is returned only when it is explicitly requested (https://github.com/ansible-collections/kubernetes.core/pull/146).

molecule/default/converge.yml

@@ -164,6 +164,14 @@
       tags:
         - always
 
+    - name: Include diff.yml
+      include_tasks:
+        file: tasks/diff.yml
+        apply:
+          tags: [ diff, k8s ]
+      tags:
+        - always
+
   roles:
     - role: helm
       tags:

molecule/default/tasks/diff.yml

@@ -0,0 +1,153 @@
+---
+- set_fact:
+    diff_namespace: "diff"
+    diff_configmap: "diff-configmap"
+
+- block:
+  - name: Ensure namespace
+    k8s:
+      kind: Namespace
+      name: '{{ diff_namespace }}'
+
+  # Using option 'apply' set to 'yes'
+  - name: Create Pod using apply and diff set to yes
+    k8s:
+      namespace: '{{ diff_namespace }}'
+      apply: yes
+      template: "pod_diff.j2"
+    diff: yes
+    vars:
+      pod_name: "pod-apply"
+      pod_image: "busybox:1.32.0"
+    register: result
+
+  - name: check that result has diff attribute
+    assert:
+      that:
+      - result is changed
+      - result.diff is defined
+
+  - name: Update pod definition using apply and diff set to no
+    k8s:
+      namespace: '{{ diff_namespace }}'
+      apply: yes
+      template: "pod_diff.j2"
+    diff: no
+    vars:
+      pod_name: "pod-apply"
+      pod_image: "busybox:1.33.0"
+    register: result
+
+  - name: check that output has no diff attribute
+    assert:
+      that:
+      - result is changed
+      - result.diff is not defined
+
+  # Using option 'state=patched'
+  - name: Create Pod using state=present and diff set to yes
+    k8s:
+      namespace: '{{ diff_namespace }}'
+      state: present
+      template: "pod_diff.j2"
+    vars:
+      pod_name: "pod-patch"
+      pod_image: "busybox:1.32.0"
+    register: result
+
+  - name: Update pod definition using state=patched
+    k8s:
+      namespace: '{{ diff_namespace }}'
+      state: patched
+      template: "pod_diff.j2"
+    diff: no
+    vars:
+      pod_name: "pod-patch"
+      pod_image: "busybox:1.33.0"
+      pod_label: "patching"
+    register: result
+
+  - name: check that output has no diff attribute
+    assert:
+      that:
+      - result is changed
+      - result.diff is not defined
+
+  - name: Update pod definition using state=patched and diff=yes
+    k8s:
+      namespace: '{{ diff_namespace }}'
+      state: patched
+      template: "pod_diff.j2"
+    diff: yes
+    vars:
+      pod_name: "pod-patch"
+      pod_image: "busybox:1.33.0"
+      pod_label: "running"
+    register: result
+
+  - name: check that output has no diff attribute
+    assert:
+      that:
+      - result is changed
+      - result.diff is defined
+
+  # check diff mode using force=yes
+  - name: Create a ConfigMap
+    k8s:
+      kind: ConfigMap
+      name: '{{ diff_configmap }}'
+      namespace: '{{ diff_namespace }}'
+      definition:
+        data:
+          key: "initial value"
+    diff: yes
+    register: result
+
+  - name: check that output has no diff attribute
+    assert:
+      that:
+      - result is changed
+      - result.diff is not defined
+
+  - name: Update ConfigMap using force and diff=no
+    k8s:
+      kind: ConfigMap
+      name: '{{ diff_configmap }}'
+      namespace: '{{ diff_namespace }}'
+      force: yes
+      definition:
+        data:
+          key: "update value with diff=no"
+    diff: no
+    register: result
+
+  - name: check that output has no diff attribute
+    assert:
+      that:
+      - result is changed
+      - result.diff is not defined
+
+  - name: Update ConfigMap using force and diff=yes
+    k8s:
+      kind: ConfigMap
+      name: '{{ diff_configmap }}'
+      namespace: '{{ diff_namespace }}'
+      force: yes
+      definition:
+        data:
+          key: "update value with diff=yes"
+    diff: yes
+    register: result
+
+  - name: check that output has diff attribute
+    assert:
+      that:
+      - result is changed
+      - result.diff is defined
+
+  always:
+  - name: Ensure namespace is deleted
+    k8s:
+      state: absent
+      kind: Namespace
+      name: '{{ diff_namespace }}'

molecule/default/templates/pod_diff.j2

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Pod
+metadata:
+    name: {{ pod_name }}
+    labels:
+        ansible: {{ pod_label | default('demo') }}
+spec:
+    containers:
+    - name: c0
+      image: {{ pod_image }}
+      command:
+        - /bin/sh
+        - -c
+        - while true;do date;sleep 5; done

plugins/module_utils/common.py

@@ -693,7 +693,8 @@ def build_error_msg(kind, name, msg):
                     existing = {}
                 match, diffs = self.diff_objects(existing, result['result'])
                 result['changed'] = not match
-                result['diff'] = diffs
+                if self.module._diff:
+                    result['diff'] = diffs
                 result['method'] = 'apply'
                 if not success:
                     msg = "Resource apply timed out"
@@ -785,7 +786,8 @@ def build_error_msg(kind, name, msg):
                 match, diffs = self.diff_objects(existing.to_dict(), result['result'])
                 result['changed'] = not match
                 result['method'] = 'replace'
-                result['diff'] = diffs
+                if self.module._diff:
+                    result['diff'] = diffs
                 if not success:
                     msg = "Resource replacement timed out"
                     if continue_on_error:
@@ -819,7 +821,8 @@ def build_error_msg(kind, name, msg):
             match, diffs = self.diff_objects(existing.to_dict(), result['result'])
             result['changed'] = not match
             result['method'] = 'patch'
-            result['diff'] = diffs
+            if self.module._diff:
+                result['diff'] = diffs
 
             if not success:
                 msg = "Resource update timed out"