movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2411.section.md
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. - 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. - 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. The derivation now installs "impl" headers selectively instead of by a wildcard.
Use `imgui.src` if you just want to access the unpacked sources. Use `imgui.src` if you just want to access the unpacked sources.

7
nixos/modules/services/cluster/kubernetes/kubelet.nix
View file

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