From 6c38bb6d5d34b53bd98cfa6936a1d56c43368782 Mon Sep 17 00:00:00 2001 From: Alexandru Scvortov Date: Fri, 13 Aug 2021 17:42:27 +0100 Subject: kubernetes: fix breakage introduced by upgrade to 1.22 --- nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 12 +++++++----- nixos/doc/manual/release-notes/rl-2111.section.md | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'nixos/doc/manual') 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 8504593e768..f88be391879 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 @@ -668,11 +668,6 @@ to use wildcards in the source argument. - - - <<<<<<< HEAD - - The openrazer and @@ -715,6 +710,13 @@ release is also still available. + + + The kubernetes package was upgraded to + 1.22. The kubernetes.apiserver.kubeletHttps + option was removed and HTTPS is always used. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 024ed9c7399..b7cb31883f6 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -171,7 +171,6 @@ pt-services.clipcat.enable). - `programs.neovim.runtime` switched to a `linkFarm` internally, making it impossible to use wildcards in the `source` argument. -<<<<<<< HEAD - The `openrazer` and `openrazer-daemon` packages as well as the `hardware.openrazer` module now require users to be members of the `openrazer` group instead of `plugdev`. With this change, users no longer need be granted the entire set of `plugdev` group permissions, which can include permissions other than those required by `openrazer`. This is desirable from a security point of view. The setting [`harware.openrazer.users`](options.html#opt-services.hardware.openrazer.users) can be used to add users to the `openrazer` group. - The `yambar` package has been split into `yambar` and `yambar-wayland`, corresponding to the xorg and wayland backend respectively. Please switch to `yambar-wayland` if you are on wayland. @@ -182,6 +181,8 @@ To be able to access the web UI this port needs to be opened in the firewall. - The `varnish` package was upgraded from 6.3.x to 6.5.x. `varnish60` for the last LTS release is also still available. +- The `kubernetes` package was upgraded to 1.22. The `kubernetes.apiserver.kubeletHttps` option was removed and HTTPS is always used. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. -- cgit 1.4.1