about summary refs log tree commit diff
path: root/nixos/doc/manual
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-03-06 18:01:19 +0000
committerGitHub <noreply@github.com>2024-03-06 18:01:19 +0000
commit8a8a630460413b06ebb48a4ff69d649071c4a245 (patch)
tree529ab1bcded2e82160d50df72bd3c4f46276c946 /nixos/doc/manual
parentd6370b05b5a3b0ae1292d9dd3ef823b22ce37c4e (diff)
parent58ae79ea707579c40102ddf62d84b902a987c58b (diff)
downloadnixlib-8a8a630460413b06ebb48a4ff69d649071c4a245.tar
nixlib-8a8a630460413b06ebb48a4ff69d649071c4a245.tar.gz
nixlib-8a8a630460413b06ebb48a4ff69d649071c4a245.tar.bz2
nixlib-8a8a630460413b06ebb48a4ff69d649071c4a245.tar.lz
nixlib-8a8a630460413b06ebb48a4ff69d649071c4a245.tar.xz
nixlib-8a8a630460413b06ebb48a4ff69d649071c4a245.tar.zst
nixlib-8a8a630460413b06ebb48a4ff69d649071c4a245.zip
Merge master into staging-next
Diffstat (limited to 'nixos/doc/manual')
-rw-r--r--nixos/doc/manual/release-notes/rl-2405.section.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md
index ca3e072539d8..a41622d6059f 100644
--- a/nixos/doc/manual/release-notes/rl-2405.section.md
+++ b/nixos/doc/manual/release-notes/rl-2405.section.md
@@ -121,6 +121,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
 
 - The `power.ups` module now generates `upsd.conf`, `upsd.users` and `upsmon.conf` automatically from a set of new configuration options. This breaks compatibility with existing `power.ups` setups where these files were created manually. Back up these files before upgrading NixOS.
 
+- `k3s` was updated to [v1.29](https://github.com/k3s-io/k3s/releases/tag/v1.29.1%2Bk3s2). See [changelog and upgrade notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.29.md#urgent-upgrade-notes) for more information.
+
 - `k9s` was updated to v0.31. There have been various breaking changes in the config file format,
   check out the changelog of [v0.29](https://github.com/derailed/k9s/releases/tag/v0.29.0),
   [v0.30](https://github.com/derailed/k9s/releases/tag/v0.30.0) and