diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index b14ca9e3e72f..da046e62bfbc 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -20,6 +20,12 @@
PHP now defaults to PHP 8.0, updated from 7.4.
+
+
+ kOps now defaults to 1.21.0, which uses containerd as the
+ default runtime.
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 8648f89dbd38..5ae9a5ccfd74 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -7,6 +7,7 @@ In addition to numerous new and upgraded packages, this release has the followin
## Highlights {#sec-release-21.11-highlights}
- PHP now defaults to PHP 8.0, updated from 7.4.
+- kOps now defaults to 1.21.0, which uses containerd as the default runtime.
## New Services {#sec-release-21.11-new-services}
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 4dc37364e7ba..54d13f819ab8 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -53,11 +53,6 @@ rec {
mkKops = generic;
- kops_1_18 = mkKops {
- version = "1.18.2";
- sha256 = "17na83j6sfhk69w9ssvicc0xd1904z952ad3zzbpha50lcy6nlhp";
- };
-
kops_1_19 = mkKops rec {
version = "1.19.2";
sha256 = "15csxih1xy8myky37n5dyzp5mc31pc4bq9asaw6zz51mgw8ad5r9";
@@ -69,4 +64,10 @@ rec {
sha256 = "011ib3xkj6nn7qax8d0ns8y4jhkwwmry1qnzxklvzssaxhmzs557";
rev = "v${version}";
};
+
+ kops_1_21 = mkKops rec {
+ version = "1.21.0";
+ sha256 = "sha256-T2i3qpg3GC7yaYCGrN1V5XXrUyT+Ce9Q4aV00gQJ7gM=";
+ rev = "v${version}";
+ };
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac525f720f28..3ca6d840318f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30979,11 +30979,11 @@ in
# Exceptions are versions that we need to keep to allow upgrades from older NixOS releases
inherit (callPackage ../applications/networking/cluster/kops {})
mkKops
- kops_1_18
kops_1_19
kops_1_20
+ kops_1_21
;
- kops = kops_1_20;
+ kops = kops_1_21;
lguf-brightness = callPackage ../misc/lguf-brightness { };