From: Adam King <adking@redhat.com>
Date: Fri, 1 Sep 2023 13:05:04 +0000 (-0400)
Subject: mgr/cephadm: don't use image tag in orch upgrade ls
X-Git-Tag: v18.2.1~200^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F53865%2Fhead;p=ceph.git

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 <adking@redhat.com>
(cherry picked from commit 0f4426d3a085fc2f5137593029469c3b20ace77e)
---

diff --git a/src/pybind/mgr/cephadm/upgrade.py b/src/pybind/mgr/cephadm/upgrade.py
index 552964c845871..1bbfcef85a21c 100644
--- a/src/pybind/mgr/cephadm/upgrade.py
+++ b/src/pybind/mgr/cephadm/upgrade.py
@@ -267,6 +267,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 = []