Fix semver compare in kueue_manager (#729)

* fix: semver compare in kueue_manager

* fix: dry_run_return_val in kueue_manager

* feat: operate on Version everywhere

Author: scaliby

src/xpk/core/kueue_manager.py

@@ -40,6 +40,7 @@
 from ..utils.file import write_tmp_file
 from ..utils.console import xpk_print, xpk_exit
 from ..utils.templates import TEMPLATE_PATH, get_templates_absolute_path
+from packaging.version import Version
 
 WAIT_FOR_KUEUE_TIMEOUT = "10m"
 CLUSTER_QUEUE_NAME = "cluster-queue"
@@ -51,7 +52,7 @@
 KUEUE_SUB_SLICING_TOPOLOGY_JINJA_FILE = "kueue_sub_slicing_topology.yaml.j2"
 MEMORY_SIZE_PER_VM = 1.2
 MIN_MEMORY_LIMIT_SIZE = 4096
-KUEUE_VERSION = "v0.12.2"
+KUEUE_VERSION = Version("v0.12.2")
 
 
 @dataclass
@@ -78,7 +79,7 @@ class KueueManager:
 
   def __init__(
       self,
-      kueue_version: str = KUEUE_VERSION,
+      kueue_version: Version = KUEUE_VERSION,
       template_path=TEMPLATE_PATH,
   ):
     self.kueue_version = kueue_version
@@ -111,17 +112,17 @@ def install_or_upgrade(
         )
         return 0
       else:
-        xpk_print(f"Upgrading Kueue to version {self.kueue_version}...")
+        xpk_print(f"Upgrading Kueue to version v{self.kueue_version}...")
     else:
-      xpk_print(f"Installing Kueue version {self.kueue_version}...")
+      xpk_print(f"Installing Kueue version v{self.kueue_version}...")
 
     install_return_code = self.__install(tolerations)
     if install_return_code != 0:
       return install_return_code
 
     return self.__configure(kueue_config)
 
-  def get_installed_kueue_version(self) -> tuple[int, str | None]:
+  def get_installed_kueue_version(self) -> tuple[int, Version | None]:
     command = (
         "kubectl get deployment kueue-controller-manager -n kueue-system -o"
         " jsonpath='{.spec.template.spec.containers[0].image}'"
@@ -130,15 +131,14 @@ def get_installed_kueue_version(self) -> tuple[int, str | None]:
     return_code, val = run_command_for_value(
         command,
         task,
-        dry_run_return_val="""
-        v0.12.1""",
+        dry_run_return_val="",
     )
     if return_code != 0:
       return return_code, None
     version_tag = val.split(":")
     if len(version_tag) == 1:
       return 1, None
-    return return_code, version_tag[-1]
+    return return_code, Version(version_tag[-1])
 
   def __install(
       self,
@@ -162,7 +162,7 @@ def __install(
     return self.__wait_for_kueue_available()
 
   def __install_kueue_crs(self) -> int:
-    manifest_url = f"https://github.com/kubernetes-sigs/kueue/releases/download/{self.kueue_version}/manifests.yaml"
+    manifest_url = f"https://github.com/kubernetes-sigs/kueue/releases/download/v{self.kueue_version}/manifests.yaml"
     install_command = (
         f"kubectl apply --server-side --force-conflicts -f {manifest_url}"
     )

src/xpk/core/kueue_manager_test.py

@@ -21,6 +21,7 @@
 
 from xpk.core.kueue_manager import KueueConfig, KueueManager
 from xpk.core.system_characteristics import AcceleratorType, SystemCharacteristics
+from packaging.version import Version
 
 
 class KueueManagerTest(unittest.TestCase):
@@ -83,7 +84,7 @@ def test_install_or_upgrade_when_newer_version_already_installed(
       self, mock_configure, mock_install, mock_get_version
   ):
     """Test install_or_upgrade when Kueue is already up to date."""
-    mock_get_version.return_value = (0, "v0.12.3")
+    mock_get_version.return_value = (0, Version("v0.12.3"))
     kueue_config = MagicMock(spec=KueueConfig)
 
     result = self.kueue_manager.install_or_upgrade(kueue_config)
@@ -99,7 +100,7 @@ def test_install_or_upgrade_when_outdated(
       mock_get_version,
   ):
     """Test install_or_upgrade when an older version of Kueue is installed."""
-    mock_get_version.return_value = (0, "v0.11.0")
+    mock_get_version.return_value = (0, Version("v0.11.0"))
     kueue_config = MagicMock(spec=KueueConfig)
 
     with (