diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index bdd55a59370b..e105d689864b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -625,6 +625,12 @@ for vim). + + + The default kops version is now 1.25.1 and + support for 1.22 and older has been dropped. + + k3s no longer supports docker as runtime diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 69e0cbd2ad51..43e28836a4e3 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -206,6 +206,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). Use `configure.packages` instead. - Neovim can not be configured with plug anymore (still works for vim). +- The default `kops` version is now 1.25.1 and support for 1.22 and older has been dropped. + - `k3s` no longer supports docker as runtime due to upstream dropping support. - `k3s` supports `clusterInit` option, and it is enabled by default, for servers. diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index a18e60f051bf..cf5711398710 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -49,15 +49,9 @@ in rec { mkKops = generic; - kops_1_22 = mkKops rec { - version = "1.22.4"; - sha256 = "sha256-osU7yI77ZALGrAGuP8qAgv+ogDRn+BSVmcjPbi/WEKE="; - rev = "v${version}"; - }; - kops_1_23 = mkKops rec { - version = "1.23.2"; - sha256 = "sha256-9GANjGRS9QaJw+CEeMv/f+rEu37QV2YxMvSRSH6+3PM="; + version = "1.23.4"; + sha256 = "sha256-hUj/kUyaqo8q3SJTkd5+9Ld8kfE8wCYNJ2qIATjXqhU="; rev = "v${version}"; }; @@ -67,4 +61,9 @@ rec { rev = "v${version}"; }; + kops_1_25 = mkKops rec { + version = "1.25.1"; + sha256 = "sha256-wKmEdcORXBKQ1AjYr0tNimxs//tSNPO3VQpEPC2mieA="; + rev = "v${version}"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48ff25932b05..f397aec77e2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36199,11 +36199,11 @@ with pkgs; # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases inherit (callPackage ../applications/networking/cluster/kops {}) mkKops - kops_1_22 kops_1_23 kops_1_24 + kops_1_25 ; - kops = kops_1_24; + kops = kops_1_25; lguf-brightness = callPackage ../misc/lguf-brightness { };