git.iko.soy/typeable/nixpkgs
on master help sign in
Revert "nixos/kubernetes: make lib option internal and readonly"

This reverts commit 7e28421e1704c95c056f2b2e7fc27a7569182e0f.

commit635376d3af33ce8fa6a3d3f0974dcde53be44520 authorpennae <github@quasiparticle.net> dateSat 8 Jan 2022, 06:59 (5 years ago) parent5308c5b
6 files changed+16−23
compare with master
unifiedsplit
nixos/modules/services/cluster/kubernetes/controller-manager.nix+3−4 nixos/modules/services/cluster/kubernetes/default.nix−2 nixos/modules/services/cluster/kubernetes/kubelet.nix+3−4 nixos/modules/services/cluster/kubernetes/pki.nix+4−5 nixos/modules/services/cluster/kubernetes/proxy.nix+3−4 nixos/modules/services/cluster/kubernetes/scheduler.nix+3−4
nixos/modules/services/cluster/kubernetes/controller-manager.nix+3−4
@@ -6,7 +6,6 @@ let
66 top = config.services.kubernetes;
77 otop = options.services.kubernetes;
88 cfg = top.controllerManager;
9− klib = options.services.kubernetes.lib.default;
109in
1110{
1211 imports = [
@@ -57,7 +56,7 @@ in
5756 type = int;
5857 };
5958
60− kubeconfig = klib.mkKubeConfigOptions "Kubernetes controller manager";
59+ kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes controller manager";
6160
6261 leaderElect = mkOption {
6362 description = "Whether to start leader election before executing main loop.";
@@ -130,7 +129,7 @@ in
130129 "--cluster-cidr=${cfg.clusterCidr}"} \
131130 ${optionalString (cfg.featureGates != [])
132131 "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
133− --kubeconfig=${klib.mkKubeConfig "kube-controller-manager" cfg.kubeconfig} \
132+ --kubeconfig=${top.lib.mkKubeConfig "kube-controller-manager" cfg.kubeconfig} \
134133 --leader-elect=${boolToString cfg.leaderElect} \
135134 ${optionalString (cfg.rootCaFile!=null)
136135 "--root-ca-file=${cfg.rootCaFile}"} \
@@ -157,7 +156,7 @@ in
157156 path = top.path;
158157 };
159158
160− services.kubernetes.pki.certs = with klib; {
159+ services.kubernetes.pki.certs = with top.lib; {
161160 controllerManager = mkCert {
162161 name = "kube-controller-manager";
163162 CN = "kube-controller-manager";
nixos/modules/services/cluster/kubernetes/default.nix−2
@@ -193,8 +193,6 @@ in {
193193 inherit mkKubeConfigOptions;
194194 };
195195 type = types.attrs;
196− readOnly = true;
197− internal = true;
198196 };
199197
200198 secretsPath = mkOption {
nixos/modules/services/cluster/kubernetes/kubelet.nix+3−4
@@ -6,7 +6,6 @@ let
66 top = config.services.kubernetes;
77 otop = options.services.kubernetes;
88 cfg = top.kubelet;
9− klib = options.services.kubernetes.lib.default;
109
1110 cniConfig =
1211 if cfg.cni.config != [] && cfg.cni.configDir != null then
@@ -28,7 +27,7 @@ let
2827 config.Cmd = ["/bin/pause"];
2928 };
3029
31− kubeconfig = klib.mkKubeConfig "kubelet" cfg.kubeconfig;
30+ kubeconfig = top.lib.mkKubeConfig "kubelet" cfg.kubeconfig;
3231
3332 manifestPath = "kubernetes/manifests";
3433
@@ -178,7 +177,7 @@ in
178177 type = str;
179178 };
180179
181− kubeconfig = klib.mkKubeConfigOptions "Kubelet";
180+ kubeconfig = top.lib.mkKubeConfigOptions "Kubelet";
182181
183182 manifests = mkOption {
184183 description = "List of manifests to bootstrap with kubelet (only pods can be created as manifest entry)";
@@ -359,7 +358,7 @@ in
359358 services.kubernetes.kubelet.hostname = with config.networking;
360359 mkDefault (hostName + optionalString (domain != null) ".${domain}");
361360
362− services.kubernetes.pki.certs = with klib; {
361+ services.kubernetes.pki.certs = with top.lib; {
363362 kubelet = mkCert {
364363 name = "kubelet";
365364 CN = top.kubelet.hostname;
nixos/modules/services/cluster/kubernetes/pki.nix+4−5
@@ -1,11 +1,10 @@
1−{ config, options, lib, pkgs, ... }:
1+{ config, lib, pkgs, ... }:
22
33with lib;
44
55let
66 top = config.services.kubernetes;
77 cfg = top.pki;
8− klib = options.services.kubernetes.lib;
98
109 csrCA = pkgs.writeText "kube-pki-cacert-csr.json" (builtins.toJSON {
1110 key = {
@@ -30,7 +29,7 @@ let
3029 cfsslAPITokenLength = 32;
3130
3231 clusterAdminKubeconfig = with cfg.certs.clusterAdmin;
33− klib.mkKubeConfig "cluster-admin" {
32+ top.lib.mkKubeConfig "cluster-admin" {
3433 server = top.apiserverAddress;
3534 certFile = cert;
3635 keyFile = key;
@@ -251,7 +250,7 @@ in
251250 # - it would be better with a more Nix-oriented way of managing addons
252251 systemd.services.kube-addon-manager = mkIf top.addonManager.enable (mkMerge [{
253252 environment.KUBECONFIG = with cfg.certs.addonManager;
254− klib.mkKubeConfig "addon-manager" {
253+ top.lib.mkKubeConfig "addon-manager" {
255254 server = top.apiserverAddress;
256255 certFile = cert;
257256 keyFile = key;
@@ -344,7 +343,7 @@ in
344343 '';
345344
346345 services.flannel = with cfg.certs.flannelClient; {
347− kubeconfig = klib.mkKubeConfig "flannel" {
346+ kubeconfig = top.lib.mkKubeConfig "flannel" {
348347 server = top.apiserverAddress;
349348 certFile = cert;
350349 keyFile = key;
nixos/modules/services/cluster/kubernetes/proxy.nix+3−4
@@ -6,7 +6,6 @@ let
66 top = config.services.kubernetes;
77 otop = options.services.kubernetes;
88 cfg = top.proxy;
9− klib = options.services.kubernetes.lib.default;
109in
1110{
1211 imports = [
@@ -44,7 +43,7 @@ in
4443 type = str;
4544 };
4645
47− kubeconfig = klib.mkKubeConfigOptions "Kubernetes proxy";
46+ kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes proxy";
4847
4948 verbosity = mkOption {
5049 description = ''
@@ -73,7 +72,7 @@ in
7372 ${optionalString (cfg.featureGates != [])
7473 "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
7574 --hostname-override=${cfg.hostname} \
76− --kubeconfig=${klib.mkKubeConfig "kube-proxy" cfg.kubeconfig} \
75+ --kubeconfig=${top.lib.mkKubeConfig "kube-proxy" cfg.kubeconfig} \
7776 ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \
7877 ${cfg.extraOpts}
7978 '';
@@ -89,7 +88,7 @@ in
8988 services.kubernetes.proxy.hostname = with config.networking; mkDefault hostName;
9089
9190 services.kubernetes.pki.certs = {
92− kubeProxyClient = klib.mkCert {
91+ kubeProxyClient = top.lib.mkCert {
9392 name = "kube-proxy-client";
9493 CN = "system:kube-proxy";
9594 action = "systemctl restart kube-proxy.service";
nixos/modules/services/cluster/kubernetes/scheduler.nix+3−4
@@ -6,7 +6,6 @@ let
66 top = config.services.kubernetes;
77 otop = options.services.kubernetes;
88 cfg = top.scheduler;
9− klib = options.services.kubernetes.lib.default;
109in
1110{
1211 ###### interface
@@ -33,7 +32,7 @@ in
3332 type = listOf str;
3433 };
3534
36− kubeconfig = klib.mkKubeConfigOptions "Kubernetes scheduler";
35+ kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes scheduler";
3736
3837 leaderElect = mkOption {
3938 description = "Whether to start leader election before executing main loop.";
@@ -70,7 +69,7 @@ in
7069 --address=${cfg.address} \
7170 ${optionalString (cfg.featureGates != [])
7271 "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
73− --kubeconfig=${klib.mkKubeConfig "kube-scheduler" cfg.kubeconfig} \
72+ --kubeconfig=${top.lib.mkKubeConfig "kube-scheduler" cfg.kubeconfig} \
7473 --leader-elect=${boolToString cfg.leaderElect} \
7574 --port=${toString cfg.port} \
7675 ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \
@@ -88,7 +87,7 @@ in
8887 };
8988
9089 services.kubernetes.pki.certs = {
91− schedulerClient = klib.mkCert {
90+ schedulerClient = top.lib.mkCert {
9291 name = "kube-scheduler-client";
9392 CN = "system:kube-scheduler";
9493 action = "systemctl restart kube-scheduler.service";