internet/kubernetes.core
3
0
Fork 0
mirror of https://github.com/ansible-collections/kubernetes.core.git synced 2026-05-07 13:32:37 +00:00
Code Issues Projects Releases Wiki Activity

when in checkmode _create returns None and cannot have to_dict() called (#27)

Browse Source
This commit is contained in:
trbs
2018-01-19 16:44:12 +01:00
committed by Chris Houseknecht
parent 99013f6662
commit 86cb2f7264
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module_utils/k8s_common.py
View File

@@ -162,12 +162,12 @@ class KubernetesAnsibleModule(AnsibleModule):
if self.helper.base_model_name_snake.endswith('list'): if self.helper.base_model_name_snake.endswith('list'):
# For list modules, execute a GET, and exit # For list modules, execute a GET, and exit
k8s_obj = self._read(name, namespace) k8s_obj = self._read(name, namespace)
return_attributes[self.kind] = k8s_obj.to_dict() return_attributes[self.kind] = k8s_obj.to_dict() if k8s_obj else {}
self.exit_json(**return_attributes) self.exit_json(**return_attributes)
elif self.helper.has_method('create'): elif self.helper.has_method('create'):
# For a rollback, execute a POST, and exit # For a rollback, execute a POST, and exit
k8s_obj = self._create(namespace) k8s_obj = self._create(namespace)
return_attributes[self.kind] = k8s_obj.to_dict() return_attributes[self.kind] = k8s_obj.to_dict() if k8s_obj else {}
return_attributes['changed'] = True return_attributes['changed'] = True
self.exit_json(**return_attributes) self.exit_json(**return_attributes)
else: else:
@@ -197,7 +197,7 @@ class KubernetesAnsibleModule(AnsibleModule):
else: else:
if not existing: if not existing:
k8s_obj = self._create(namespace) k8s_obj = self._create(namespace)
return_attributes[self.kind] = k8s_obj.to_dict() return_attributes[self.kind] = k8s_obj.to_dict() if k8s_obj else {}
return_attributes['changed'] = True return_attributes['changed'] = True
self.exit_json(**return_attributes) self.exit_json(**return_attributes)
@@ -210,7 +210,7 @@ class KubernetesAnsibleModule(AnsibleModule):
except KubernetesException as exc: except KubernetesException as exc:
self.fail_json(msg="Failed to replace object: {}".format(exc.message), self.fail_json(msg="Failed to replace object: {}".format(exc.message),
error=exc.value.get('status')) error=exc.value.get('status'))
return_attributes[self.kind] = k8s_obj.to_dict() return_attributes[self.kind] = k8s_obj.to_dict() if k8s_obj else {}
return_attributes['changed'] = True return_attributes['changed'] = True
self.exit_json(**return_attributes) self.exit_json(**return_attributes)
@@ -235,7 +235,7 @@ class KubernetesAnsibleModule(AnsibleModule):
k8s_obj = self.helper.patch_object(name, namespace, k8s_obj) k8s_obj = self.helper.patch_object(name, namespace, k8s_obj)
except KubernetesException as exc: except KubernetesException as exc:
self.fail_json(msg="Failed to patch object: {}".format(exc.message)) self.fail_json(msg="Failed to patch object: {}".format(exc.message))
return_attributes[self.kind] = k8s_obj.to_dict() return_attributes[self.kind] = k8s_obj.to_dict() if k8s_obj else {}
return_attributes['changed'] = True return_attributes['changed'] = True
self.exit_json(**return_attributes) self.exit_json(**return_attributes)