diff options
author | pennae <github@quasiparticle.net> | 2022-01-08 06:59:18 +0100 |
---|---|---|
committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-01-08 17:13:27 +1000 |
commit | 635376d3af33ce8fa6a3d3f0974dcde53be44520 (patch) | |
tree | 6d9b4e2596a6bc15bb87b49414bed2e3ed21b0cc /nixos/modules/services/cluster/kubernetes/proxy.nix | |
parent | 5308c5bbbdc46be559f55595f10484ac47895b3e (diff) | |
download | nixpkgs-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/proxy.nix')
-rw-r--r-- | nixos/modules/services/cluster/kubernetes/proxy.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/proxy.nix b/nixos/modules/services/cluster/kubernetes/proxy.nix index 986301f6bd9..5f3da034120 100644 --- a/nixos/modules/services/cluster/kubernetes/proxy.nix +++ b/nixos/modules/services/cluster/kubernetes/proxy.nix @@ -6,7 +6,6 @@ let top = config.services.kubernetes; otop = options.services.kubernetes; cfg = top.proxy; - klib = options.services.kubernetes.lib.default; in { imports = [ @@ -44,7 +43,7 @@ in type = str; }; - kubeconfig = klib.mkKubeConfigOptions "Kubernetes proxy"; + kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes proxy"; verbosity = mkOption { description = '' @@ -73,7 +72,7 @@ in ${optionalString (cfg.featureGates != []) "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ --hostname-override=${cfg.hostname} \ - --kubeconfig=${klib.mkKubeConfig "kube-proxy" cfg.kubeconfig} \ + --kubeconfig=${top.lib.mkKubeConfig "kube-proxy" cfg.kubeconfig} \ ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ ${cfg.extraOpts} ''; @@ -89,7 +88,7 @@ in services.kubernetes.proxy.hostname = with config.networking; mkDefault hostName; services.kubernetes.pki.certs = { - kubeProxyClient = klib.mkCert { + kubeProxyClient = top.lib.mkCert { name = "kube-proxy-client"; CN = "system:kube-proxy"; action = "systemctl restart kube-proxy.service"; |