From 12ad9c622030cb6c5f7ca8756f60e4eea309d120 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Sun, 12 Jan 2025 13:17:34 +0100
Subject: [PATCH 1/2] k3s_1_32: init at 1.32.0+k3s1

Release: https://github.com/k3s-io/k3s/releases/tag/v1.32.0%2Bk3s1
---
 .../cluster/k3s/1_32/chart-versions.nix        | 10 ++++++++++
 .../cluster/k3s/1_32/images-versions.json      | 18 ++++++++++++++++++
 .../networking/cluster/k3s/1_32/versions.nix   | 15 +++++++++++++++
 .../networking/cluster/k3s/default.nix         | 11 ++++++++++-
 pkgs/top-level/all-packages.nix                |  1 +
 5 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix
 create mode 100644 pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
 create mode 100644 pkgs/applications/networking/cluster/k3s/1_32/versions.nix

diff --git a/pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix
new file mode 100644
index 000000000000..7f65917312ed
--- /dev/null
+++ b/pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix
@@ -0,0 +1,10 @@
+{
+  traefik-crd = {
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-27.0.201+up27.0.2.tgz";
+    sha256 = "0vwprcb60y15sc4lmi58gl1zr3yhsq43jlbsfm7gs20ci90frv16";
+  };
+  traefik = {
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-27.0.201+up27.0.2.tgz";
+    sha256 = "12dp1r82qfzqfzs4sfxc54rnw8kv42a3w4gpk5v3qkhqm6fkrnn1";
+  };
+}
diff --git a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
new file mode 100644
index 000000000000..e7a6aa4950ad
--- /dev/null
+++ b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
@@ -0,0 +1,18 @@
+{
+  "airgap-images-amd64": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.0%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "0dz8zpb1la98y63x7qs00s28bzn10ycipwsf6a5lvyhzzgpl253a"
+  },
+  "airgap-images-arm": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.0%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "04qsn75xzfl29fksnb0rzcj7cfdi84smmhn9v47l423zbgr30pfv"
+  },
+  "airgap-images-arm64": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.0%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "1bk8skws87561n06mkwh92c93v5rinf8nmwydn06p8crz9ggp5q6"
+  },
+  "images-list": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.0%2Bk3s1/k3s-images.txt",
+    "sha256": "1gqiaszfw49hsbn7xkkadykaf028vys13ykqvpkqar0f7hwwbja6"
+  }
+}
diff --git a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix
new file mode 100644
index 000000000000..1e2c9a4fac75
--- /dev/null
+++ b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix
@@ -0,0 +1,15 @@
+{
+  k3sVersion = "1.32.0+k3s1";
+  k3sCommit = "cca8facaa33a3ec7897349a8740fd96029590c31";
+  k3sRepoSha256 = "0l8mciwv2wr266zxv9zc5wpgf92gqvzg4d08z4g63wbvsi7zflzh";
+  k3sVendorHash = "sha256-3hY67A6GbzB2ki5GB7GmmmGG5A4cup17zhkUNiN1chk=";
+  chartVersions = import ./chart-versions.nix;
+  imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
+  k3sRootVersion = "0.14.1";
+  k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
+  k3sCNIVersion = "1.6.0-k3s1";
+  k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7";
+  containerdVersion = "1.7.23-k3s2";
+  containerdSha256 = "0lp9vxq7xj74wa7hbivvl5hwg2wzqgsxav22wa0p1l7lc1dqw8dm";
+  criCtlVersion = "1.31.0-k3s2";
+}
diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix
index ac960f233907..34928938c1df 100644
--- a/pkgs/applications/networking/cluster/k3s/default.nix
+++ b/pkgs/applications/networking/cluster/k3s/default.nix
@@ -12,7 +12,6 @@ let
   extraArgs = builtins.removeAttrs args [ "callPackage" ];
 in
 {
-  # 1_29 can be built with the same builder as 1_30
   k3s_1_29 = common (
     (import ./1_29/versions.nix)
     // {
@@ -42,4 +41,14 @@ in
       ];
     }
   ) extraArgs;
+
+  k3s_1_32 = common (
+    (import ./1_32/versions.nix)
+    // {
+      updateScript = [
+        ./update-script.sh
+        "32"
+      ];
+    }
+  ) extraArgs;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af8b9319566e..b012cdf3fdc7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14088,6 +14088,7 @@ with pkgs;
     k3s_1_29
     k3s_1_30
     k3s_1_31
+    k3s_1_32
     ;
   k3s = k3s_1_31;
 

From 35505caf6bc76444a0b4239e1b19325b2d32539b Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Mon, 13 Jan 2025 17:17:36 +0100
Subject: [PATCH 2/2] k3s: k3s_1_31 -> k3s_1_32

Bump k3s (latest) alias from k3s_1_31 to k3s_1_32.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b012cdf3fdc7..d8d3221e03fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14090,7 +14090,7 @@ with pkgs;
     k3s_1_31
     k3s_1_32
     ;
-  k3s = k3s_1_31;
+  k3s = k3s_1_32;
 
   kapow = libsForQt5.callPackage ../applications/misc/kapow { };