From b632336d4939e4ccf7d9f08f673bcb2a28fe7ba7 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Thu, 27 Mar 2025 16:01:12 +0100
Subject: [PATCH 1/3] rke2_latest: 1.31.1+rke2r1 -> 1.32.3+rke2r1

https://github.com/rancher/rke2/releases/tag/v1.32.3%2Brke2r1
---
 .../cluster/rke2/latest/versions.nix          | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/cluster/rke2/latest/versions.nix b/pkgs/applications/networking/cluster/rke2/latest/versions.nix
index 90019cfa2c46..51ad6245208c 100644
--- a/pkgs/applications/networking/cluster/rke2/latest/versions.nix
+++ b/pkgs/applications/networking/cluster/rke2/latest/versions.nix
@@ -1,14 +1,14 @@
 {
-  rke2Version = "1.31.1+rke2r1";
-  rke2Commit = "909d20d6a28cd7656b7177190f06f69f57927613";
-  rke2TarballHash = "sha256-9ZryOX6QMNpjDtsOXLOVNPjCc6AMAa+XDLOn1EpyCcg=";
-  rke2VendorHash = "sha256-7nWbWi4oJTOWZ5iZr9ptECDJJakPg4qZ7hW+tU7LBsI=";
-  k8sVersion = "v1.31.1";
-  k8sImageTag = "v1.31.1-rke2r1-build20240912";
-  etcdVersion = "v3.5.13-k3s1-build20240910";
+  rke2Version = "1.32.3+rke2r1";
+  rke2Commit = "18005e93ee0b015b78be47cf6515ae6d3a9afd55";
+  rke2TarballHash = "sha256-rDqSq38WoNN+9dMPTg/iteqkfX/pnlRtzt1HmhkAbRI=";
+  rke2VendorHash = "sha256-GwwNXW4JmhvO47V9SysOiKTfK2z55PkWpTDUE2qJgpA=";
+  k8sVersion = "v1.32.3";
+  k8sImageTag = "v1.32.3-rke2r1-build20250312";
+  etcdVersion = "v3.5.19-k3s1-build20250306";
   pauseVersion = "3.6";
-  ccmVersion = "v1.31.0-build20240910";
-  dockerizedVersion = "v1.31.1-rke2r1";
-  golangVersion = "go1.22.6";
-  eol = "2025-10-28";
+  ccmVersion = "v1.32.0-rc3.0.20241220224140-68fbd1a6b543-build20250101";
+  dockerizedVersion = "v1.32.3-rke2r1";
+  golangVersion = "go1.23.6";
+  eol = "2026-02-28";
 }

From 6e97ad4b37f597401cd9010cb7eb9624068063a4 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Thu, 27 Mar 2025 16:02:00 +0100
Subject: [PATCH 2/3] rke2_stable: 1.30.5+rke2r1 -> 1.31.7+rke2r1

https://github.com/rancher/rke2/releases/tag/v1.31.7%2Brke2r1
---
 .../cluster/rke2/stable/versions.nix          | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/cluster/rke2/stable/versions.nix b/pkgs/applications/networking/cluster/rke2/stable/versions.nix
index 879a54b39937..bc94b035fd06 100644
--- a/pkgs/applications/networking/cluster/rke2/stable/versions.nix
+++ b/pkgs/applications/networking/cluster/rke2/stable/versions.nix
@@ -1,14 +1,14 @@
 {
-  rke2Version = "1.30.5+rke2r1";
-  rke2Commit = "0c83bc82315cd61664880d0b52a7e070e9fbd623";
-  rke2TarballHash = "sha256-K5e7TNlL97PQ13IYnr4PSrXb4XaGJT9bPq55iWL0m1g=";
-  rke2VendorHash = "sha256-QIcVyWnedKNF10OqJ2WmZqZeKA+8hvwDQ4Pl+WUOEJY=";
-  k8sVersion = "v1.30.5";
-  k8sImageTag = "v1.30.5-rke2r1-build20240912";
-  etcdVersion = "v3.5.13-k3s1-build20240910";
+  rke2Version = "1.31.7+rke2r1";
+  rke2Commit = "7b18bda1c5ec1e110cec206f9163f6aba3a2154d";
+  rke2TarballHash = "sha256-u7U5eGLTrm1mxatl3v4iCBzw/Rin8wlndSs/OKLWtiw=";
+  rke2VendorHash = "sha256-UiFpAZHic2GVvdW4RDJxH2j5N2x8ec43YFfvBDR4fyM=";
+  k8sVersion = "v1.31.7";
+  k8sImageTag = "v1.31.7-rke2r1-build20250312";
+  etcdVersion = "v3.5.19-k3s1-build20250306";
   pauseVersion = "3.6";
-  ccmVersion = "v1.30.4-build20240910";
-  dockerizedVersion = "v1.30.5-rke2r1";
-  golangVersion = "go1.22.6";
-  eol = "2025-06-28";
+  ccmVersion = "v1.31.2-0.20241016053446-0955fa330f90-build20241016";
+  dockerizedVersion = "v1.31.7-rke2r1";
+  golangVersion = "go1.23.6";
+  eol = "2025-10-28";
 }

From f096dbfae2406a442aff82b6521abe861bb6e0da Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Thu, 27 Mar 2025 16:03:13 +0100
Subject: [PATCH 3/3] rke2_testing: mark as vulnerable as the RKE2 channel no
 longer serves updates

---
 .../networking/cluster/rke2/default.nix       | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/cluster/rke2/default.nix b/pkgs/applications/networking/cluster/rke2/default.nix
index c31ce510a2d0..2561b2c465c2 100644
--- a/pkgs/applications/networking/cluster/rke2/default.nix
+++ b/pkgs/applications/networking/cluster/rke2/default.nix
@@ -25,13 +25,19 @@ in
     }
   ) extraArgs;
 
-  rke2_testing = common (
-    (import ./testing/versions.nix)
-    // {
-      updateScript = [
-        ./update-script.sh
-        "testing"
-      ];
-    }
-  ) extraArgs;
+  rke2_testing =
+    (common (
+      (import ./testing/versions.nix)
+      // {
+        updateScript = [
+          ./update-script.sh
+          "testing"
+        ];
+      }
+    ) extraArgs).overrideAttrs
+      {
+        meta.knownVulnerabilities = [
+          "The RKE2 testing channel no longer serves releases, this package will not receive updates."
+        ];
+      };
 }