nixos/kubernetes: add extraConfig to kubelet config (#338526)

This commit is contained in:
Sarah Brofeldt 2024-09-08 20:35:46 +02:00 committed by GitHub
commit 8a508485c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 0 deletions

View File

@ -454,6 +454,8 @@
- Kanidm previously had an incorrect systemd service type, causing dependent units with an `after` and `requires` directive to start before `kanidm*` finished startup. The module has now been updated in line with upstream recommendations.
- The kubelet configuration file can now be amended with arbitrary additional content using the `services.kubernetes.kubelet.extraConfig` option.
- To facilitate dependency injection, the `imgui` package now builds a static archive using vcpkg' CMake rules.
The derivation now installs "impl" headers selectively instead of by a wildcard.
Use `imgui.src` if you just want to access the unpacked sources.

View File

@ -66,6 +66,7 @@ let
// lib.optionalAttrs (cfg.clusterDomain != "") { clusterDomain = cfg.clusterDomain; }
// lib.optionalAttrs (cfg.clusterDns != []) { clusterDNS = cfg.clusterDns; }
// lib.optionalAttrs (cfg.featureGates != {}) { featureGates = cfg.featureGates; }
// lib.optionalAttrs (cfg.extraConfig != {}) cfg.extraConfig
));
manifestPath = "kubernetes/manifests";
@ -184,6 +185,12 @@ in
type = separatedString " ";
};
extraConfig = mkOption {
description = "Kubernetes kubelet extra configuration file entries.";
default = {};
type = attrsOf attrs;
};
featureGates = mkOption {
description = "Attribute set of feature gate";
default = top.featureGates;