From ae54338fa8fb13f42019bfae1103c4d109baf47d Mon Sep 17 00:00:00 2001
From: Dimitris Karakasilis <jimmykarily@gmail.com>
Date: Thu, 26 Sep 2024 15:15:15 +0300
Subject: [PATCH] Build the latest 3 k3s versions (#1064)

Fixes https://github.com/kairos-io/kairos/issues/2878

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
---
 packages/k8s/k3s/build.yaml      |  2 +-
 packages/k8s/k3s/collection.yaml | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/k8s/k3s/build.yaml b/packages/k8s/k3s/build.yaml
index 5926ae1..97021e6 100644
--- a/packages/k8s/k3s/build.yaml
+++ b/packages/k8s/k3s/build.yaml
@@ -10,7 +10,7 @@ env:
   - INSTALL_K3S_SKIP_SELINUX_RPM="true"
   # Remove any possible "+N" from the end of the version. We only bump that to
   # avoid overwritting existing images when we want the package to be rebuilt.
-  - INSTALL_K3S_VERSION=v{{ regexReplaceAll "\\+\\d+$" .Values.version "" }}+k3s1
+  - INSTALL_K3S_VERSION=v{{ regexReplaceAll "\\+\\d+$" .Values.version "" }}+k3s{{.Values.k3s_version}}
   {{$arch:=(default "amd64" .Values.arch)}}
   {{ if eq $arch "arm" }}
   - ARCH=arm64
diff --git a/packages/k8s/k3s/collection.yaml b/packages/k8s/k3s/collection.yaml
index 9cbe38a..0d1fc60 100644
--- a/packages/k8s/k3s/collection.yaml
+++ b/packages/k8s/k3s/collection.yaml
@@ -2,7 +2,7 @@ packages:
   - name: k3s-openrc
     category: k8s
     version: "1.31.1"
-    k3s_version: "2"
+    k3s_version: "1"
     labels:
       github.owner: "k3s-io"
       github.repo: "k3s"
@@ -14,8 +14,8 @@ packages:
     description: " Lightweight Kubernetes "
   - name: k3s-openrc
     category: k8s
-    version: "1.28.9"
-    k3s_version: "2"
+    version: "1.30.5"
+    k3s_version: "1"
     labels:
       github.owner: "k3s-io"
       github.repo: "k3s"
@@ -27,8 +27,8 @@ packages:
     description: " Lightweight Kubernetes "
   - name: k3s-openrc
     category: k8s
-    version: "1.29.4"
-    k3s_version: "2"
+    version: "1.29.9"
+    k3s_version: "1"
     labels:
       github.owner: "k3s-io"
       github.repo: "k3s"
@@ -41,7 +41,7 @@ packages:
   - name: k3s-systemd
     category: k8s
     version: "1.31.1"
-    k3s_version: "2"
+    k3s_version: "1"
     labels:
       github.owner: "k3s-io"
       github.repo: "k3s"
@@ -53,8 +53,8 @@ packages:
     description: " Lightweight Kubernetes "
   - name: k3s-systemd
     category: k8s
-    version: "1.28.9"
-    k3s_version: "2"
+    version: "1.30.5"
+    k3s_version: "1"
     labels:
       github.owner: "k3s-io"
       github.repo: "k3s"
@@ -66,8 +66,8 @@ packages:
     description: " Lightweight Kubernetes "
   - name: k3s-systemd
     category: k8s
-    version: "1.29.4"
-    k3s_version: "2"
+    version: "1.29.9"
+    k3s_version: "1"
     labels:
       github.owner: "k3s-io"
       github.repo: "k3s"