diff --git a/pkgs/applications/networking/cluster/rke2/README.md b/pkgs/applications/networking/cluster/rke2/README.md index 7835ef3fc77b..1b89b740d370 100644 --- a/pkgs/applications/networking/cluster/rke2/README.md +++ b/pkgs/applications/networking/cluster/rke2/README.md @@ -108,19 +108,9 @@ respective package block. ```nix { - rke2_1_34 = - (common ( - (import ./1_34/versions.nix) - // { - updateScript = [ - ./update-script.sh - "34" - ]; - } - ) extraArgs).overrideAttrs - { - meta.knownVulnerabilities = [ "rke2_1_34 has reached end-of-life on 2026-10-27" ]; - }; + rke2_1_34 = (common (import ./1_34/versions.nix) extraArgs).overrideAttrs { + meta.knownVulnerabilities = [ "rke2_1_34 has reached end-of-life on 2026-10-27" ]; + }; } ``` diff --git a/pkgs/applications/networking/cluster/rke2/builder.nix b/pkgs/applications/networking/cluster/rke2/builder.nix index e8afde0a7bb5..68fe28b50075 100644 --- a/pkgs/applications/networking/cluster/rke2/builder.nix +++ b/pkgs/applications/networking/cluster/rke2/builder.nix @@ -4,7 +4,7 @@ lib: rke2Commit, rke2TarballHash, rke2VendorHash, - updateScript, + updateScript ? null, k8sImageTag, etcdVersion, pauseVersion, diff --git a/pkgs/applications/networking/cluster/rke2/default.nix b/pkgs/applications/networking/cluster/rke2/default.nix index 440b2d0c2453..5b3f1ceac55f 100644 --- a/pkgs/applications/networking/cluster/rke2/default.nix +++ b/pkgs/applications/networking/cluster/rke2/default.nix @@ -5,45 +5,13 @@ let extraArgs = removeAttrs args [ "callPackage" ]; in rec { - rke2_1_32 = common ( - (import ./1_32/versions.nix) - // { - updateScript = [ - ./update-script.sh - "32" - ]; - } - ) extraArgs; + rke2_1_32 = common (import ./1_32/versions.nix) extraArgs; - rke2_1_33 = common ( - (import ./1_33/versions.nix) - // { - updateScript = [ - ./update-script.sh - "33" - ]; - } - ) extraArgs; + rke2_1_33 = common (import ./1_33/versions.nix) extraArgs; - rke2_1_34 = common ( - (import ./1_34/versions.nix) - // { - updateScript = [ - ./update-script.sh - "34" - ]; - } - ) extraArgs; + rke2_1_34 = common (import ./1_34/versions.nix) extraArgs; - rke2_1_35 = common ( - (import ./1_35/versions.nix) - // { - updateScript = [ - ./update-script.sh - "35" - ]; - } - ) extraArgs; + rke2_1_35 = common (import ./1_35/versions.nix) extraArgs; # Automatically set by update script, changes shouldn't be backported rke2_stable = rke2_1_34;