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

Revert "nixos/kubernetes: make lib option internal and readonly"

Browse source 
This reverts commit 7e28421e17.
This commit is contained in:
pennae 2022-01-08 06:59:18 +01:00 • committed by zowoq
parent 5308c5bbbd
commit 635376d3af
6 changed files with 16 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,6 @@ let
top = config.services.kubernetes;
otop = options.services.kubernetes;
cfg = top.kubelet;
klib = options.services.kubernetes.lib.default;
cniConfig =
if cfg.cni.config != [] && cfg.cni.configDir != null then
@ -28,7 +27,7 @@ let
config.Cmd = ["/bin/pause"];
};
kubeconfig = klib.mkKubeConfig "kubelet" cfg.kubeconfig;
kubeconfig = top.lib.mkKubeConfig "kubelet" cfg.kubeconfig;
manifestPath = "kubernetes/manifests";
@ -178,7 +177,7 @@ in
type = str;
};
kubeconfig = klib.mkKubeConfigOptions "Kubelet";
kubeconfig = top.lib.mkKubeConfigOptions "Kubelet";
manifests = mkOption {
description = "List of manifests to bootstrap with kubelet (only pods can be created as manifest entry)";
@ -359,7 +358,7 @@ in
services.kubernetes.kubelet.hostname = with config.networking;
mkDefault (hostName + optionalString (domain != null) ".${domain}");
services.kubernetes.pki.certs = with klib; {
services.kubernetes.pki.certs = with top.lib; {
kubelet = mkCert {
name = "kubelet";
CN = top.kubelet.hostname;