From 9e2e7317e6079081def3024d815c2a948ffac4a5 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 10 Mar 2020 18:53:09 -0400 Subject: [PATCH] mgr/rook: include container_image_name in 'orch ps' Signed-off-by: Sage Weil --- src/pybind/mgr/rook/module.py | 1 + src/pybind/mgr/rook/rook_cluster.py | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/rook/module.py b/src/pybind/mgr/rook/module.py index 93e9ef4dc7dfd..2bfb0ed5f500d 100644 --- a/src/pybind/mgr/rook/module.py +++ b/src/pybind/mgr/rook/module.py @@ -286,6 +286,7 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator): # Unknown type -- skip it continue + sd.container_image_name = p['container_image_name'] result.append(sd) return result diff --git a/src/pybind/mgr/rook/rook_cluster.py b/src/pybind/mgr/rook/rook_cluster.py index 6a8de2a9b312a..4d6828b3f300b 100644 --- a/src/pybind/mgr/rook/rook_cluster.py +++ b/src/pybind/mgr/rook/rook_cluster.py @@ -320,11 +320,19 @@ class RookCluster(object): for p in pods: d = p.to_dict() # p['metadata']['creationTimestamp'] + + image_name = None + for c in d['spec']['containers']: + # look at the first listed container in the pod... + image_name = c['image'] + break + pods_summary.append({ "name": d['metadata']['name'], "hostname": d['spec']['node_name'], "labels": d['metadata']['labels'], - 'phase': d['status']['phase'] + 'phase': d['status']['phase'], + 'container_image_name': image_name, }) return pods_summary -- 2.39.5