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

K8s apply check mode fix #84

Merged
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
2 changes: 2 additions & 0 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ provisioner:
ansible_python_interpreter: '{{ ansible_playbook_python }}'
env:
ANSIBLE_FORCE_COLOR: 'true'
options:
vvv: True
geerlingguy marked this conversation as resolved.
Show resolved Hide resolved
scenario:
name: default
test_sequence:
Expand Down
32 changes: 28 additions & 4 deletions molecule/default/tasks/apply.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,30 @@
that:
- k8s_service_2 is not changed

- name: Add exactly same service in check mode
k8s:
definition:
apiVersion: v1
kind: Service
metadata:
name: apply-svc
namespace: "{{ apply_namespace }}"
spec:
selector:
app: whatever
ports:
- name: http
port: 8080
targetPort: 8080
apply: yes
register: k8s_service_3
check_mode: yes

- name: Check nothing changed
assert:
that:
- k8s_service_3 is not changed

- name: Change service ports
k8s:
definition:
Expand All @@ -170,14 +194,14 @@
port: 8081
targetPort: 8081
apply: yes
register: k8s_service_3
register: k8s_service_4

- name: Check ports are correct
assert:
that:
- k8s_service_3 is changed
- k8s_service_3.result.spec.ports | length == 1
- k8s_service_3.result.spec.ports[0].port == 8081
- k8s_service_4 is changed
- k8s_service_4.result.spec.ports | length == 1
- k8s_service_4.result.spec.ports[0].port == 8081

always:
- name: Remove namespace
Expand Down
6 changes: 5 additions & 1 deletion plugins/module_utils/raw.py
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,11 @@ def perform_action(self, resource, definition):
else:
if self.apply:
if self.check_mode:
ignored, k8s_obj = apply_object(resource, definition)
ignored, patch = apply_object(resource, definition)
if existing:
k8s_obj = dict_merge(existing.to_dict(), patch)
else:
k8s_obj = patch
else:
try:
k8s_obj = resource.apply(definition, namespace=namespace).to_dict()
Expand Down