public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kubernetes module: add support for common CA file

Browse Source
This commit is contained in:
Jaka Hudoklin 2017-05-30 11:57:52 +02:00 committed by Robin Gloster
parent c96ca5f3bd
commit c2622910ab
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/services/cluster/kubernetes/default.nix
View File

@ -49,7 +49,7 @@ let
caFile = mkOption { caFile = mkOption {
description = "${prefix} certificate authrority file used to connect to kube-apiserver."; description = "${prefix} certificate authrority file used to connect to kube-apiserver.";
type = types.nullOr types.path; type = types.nullOr types.path;
default = null; default = cfg.caFile;
}; };
certFile = mkOption { certFile = mkOption {
@ -256,13 +256,19 @@ in {
caFile = mkOption { caFile = mkOption {
description = "Etcd ca file."; description = "Etcd ca file.";
default = null; default = cfg.caFile;
type = types.nullOr types.path; type = types.nullOr types.path;
}; };
}; };
kubeconfig = mkKubeConfigOptions "Default kubeconfig"; kubeconfig = mkKubeConfigOptions "Default kubeconfig";
caFile = mkOption {
description = "Default kubernetes certificate authority";
type = types.nullOr types.path;
default = null;
};
dataDir = mkOption { dataDir = mkOption {
description = "Kubernetes root directory for managing kubelet files."; description = "Kubernetes root directory for managing kubelet files.";
default = "/var/lib/kubernetes"; default = "/var/lib/kubernetes";
@ -335,7 +341,7 @@ in {
clientCaFile = mkOption { clientCaFile = mkOption {
description = "Kubernetes apiserver CA file for client auth."; description = "Kubernetes apiserver CA file for client auth.";
default = null; default = cfg.caFile;
type = types.nullOr types.path; type = types.nullOr types.path;
}; };
@ -427,7 +433,7 @@ in {
kubeletClientCaFile = mkOption { kubeletClientCaFile = mkOption {
description = "Path to a cert file for connecting to kubelet."; description = "Path to a cert file for connecting to kubelet.";
default = null; default = cfg.caFile;
type = types.nullOr types.path; type = types.nullOr types.path;
}; };
@ -529,7 +535,7 @@ in {
Kubernetes controller manager certificate authority file included in Kubernetes controller manager certificate authority file included in
service account's token secret. service account's token secret.
''; '';
default = null; default = cfg.caFile;
type = types.nullOr types.path; type = types.nullOr types.path;
}; };