Avoid ManagedOSVersion naming collisions by appending type to name

Signed-off-by: Andrea Mazzotti <andrea.mazzotti@suse.com>
rancher · Jun 5, 2024 · a274ace · a274ace
1 parent 124c58a
commit a274ace
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 42 deletions.
diff --git a/channels/sle-micro-5-5-kvm.json b/channels/sle-micro-5-5-kvm.json
@@ -1,7 +1,7 @@
 [
     {
         "metadata": {
-            "name": "kvm-v2.0.2-2.2.115"
+            "name": "kvm-v2.0.2-2.2.115-os"
         },
         "spec": {
             "version": "v2.0.2-2.2.115",
@@ -14,7 +14,7 @@
     },
     {
         "metadata": {
-            "name": "kvm-v2.0.2-2.2.20"
+            "name": "kvm-v2.0.2-2.2.20-os"
         },
         "spec": {
             "version": "v2.0.2-2.2.20",
@@ -27,7 +27,7 @@
     },
     {
         "metadata": {
-            "name": "kvm-v2.0.2-2.2.85"
+            "name": "kvm-v2.0.2-2.2.85-os"
         },
         "spec": {
             "version": "v2.0.2-2.2.85",
@@ -40,7 +40,7 @@
     },
     {
         "metadata": {
-            "name": "kvm-v2.0.4-3.5.19"
+            "name": "kvm-v2.0.4-3.5.19-os"
         },
         "spec": {
             "version": "v2.0.4-3.5.19",
@@ -53,7 +53,7 @@
     },
     {
         "metadata": {
-            "name": "kvm-v2.0.4-3.5.2"
+            "name": "kvm-v2.0.4-3.5.2-os"
         },
         "spec": {
             "version": "v2.0.4-3.5.2",

diff --git a/channels/sle-micro-5-5-rt.json b/channels/sle-micro-5-5-rt.json
@@ -1,7 +1,7 @@
 [
     {
         "metadata": {
-            "name": "rt-v2.0.2-3.2.119"
+            "name": "rt-v2.0.2-3.2.119-os"
         },
         "spec": {
             "version": "v2.0.2-3.2.119",
@@ -14,7 +14,7 @@
     },
     {
         "metadata": {
-            "name": "rt-v2.0.2-3.2.23"
+            "name": "rt-v2.0.2-3.2.23-os"
         },
         "spec": {
             "version": "v2.0.2-3.2.23",
@@ -27,7 +27,7 @@
     },
     {
         "metadata": {
-            "name": "rt-v2.0.2-3.2.86"
+            "name": "rt-v2.0.2-3.2.86-os"
         },
         "spec": {
             "version": "v2.0.2-3.2.86",
@@ -40,7 +40,7 @@
     },
     {
         "metadata": {
-            "name": "rt-v2.0.4-4.5.21"
+            "name": "rt-v2.0.4-4.5.21-os"
         },
         "spec": {
             "version": "v2.0.4-4.5.21",
@@ -53,7 +53,7 @@
     },
     {
         "metadata": {
-            "name": "rt-v2.0.4-4.5.3"
+            "name": "rt-v2.0.4-4.5.3-os"
         },
         "spec": {
             "version": "v2.0.4-4.5.3",

diff --git a/channels/sle-micro-5-5.json b/channels/sle-micro-5-5.json
@@ -1,7 +1,7 @@
 [
     {
         "metadata": {
-            "name": "v2.0.2-4.2.102"
+            "name": "v2.0.2-4.2.102-os"
         },
         "spec": {
             "version": "v2.0.2-4.2.102",
@@ -14,7 +14,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.2-4.2.105"
+            "name": "v2.0.2-4.2.105-os"
         },
         "spec": {
             "version": "v2.0.2-4.2.105",
@@ -27,7 +27,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.2-4.2.107"
+            "name": "v2.0.2-4.2.107-os"
         },
         "spec": {
             "version": "v2.0.2-4.2.107",
@@ -40,7 +40,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.2-4.2.109"
+            "name": "v2.0.2-4.2.109-os"
         },
         "spec": {
             "version": "v2.0.2-4.2.109",
@@ -53,7 +53,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.2-4.2.111"
+            "name": "v2.0.2-4.2.111-os"
         },
         "spec": {
             "version": "v2.0.2-4.2.111",
@@ -66,7 +66,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.2-4.2.20"
+            "name": "v2.0.2-4.2.20-os"
         },
         "spec": {
             "version": "v2.0.2-4.2.20",
@@ -79,7 +79,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.2-4.2.70"
+            "name": "v2.0.2-4.2.70-os"
         },
         "spec": {
             "version": "v2.0.2-4.2.70",
@@ -92,7 +92,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.2-4.2.85"
+            "name": "v2.0.2-4.2.85-os"
         },
         "spec": {
             "version": "v2.0.2-4.2.85",
@@ -105,7 +105,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.2-4.2.87"
+            "name": "v2.0.2-4.2.87-os"
         },
         "spec": {
             "version": "v2.0.2-4.2.87",
@@ -118,7 +118,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.2-4.2.89"
+            "name": "v2.0.2-4.2.89-os"
         },
         "spec": {
             "version": "v2.0.2-4.2.89",
@@ -131,7 +131,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.2-4.2.91"
+            "name": "v2.0.2-4.2.91-os"
         },
         "spec": {
             "version": "v2.0.2-4.2.91",
@@ -144,7 +144,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.2-4.2.93"
+            "name": "v2.0.2-4.2.93-os"
         },
         "spec": {
             "version": "v2.0.2-4.2.93",
@@ -157,7 +157,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.2-4.2.94"
+            "name": "v2.0.2-4.2.94-os"
         },
         "spec": {
             "version": "v2.0.2-4.2.94",
@@ -170,7 +170,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.2-4.2.96"
+            "name": "v2.0.2-4.2.96-os"
         },
         "spec": {
             "version": "v2.0.2-4.2.96",
@@ -183,7 +183,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.2-4.2.97"
+            "name": "v2.0.2-4.2.97-os"
         },
         "spec": {
             "version": "v2.0.2-4.2.97",
@@ -196,7 +196,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.2-4.2.99"
+            "name": "v2.0.2-4.2.99-os"
         },
         "spec": {
             "version": "v2.0.2-4.2.99",
@@ -209,7 +209,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.4-5.5.15"
+            "name": "v2.0.4-5.5.15-os"
         },
         "spec": {
             "version": "v2.0.4-5.5.15",
@@ -222,7 +222,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.4-5.5.18"
+            "name": "v2.0.4-5.5.18-os"
         },
         "spec": {
             "version": "v2.0.4-5.5.18",
@@ -235,7 +235,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.4-5.5.2"
+            "name": "v2.0.4-5.5.2-os"
         },
         "spec": {
             "version": "v2.0.4-5.5.2",
@@ -248,7 +248,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.4-5.5.24"
+            "name": "v2.0.4-5.5.24-os"
         },
         "spec": {
             "version": "v2.0.4-5.5.24",
@@ -261,7 +261,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.4-5.5.28"
+            "name": "v2.0.4-5.5.28-os"
         },
         "spec": {
             "version": "v2.0.4-5.5.28",
@@ -274,7 +274,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.4-5.5.30"
+            "name": "v2.0.4-5.5.30-os"
         },
         "spec": {
             "version": "v2.0.4-5.5.30",
@@ -287,7 +287,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.2-4.2.128"
+            "name": "v2.0.2-4.2.128-iso"
         },
         "spec": {
             "version": "v2.0.2-4.2.128",
@@ -300,7 +300,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.2-4.2.27"
+            "name": "v2.0.2-4.2.27-iso"
         },
         "spec": {
             "version": "v2.0.2-4.2.27",
@@ -313,7 +313,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.2-4.2.97"
+            "name": "v2.0.2-4.2.97-iso"
         },
         "spec": {
             "version": "v2.0.2-4.2.97",
@@ -326,7 +326,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.4-5.5.20"
+            "name": "v2.0.4-5.5.20-iso"
         },
         "spec": {
             "version": "v2.0.4-5.5.20",
@@ -339,7 +339,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.4-5.5.3"
+            "name": "v2.0.4-5.5.3-iso"
         },
         "spec": {
             "version": "v2.0.4-5.5.3",
@@ -352,7 +352,7 @@
     },
     {
         "metadata": {
-            "name": "v2.0.4-5.5.6"
+            "name": "v2.0.4-5.5.6-iso"
         },
         "spec": {
             "version": "v2.0.4-5.5.6",

diff --git a/refresh_channels.sh b/refresh_channels.sh
@@ -6,10 +6,11 @@ set -e
 function format_managed_os_version_name() {
     local flavor=$1
     local tag=$2
+    local type=$3
     if [ -z "$flavor" ]; then
-        echo "v${tag}"
+        echo "v${tag}-${type}"
     else
-        echo "${flavor}-v${tag}"
+        echo "${flavor}-v${tag}-${type}"
     fi
 }
 
@@ -84,7 +85,7 @@ while IFS=\= read watch; do
         if [[ $tag =~ ^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$ ]]; then
             continue
         fi
-        managed_os_version_name=$(format_managed_os_version_name "$flavor" "$tag")
+        managed_os_version_name=$(format_managed_os_version_name "$flavor" "$tag" "os")
         append_os_entry "$file" "$managed_os_version_name" "$tag" "$os_repo:$tag" "$display_name OS"
     done
 
@@ -96,7 +97,7 @@ while IFS=\= read watch; do
             if [[ $tag =~ ^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$ ]]; then
                 continue
             fi
-            managed_os_version_name=$(format_managed_os_version_name "$flavor" "$tag")
+            managed_os_version_name=$(format_managed_os_version_name "$flavor" "$tag" "iso")
             append_iso_entry "$file" "$managed_os_version_name" "$tag" "$iso_repo:$tag" "$display_name ISO"
         done
     fi