From 30c9210d9763ff01f4780194342fcfad6c6b6344 Mon Sep 17 00:00:00 2001 From: Adam King Date: Thu, 18 Mar 2021 13:20:46 -0400 Subject: [PATCH] mgr/orchestrator: remove image name field from 'orch ps' and 'orch ls' Now that we're typically using the image digests the name isn't as helpful. We also end up in scenarios where some images use tags for their name and others use the digest so the image name comes out as "mix" in orch ls despite it being the same image. Fixes: https://tracker.ceph.com/issues/47333 Signed-off-by: Adam King --- src/pybind/mgr/orchestrator/module.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py index cd843ff17003..90cb117c3a92 100644 --- a/src/pybind/mgr/orchestrator/module.py +++ b/src/pybind/mgr/orchestrator/module.py @@ -557,15 +557,13 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule, now = datetime_now() table = PrettyTable( ['NAME', 'RUNNING', 'REFRESHED', 'AGE', - 'PLACEMENT', - 'IMAGE NAME', 'IMAGE ID' + 'PLACEMENT', 'IMAGE ID' ], border=False) table.align['NAME'] = 'l' table.align['RUNNING'] = 'r' table.align['REFRESHED'] = 'l' table.align['AGE'] = 'l' - table.align['IMAGE NAME'] = 'l' table.align['IMAGE ID'] = 'l' table.align['PLACEMENT'] = 'l' table.left_padding_width = 0 @@ -588,7 +586,6 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule, refreshed, nice_delta(now, s.created), pl, - ukn(s.container_image_name), ukn(s.container_image_id)[0:12], )) @@ -627,7 +624,7 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule, now = datetime_now() table = PrettyTable( ['NAME', 'HOST', 'STATUS', 'REFRESHED', 'AGE', 'PORTS', - 'VERSION', 'IMAGE NAME', 'IMAGE ID', 'CONTAINER ID'], + 'VERSION', 'IMAGE ID', 'CONTAINER ID'], border=False) table.align = 'l' table.left_padding_width = 0 @@ -653,7 +650,6 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule, nice_delta(now, s.created), s.get_port_summary() or '-', ukn(s.version), - ukn(s.container_image_name), ukn(s.container_image_id)[0:12], ukn(s.container_id))) -- 2.47.3