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/pki.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'nixos/modules/services/cluster/kubernetes/pki.nix') diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix index 00d572a5098..76ab03cd520 100644 --- a/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/nixos/modules/services/cluster/kubernetes/pki.nix @@ -1,11 +1,10 @@ -{ config, options, lib, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; let top = config.services.kubernetes; cfg = top.pki; - klib = options.services.kubernetes.lib; csrCA = pkgs.writeText "kube-pki-cacert-csr.json" (builtins.toJSON { key = { @@ -30,7 +29,7 @@ let cfsslAPITokenLength = 32; clusterAdminKubeconfig = with cfg.certs.clusterAdmin; - klib.mkKubeConfig "cluster-admin" { + top.lib.mkKubeConfig "cluster-admin" { server = top.apiserverAddress; certFile = cert; keyFile = key; @@ -251,7 +250,7 @@ in # - it would be better with a more Nix-oriented way of managing addons systemd.services.kube-addon-manager = mkIf top.addonManager.enable (mkMerge [{ environment.KUBECONFIG = with cfg.certs.addonManager; - klib.mkKubeConfig "addon-manager" { + top.lib.mkKubeConfig "addon-manager" { server = top.apiserverAddress; certFile = cert; keyFile = key; @@ -344,7 +343,7 @@ in ''; services.flannel = with cfg.certs.flannelClient; { - kubeconfig = klib.mkKubeConfig "flannel" { + kubeconfig = top.lib.mkKubeConfig "flannel" { server = top.apiserverAddress; certFile = cert; keyFile = key; -- cgit 1.4.1