From 1516fb287bd48594962efea94073bd7001d6e99a Mon Sep 17 00:00:00 2001 From: Adam King Date: Fri, 1 Sep 2023 09:05:04 -0400 Subject: [PATCH] mgr/cephadm: don't use image tag in orch upgrade ls Using the tag seems to screw up the auth URL generated and is unnecessary since we're trying to get a list of tags for the image anyway. Fixes: https://tracker.ceph.com/issues/62679 Signed-off-by: Adam King (cherry picked from commit 0f4426d3a085fc2f5137593029469c3b20ace77e) --- src/pybind/mgr/cephadm/upgrade.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pybind/mgr/cephadm/upgrade.py b/src/pybind/mgr/cephadm/upgrade.py index 25bdf9be4f608..c6947b8ebfaa6 100644 --- a/src/pybind/mgr/cephadm/upgrade.py +++ b/src/pybind/mgr/cephadm/upgrade.py @@ -263,6 +263,9 @@ class CephadmUpgrade: if not image: image = self.mgr.container_image_base reg_name, bare_image = image.split('/', 1) + if ':' in bare_image: + # for our purposes, we don't want to use the tag here + bare_image = bare_image.split(':')[0] reg = Registry(reg_name) (current_major, current_minor, _) = self._get_current_version() versions = [] -- 2.39.5