From 635376d3af33ce8fa6a3d3f0974dcde53be44520 Mon Sep 17 00:00:00 2001 From: pennae Date: Sat, 8 Jan 2022 06:59:18 +0100 Subject: Revert "nixos/kubernetes: make lib option internal and readonly" This reverts commit 7e28421e1704c95c056f2b2e7fc27a7569182e0f. --- nixos/modules/services/cluster/kubernetes/kubelet.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'nixos/modules/services/cluster/kubernetes/kubelet.nix') diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index 2d58547ce4c..3e8eac96f6b 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -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; -- cgit 1.4.1