ensure right version format in cni

canonical · May 10, 2024 · 670eed5 · 670eed5
1 parent a5b3d1e
commit 670eed5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/build-scripts/components/cni/version b/build-scripts/components/cni/version
@@ -1 +1 @@
-1.4.0
+v1.4.0
diff --git a/build-scripts/hack/update-component-versions.py b/build-scripts/hack/update-component-versions.py
@@ -37,9 +37,9 @@
 HELM_RELEASE_BRANCH = "release-3.14"
 
 
-def get_kubernetes_version(marker: str) -> str:
+def get_kubernetes_version() -> str:
     """Update Kubernetes version based on the specified marker file"""
-    LOG.info("Checking latest Kubernetes version from %s", marker)
+    LOG.info("Checking latest Kubernetes version from %s", KUBERNETES_VERSION_MARKER)
     return util.read_url(KUBERNETES_VERSION_MARKER)
 
 
@@ -54,7 +54,8 @@ def get_cni_version() -> str:
 
         for dep in deps["dependencies"]:
             if dep["name"] == "cni":
-                return dep["version"]
+                ersion = dep["version"]
+                return f"v{ersion.lstrip('v')}"
 
         raise Exception(f"Failed to find cni dependency in {deps_file}")