dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nixos/kubernetes: allow setting multiple kubelet dns resolvers (#338523)

Browse Source
This commit is contained in:
Sarah Brofeldt 2024-09-01 15:07:08 +02:00 committed by GitHub
commit 1860dfed71
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2411.section.md
View File

@ -119,6 +119,8 @@
- `grafana` has been updated to version 11.1. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected.
- `services.kubernetes.kubelet.clusterDns` now accepts a list of DNS resolvers rather than a single string, bringing the module more in line with the upstream Kubelet configuration schema.
- `wstunnel` has had a major version upgrade that entailed rewriting the program in Rust.
The module was updated to accommodate for breaking changes.
Breaking changes to the module API were minimised as much as possible,

6
nixos/modules/services/cluster/kubernetes/kubelet.nix
View File

@ -64,7 +64,7 @@ let
} // lib.optionalAttrs (cfg.tlsCertFile != null) { tlsCertFile = cfg.tlsCertFile; }
// lib.optionalAttrs (cfg.tlsKeyFile != null) { tlsPrivateKeyFile = cfg.tlsKeyFile; }
// lib.optionalAttrs (cfg.clusterDomain != "") { clusterDomain = cfg.clusterDomain; }
// lib.optionalAttrs (cfg.clusterDns != "") { clusterDNS = [ cfg.clusterDns ] ; }
// lib.optionalAttrs (cfg.clusterDns != []) { clusterDNS = cfg.clusterDns; }
// lib.optionalAttrs (cfg.featureGates != {}) { featureGates = cfg.featureGates; }
));
@ -112,8 +112,8 @@ in
clusterDns = mkOption {
description = "Use alternative DNS.";
default = "10.1.0.1";
type = str;
default = [ "10.1.0.1" ];
type = listOf str;
};
clusterDomain = mkOption {