From 4a190d5885ee810f2ab967f516cdb0f6008f80a5 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Sat, 10 May 2025 11:12:29 -0300
Subject: [PATCH] k3s_1_33: init 1.33.0+k3s1

https://github.com/k3s-io/k3s/releases/tag/v1.33.0%2Bk3s1
---
 .../cluster/k3s/1_33/chart-versions.nix        | 10 ++++++++++
 .../cluster/k3s/1_33/images-versions.json      | 18 ++++++++++++++++++
 .../networking/cluster/k3s/1_33/versions.nix   | 15 +++++++++++++++
 .../networking/cluster/k3s/default.nix         | 10 ++++++++++
 .../networking/cluster/k3s/update-script.sh    |  2 ++
 pkgs/top-level/all-packages.nix                |  1 +
 6 files changed, 56 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix
 create mode 100644 pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
 create mode 100644 pkgs/applications/networking/cluster/k3s/1_33/versions.nix

diff --git a/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix
new file mode 100644
index 000000000000..f511cbde3870
--- /dev/null
+++ b/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix
@@ -0,0 +1,10 @@
+{
+  traefik-crd = {
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-34.2.1+up34.2.0.tgz";
+    sha256 = "0bnvkp1bxfsccgdnvpq3ni3p2h8jyvj0iclbqj0rsls8vv1jnp9z";
+  };
+  traefik = {
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-34.2.1+up34.2.0.tgz";
+    sha256 = "16ljy2ncn2kc4kr3m93w2kfw4vjk8is3cp3i2lx4b7afbmi75zyw";
+  };
+}
diff --git a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
new file mode 100644
index 000000000000..5d212c7f9e0e
--- /dev/null
+++ b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
@@ -0,0 +1,18 @@
+{
+  "airgap-images-amd64": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.0%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "2822af9a2341033243bd1aff7433c0670bcad4059a8d0a35fb314dba24692674"
+  },
+  "airgap-images-arm": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.0%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "cf175be8674dd1812cd92930a852ef7a11572c4588180f51d5c19bdfd0a810e4"
+  },
+  "airgap-images-arm64": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.0%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "c97f7a86a04aad7d5dc74d7e85e0fbc097e9edf76358f8a7c2097e6ca9740211"
+  },
+  "images-list": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.0%2Bk3s1/k3s-images.txt",
+    "sha256": "aa8e10337aef453cb17e6408dbaec9eb2da409ca6ba1f8bc7332fcef97fdaf3a"
+  }
+}
diff --git a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
new file mode 100644
index 000000000000..be10b6dd7b6a
--- /dev/null
+++ b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
@@ -0,0 +1,15 @@
+{
+  k3sVersion = "1.33.0+k3s1";
+  k3sCommit = "63ab8e534cdfce2a60f4b016dfedb4f8d74ae8ec";
+  k3sRepoSha256 = "1ysfzb4216qk9gjmp2zp103xzjgz8irc7h9m4yp041gkvffa7pyg";
+  k3sVendorHash = "sha256-eVMCrOAOCB7saYuxQQUUrmRHT+ZURXESTI6ZRKSDGZs=";
+  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 = "2.0.4-k3s4";
+  containerdSha256 = "05j5jyjnirks11z2930w4k5ij015hsm4pd2wxgj2531fyiy98azl";
+  criCtlVersion = "1.31.0-k3s2";
+}
diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix
index 0ca8f3c39bb6..e174741f2e1a 100644
--- a/pkgs/applications/networking/cluster/k3s/default.nix
+++ b/pkgs/applications/networking/cluster/k3s/default.nix
@@ -41,4 +41,14 @@ in
       ];
     }
   ) extraArgs;
+
+  k3s_1_33 = common (
+    (import ./1_33/versions.nix)
+    // {
+      updateScript = [
+        ./update-script.sh
+        "33"
+      ];
+    }
+  ) extraArgs;
 }
diff --git a/pkgs/applications/networking/cluster/k3s/update-script.sh b/pkgs/applications/networking/cluster/k3s/update-script.sh
index bb77d1e53674..7339b2ec4e97 100755
--- a/pkgs/applications/networking/cluster/k3s/update-script.sh
+++ b/pkgs/applications/networking/cluster/k3s/update-script.sh
@@ -35,6 +35,8 @@ cd "$K3S_STORE_PATH"
 # Set the DRONE variables as they are expected to be set in version.sh
 DRONE_TAG="$LATEST_TAG_NAME"
 DRONE_COMMIT="$K3S_COMMIT"
+NO_DAPPER=1 # Skips git_version.sh execution in scripts/version.sh#L8
+source "${K3S_STORE_PATH}/scripts/git_version.sh"
 source "${K3S_STORE_PATH}/scripts/version.sh"
 
 K3S_ROOT_SHA256=$(nix-prefetch-url --quiet --unpack \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87e8e3032f93..fe47f4c18e34 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13044,6 +13044,7 @@ with pkgs;
     k3s_1_30
     k3s_1_31
     k3s_1_32
+    k3s_1_33
     ;
   k3s = k3s_1_32;