mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-10-01 17:40:20 +02:00
Revert "nixos/kubernetes: make lib option internal and readonly"
This reverts commit 7e28421e17
.
This commit is contained in:
parent
5308c5bbbd
commit
635376d3af
|
@ -6,7 +6,6 @@ let
|
||||||
top = config.services.kubernetes;
|
top = config.services.kubernetes;
|
||||||
otop = options.services.kubernetes;
|
otop = options.services.kubernetes;
|
||||||
cfg = top.controllerManager;
|
cfg = top.controllerManager;
|
||||||
klib = options.services.kubernetes.lib.default;
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
@ -57,7 +56,7 @@ in
|
||||||
type = int;
|
type = int;
|
||||||
};
|
};
|
||||||
|
|
||||||
kubeconfig = klib.mkKubeConfigOptions "Kubernetes controller manager";
|
kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes controller manager";
|
||||||
|
|
||||||
leaderElect = mkOption {
|
leaderElect = mkOption {
|
||||||
description = "Whether to start leader election before executing main loop.";
|
description = "Whether to start leader election before executing main loop.";
|
||||||
|
@ -130,7 +129,7 @@ in
|
||||||
"--cluster-cidr=${cfg.clusterCidr}"} \
|
"--cluster-cidr=${cfg.clusterCidr}"} \
|
||||||
${optionalString (cfg.featureGates != [])
|
${optionalString (cfg.featureGates != [])
|
||||||
"--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
|
"--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
|
||||||
--kubeconfig=${klib.mkKubeConfig "kube-controller-manager" cfg.kubeconfig} \
|
--kubeconfig=${top.lib.mkKubeConfig "kube-controller-manager" cfg.kubeconfig} \
|
||||||
--leader-elect=${boolToString cfg.leaderElect} \
|
--leader-elect=${boolToString cfg.leaderElect} \
|
||||||
${optionalString (cfg.rootCaFile!=null)
|
${optionalString (cfg.rootCaFile!=null)
|
||||||
"--root-ca-file=${cfg.rootCaFile}"} \
|
"--root-ca-file=${cfg.rootCaFile}"} \
|
||||||
|
@ -157,7 +156,7 @@ in
|
||||||
path = top.path;
|
path = top.path;
|
||||||
};
|
};
|
||||||
|
|
||||||
services.kubernetes.pki.certs = with klib; {
|
services.kubernetes.pki.certs = with top.lib; {
|
||||||
controllerManager = mkCert {
|
controllerManager = mkCert {
|
||||||
name = "kube-controller-manager";
|
name = "kube-controller-manager";
|
||||||
CN = "kube-controller-manager";
|
CN = "kube-controller-manager";
|
||||||
|
|
|
@ -193,8 +193,6 @@ in {
|
||||||
inherit mkKubeConfigOptions;
|
inherit mkKubeConfigOptions;
|
||||||
};
|
};
|
||||||
type = types.attrs;
|
type = types.attrs;
|
||||||
readOnly = true;
|
|
||||||
internal = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
secretsPath = mkOption {
|
secretsPath = mkOption {
|
||||||
|
|
|
@ -6,7 +6,6 @@ let
|
||||||
top = config.services.kubernetes;
|
top = config.services.kubernetes;
|
||||||
otop = options.services.kubernetes;
|
otop = options.services.kubernetes;
|
||||||
cfg = top.kubelet;
|
cfg = top.kubelet;
|
||||||
klib = options.services.kubernetes.lib.default;
|
|
||||||
|
|
||||||
cniConfig =
|
cniConfig =
|
||||||
if cfg.cni.config != [] && cfg.cni.configDir != null then
|
if cfg.cni.config != [] && cfg.cni.configDir != null then
|
||||||
|
@ -28,7 +27,7 @@ let
|
||||||
config.Cmd = ["/bin/pause"];
|
config.Cmd = ["/bin/pause"];
|
||||||
};
|
};
|
||||||
|
|
||||||
kubeconfig = klib.mkKubeConfig "kubelet" cfg.kubeconfig;
|
kubeconfig = top.lib.mkKubeConfig "kubelet" cfg.kubeconfig;
|
||||||
|
|
||||||
manifestPath = "kubernetes/manifests";
|
manifestPath = "kubernetes/manifests";
|
||||||
|
|
||||||
|
@ -178,7 +177,7 @@ in
|
||||||
type = str;
|
type = str;
|
||||||
};
|
};
|
||||||
|
|
||||||
kubeconfig = klib.mkKubeConfigOptions "Kubelet";
|
kubeconfig = top.lib.mkKubeConfigOptions "Kubelet";
|
||||||
|
|
||||||
manifests = mkOption {
|
manifests = mkOption {
|
||||||
description = "List of manifests to bootstrap with kubelet (only pods can be created as manifest entry)";
|
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;
|
services.kubernetes.kubelet.hostname = with config.networking;
|
||||||
mkDefault (hostName + optionalString (domain != null) ".${domain}");
|
mkDefault (hostName + optionalString (domain != null) ".${domain}");
|
||||||
|
|
||||||
services.kubernetes.pki.certs = with klib; {
|
services.kubernetes.pki.certs = with top.lib; {
|
||||||
kubelet = mkCert {
|
kubelet = mkCert {
|
||||||
name = "kubelet";
|
name = "kubelet";
|
||||||
CN = top.kubelet.hostname;
|
CN = top.kubelet.hostname;
|
||||||
|
|
|
@ -1,11 +1,10 @@
|
||||||
{ config, options, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
top = config.services.kubernetes;
|
top = config.services.kubernetes;
|
||||||
cfg = top.pki;
|
cfg = top.pki;
|
||||||
klib = options.services.kubernetes.lib;
|
|
||||||
|
|
||||||
csrCA = pkgs.writeText "kube-pki-cacert-csr.json" (builtins.toJSON {
|
csrCA = pkgs.writeText "kube-pki-cacert-csr.json" (builtins.toJSON {
|
||||||
key = {
|
key = {
|
||||||
|
@ -30,7 +29,7 @@ let
|
||||||
cfsslAPITokenLength = 32;
|
cfsslAPITokenLength = 32;
|
||||||
|
|
||||||
clusterAdminKubeconfig = with cfg.certs.clusterAdmin;
|
clusterAdminKubeconfig = with cfg.certs.clusterAdmin;
|
||||||
klib.mkKubeConfig "cluster-admin" {
|
top.lib.mkKubeConfig "cluster-admin" {
|
||||||
server = top.apiserverAddress;
|
server = top.apiserverAddress;
|
||||||
certFile = cert;
|
certFile = cert;
|
||||||
keyFile = key;
|
keyFile = key;
|
||||||
|
@ -251,7 +250,7 @@ in
|
||||||
# - it would be better with a more Nix-oriented way of managing addons
|
# - it would be better with a more Nix-oriented way of managing addons
|
||||||
systemd.services.kube-addon-manager = mkIf top.addonManager.enable (mkMerge [{
|
systemd.services.kube-addon-manager = mkIf top.addonManager.enable (mkMerge [{
|
||||||
environment.KUBECONFIG = with cfg.certs.addonManager;
|
environment.KUBECONFIG = with cfg.certs.addonManager;
|
||||||
klib.mkKubeConfig "addon-manager" {
|
top.lib.mkKubeConfig "addon-manager" {
|
||||||
server = top.apiserverAddress;
|
server = top.apiserverAddress;
|
||||||
certFile = cert;
|
certFile = cert;
|
||||||
keyFile = key;
|
keyFile = key;
|
||||||
|
@ -344,7 +343,7 @@ in
|
||||||
'';
|
'';
|
||||||
|
|
||||||
services.flannel = with cfg.certs.flannelClient; {
|
services.flannel = with cfg.certs.flannelClient; {
|
||||||
kubeconfig = klib.mkKubeConfig "flannel" {
|
kubeconfig = top.lib.mkKubeConfig "flannel" {
|
||||||
server = top.apiserverAddress;
|
server = top.apiserverAddress;
|
||||||
certFile = cert;
|
certFile = cert;
|
||||||
keyFile = key;
|
keyFile = key;
|
||||||
|
|
|
@ -6,7 +6,6 @@ let
|
||||||
top = config.services.kubernetes;
|
top = config.services.kubernetes;
|
||||||
otop = options.services.kubernetes;
|
otop = options.services.kubernetes;
|
||||||
cfg = top.proxy;
|
cfg = top.proxy;
|
||||||
klib = options.services.kubernetes.lib.default;
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
@ -44,7 +43,7 @@ in
|
||||||
type = str;
|
type = str;
|
||||||
};
|
};
|
||||||
|
|
||||||
kubeconfig = klib.mkKubeConfigOptions "Kubernetes proxy";
|
kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes proxy";
|
||||||
|
|
||||||
verbosity = mkOption {
|
verbosity = mkOption {
|
||||||
description = ''
|
description = ''
|
||||||
|
@ -73,7 +72,7 @@ in
|
||||||
${optionalString (cfg.featureGates != [])
|
${optionalString (cfg.featureGates != [])
|
||||||
"--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
|
"--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
|
||||||
--hostname-override=${cfg.hostname} \
|
--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}"} \
|
${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \
|
||||||
${cfg.extraOpts}
|
${cfg.extraOpts}
|
||||||
'';
|
'';
|
||||||
|
@ -89,7 +88,7 @@ in
|
||||||
services.kubernetes.proxy.hostname = with config.networking; mkDefault hostName;
|
services.kubernetes.proxy.hostname = with config.networking; mkDefault hostName;
|
||||||
|
|
||||||
services.kubernetes.pki.certs = {
|
services.kubernetes.pki.certs = {
|
||||||
kubeProxyClient = klib.mkCert {
|
kubeProxyClient = top.lib.mkCert {
|
||||||
name = "kube-proxy-client";
|
name = "kube-proxy-client";
|
||||||
CN = "system:kube-proxy";
|
CN = "system:kube-proxy";
|
||||||
action = "systemctl restart kube-proxy.service";
|
action = "systemctl restart kube-proxy.service";
|
||||||
|
|
|
@ -6,7 +6,6 @@ let
|
||||||
top = config.services.kubernetes;
|
top = config.services.kubernetes;
|
||||||
otop = options.services.kubernetes;
|
otop = options.services.kubernetes;
|
||||||
cfg = top.scheduler;
|
cfg = top.scheduler;
|
||||||
klib = options.services.kubernetes.lib.default;
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
###### interface
|
###### interface
|
||||||
|
@ -33,7 +32,7 @@ in
|
||||||
type = listOf str;
|
type = listOf str;
|
||||||
};
|
};
|
||||||
|
|
||||||
kubeconfig = klib.mkKubeConfigOptions "Kubernetes scheduler";
|
kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes scheduler";
|
||||||
|
|
||||||
leaderElect = mkOption {
|
leaderElect = mkOption {
|
||||||
description = "Whether to start leader election before executing main loop.";
|
description = "Whether to start leader election before executing main loop.";
|
||||||
|
@ -70,7 +69,7 @@ in
|
||||||
--address=${cfg.address} \
|
--address=${cfg.address} \
|
||||||
${optionalString (cfg.featureGates != [])
|
${optionalString (cfg.featureGates != [])
|
||||||
"--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
|
"--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
|
||||||
--kubeconfig=${klib.mkKubeConfig "kube-scheduler" cfg.kubeconfig} \
|
--kubeconfig=${top.lib.mkKubeConfig "kube-scheduler" cfg.kubeconfig} \
|
||||||
--leader-elect=${boolToString cfg.leaderElect} \
|
--leader-elect=${boolToString cfg.leaderElect} \
|
||||||
--port=${toString cfg.port} \
|
--port=${toString cfg.port} \
|
||||||
${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \
|
${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \
|
||||||
|
@ -88,7 +87,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
services.kubernetes.pki.certs = {
|
services.kubernetes.pki.certs = {
|
||||||
schedulerClient = klib.mkCert {
|
schedulerClient = top.lib.mkCert {
|
||||||
name = "kube-scheduler-client";
|
name = "kube-scheduler-client";
|
||||||
CN = "system:kube-scheduler";
|
CN = "system:kube-scheduler";
|
||||||
action = "systemctl restart kube-scheduler.service";
|
action = "systemctl restart kube-scheduler.service";
|
||||||
|
|
Loading…
Reference in a new issue