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

nixos/kubernetes: fix module

This commit is contained in:
Jaka Hudoklin 2015-04-25 14:18:25 +02:00
parent cbf1c3ca22
commit 6cb195a83d
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/services/cluster/kubernetes.nix
View File

@ -224,7 +224,7 @@ in {
machines = mkOption { machines = mkOption {
description = "Kubernetes controller list of machines to schedule to schedule onto"; description = "Kubernetes controller list of machines to schedule to schedule onto";
default = []; default = [config.networking.hostName];
type = types.listOf types.str; type = types.listOf types.str;
}; };
@ -310,6 +310,12 @@ in {
type = types.str; type = types.str;
}; };
master = mkOption {
description = "Kubernetes apiserver address";
default = "${cfg.apiserver.address}:${toString cfg.apiserver.port}";
type = types.str;
};
extraOpts = mkOption { extraOpts = mkOption {
description = "Kubernetes proxy extra command line options."; description = "Kubernetes proxy extra command line options.";
default = ""; default = "";
@ -355,6 +361,7 @@ in {
--secure_port=${toString cfg.apiserver.securePort} \ --secure_port=${toString cfg.apiserver.securePort} \
--portal_net=${cfg.apiserver.portalNet} \ --portal_net=${cfg.apiserver.portalNet} \
--logtostderr=true \ --logtostderr=true \
--runtime_config=api/v1beta3 \
${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \
${cfg.apiserver.extraOpts} ${cfg.apiserver.extraOpts}
''; '';
@ -416,7 +423,6 @@ in {
script = '' script = ''
export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH" export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH"
exec ${cfg.package}/bin/kubelet \ exec ${cfg.package}/bin/kubelet \
--etcd_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \
--api_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.kubelet.apiServers} \ --api_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.kubelet.apiServers} \
--address=${cfg.kubelet.address} \ --address=${cfg.kubelet.address} \
--port=${toString cfg.kubelet.port} \ --port=${toString cfg.kubelet.port} \
@ -443,7 +449,7 @@ in {
after = [ "network-interfaces.target" "etcd.service" ]; after = [ "network-interfaces.target" "etcd.service" ];
serviceConfig = { serviceConfig = {
ExecStart = ''${cfg.package}/bin/kube-proxy \ ExecStart = ''${cfg.package}/bin/kube-proxy \
--etcd_servers=${concatMapStringsSep "," (s: "http://${s}") cfg.etcdServers} \ --master=${cfg.proxy.master} \
--bind_address=${cfg.proxy.address} \ --bind_address=${cfg.proxy.address} \
--logtostderr=true \ --logtostderr=true \
${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \