Fix k3s/k0s version getters

Splits the version into minor, patch adn revision and compares them
properly to obtain not only the latest patch but also the highest
revision for a given patch

Signed-off-by: Itxaka <[email protected]>

Author: Itxaka

.github/workflows/release-arm.yaml

@@ -72,13 +72,17 @@ jobs:
         run: |
           kubernetes_versions=$(curl -s https://api.github.com/repos/k3s-io/k3s/releases | jq -r '
             [.[] | select(.prerelease == false and .draft == false and (.tag_name | test("rc") | not)) | .tag_name]
-            | map(select(test("^v[0-9]+\\.[0-9]+\\.[0-9]+\\+k3s[0-9]+$")))
-            | map({version: ., minor: (split(".")[0:2] | join("."))})
+            | map({
+               version: .,
+               minor: (split(".")[1:2]|join("")),
+               patch: (split(".")[2:3]|join("")|split("+")[0]),
+               revision: (split("+k3s")[1])
+             })
             | group_by(.minor)
-            | map(max_by(.version))
-            | sort_by(.version)
+            | map(sort_by([(.patch | tonumber), (.revision | tonumber)]) | reverse | .[0])
+            | sort_by(.minor | tonumber)
             | reverse
-            | .[:3]
+            | .[0:3]
             | map(.version)
           ' | jq -c '.')
           echo "kubernetes_versions=$kubernetes_versions" >> $GITHUB_OUTPUT

.github/workflows/release.yaml

@@ -96,13 +96,18 @@ jobs:
           kubernetes_versions=$(curl -s https://api.github.com/repos/k3s-io/k3s/releases | jq -r '
             [.[] | select(.prerelease == false and .draft == false and (.tag_name | test("rc") | not)) | .tag_name]
             | map(select(test("^v[0-9]+\\.[0-9]+\\.[0-9]+\\+k3s[0-9]+$")))
-            | map({version: ., minor: (split(".")[0:2] | join("."))})
-            | group_by(.minor)
-            | map(max_by(.version))
-            | sort_by(.version)
-            | reverse
-            | .[:3]
-            | map(.version)
+            | map({
+               version: .,
+               minor: (split(".")[1:2]|join("")),
+               patch: (split(".")[2:3]|join("")|split("+")[0]),
+               revision: (split("+k3s")[1])
+             })
+           | group_by(.minor)
+           | map(sort_by([(.patch | tonumber), (.revision | tonumber)]) | reverse | .[0])
+           | sort_by(.minor | tonumber)
+           | reverse
+           | .[0:3]
+           | map(.version)
           ' | jq -c '.')
           echo "kubernetes_versions=$kubernetes_versions" >> $GITHUB_OUTPUT
   get-k0s-versions:
@@ -116,16 +121,21 @@ jobs:
         id: get-k0s-releases
         run: |
           kubernetes_versions=$(curl -s https://api.github.com/repos/k0sproject/k0s/releases | jq -r '
-            [.[] | select(.prerelease == false and .draft == false and (.tag_name | test("rc") | not)) | .tag_name]
-            | map(select(test("^v[0-9]+\\.[0-9]+\\.[0-9]+\\+k0s\\.[0-9]+$")))
-            | map({version: ., minor: (split(".")[0:2] | join("."))})
-            | group_by(.minor)
-            | map(max_by(.version))
-            | sort_by(.version)
-            | reverse
-            | .[:3]
-            | map(.version)
-          ' | jq -c '.')
+           [.[] | select(.prerelease == false and .draft == false and (.tag_name | test("rc") | not)) | .tag_name]
+           | map(select(test("^v[0-9]+\\.[0-9]+\\.[0-9]+\\+k0s\\.[0-9]+$")))
+           | map({
+             version: .,
+             minor: (split(".")[1:2]|join("")),
+             patch: (split(".")[2:3]|join("")|split("+")[0]),
+             revision: (split("+k0s.")[1])
+           })
+           | group_by(.minor)
+           | map(sort_by([(.patch | tonumber), (.revision | tonumber)]) | reverse | .[0])
+           | sort_by(.minor | tonumber)
+           | reverse
+           | .[0:3]
+           | map(.version)
+           '| jq -c '.')
           echo "kubernetes_versions=$kubernetes_versions" >> $GITHUB_OUTPUT
   build-standard-k3s:
     uses: ./.github/workflows/reusable-release.yaml