summary refs log tree commit diff
path: root/nixos/modules/services/cluster/kubernetes/kubelet.nix
diff options
context:
space:
mode:
authorpennae <github@quasiparticle.net>2022-01-08 06:59:18 +0100
committerzowoq <59103226+zowoq@users.noreply.github.com>2022-01-08 17:13:27 +1000
commit635376d3af33ce8fa6a3d3f0974dcde53be44520 (patch)
tree6d9b4e2596a6bc15bb87b49414bed2e3ed21b0cc /nixos/modules/services/cluster/kubernetes/kubelet.nix
parent5308c5bbbdc46be559f55595f10484ac47895b3e (diff)
downloadnixpkgs-635376d3af33ce8fa6a3d3f0974dcde53be44520.tar
nixpkgs-635376d3af33ce8fa6a3d3f0974dcde53be44520.tar.gz
nixpkgs-635376d3af33ce8fa6a3d3f0974dcde53be44520.tar.bz2
nixpkgs-635376d3af33ce8fa6a3d3f0974dcde53be44520.tar.lz
nixpkgs-635376d3af33ce8fa6a3d3f0974dcde53be44520.tar.xz
nixpkgs-635376d3af33ce8fa6a3d3f0974dcde53be44520.tar.zst
nixpkgs-635376d3af33ce8fa6a3d3f0974dcde53be44520.zip
Revert "nixos/kubernetes: make lib option internal and readonly"
This reverts commit 7e28421e1704c95c056f2b2e7fc27a7569182e0f.
Diffstat (limited to 'nixos/modules/services/cluster/kubernetes/kubelet.nix')
-rw-r--r--nixos/modules/services/cluster/kubernetes/kubelet.nix7
1 files changed, 3 insertions, 4 deletions
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;