ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-28 13:21:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

k8s/oc plugins: fix 'ResourceField' is not JSON serializable (#46145)

Browse source 
Fixes #44408
This commit is contained in:
Pilou 2018-09-28 00:43:29 +02:00 • committed by ansibot
parent 0dedfcd70f
commit 15d46ce428
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/plugins/inventory/openshift.py
View file

@ -159,8 +159,7 @@ class InventoryModule(K8sInventoryModule):
self.inventory.add_child(namespace_group, namespace_routes_group)
for route in obj.items:
route_name = route.metadata.name
route_labels = {} if not route.metadata.labels else route.metadata.labels
route_annotations = {} if not route.metadata.annotations else route.metadata.annotations
route_annotations = {} if not route.metadata.annotations else dict(route.metadata.annotations)
self.inventory.add_host(route_name)
@ -170,6 +169,9 @@ class InventoryModule(K8sInventoryModule):
group_name = 'label_{0}_{1}'.format(key, value)
self.inventory.add_group(group_name)
self.inventory.add_child(group_name, route_name)
route_labels = dict(route.metadata.labels)
else:
route_labels = {}
self.inventory.add_child(namespace_routes_group, route_name)
@ -189,4 +191,4 @@ class InventoryModule(K8sInventoryModule):
self.inventory.set_variable(route_name, 'path', route.spec.path)
if hasattr(route.spec.port, 'targetPort') and route.spec.port.targetPort:
self.inventory.set_variable(route_name, 'port', route.spec.port)
self.inventory.set_variable(route_name, 'port', dict(route.spec.port))