diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2015-04-28 14:12:53 +0200 |
|---|---|---|
| committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2015-04-28 14:12:53 +0200 |
| commit | f5bc58d733e57e5887e3224de14fa12e44aca84f (patch) | |
| tree | 65ab7941d4c1b2477817e2bcc363256b8ed000b2 /nixos | |
| parent | 7b878a7ca9207147e1a1fa3b19e2912cd9216493 (diff) | |
| parent | 6cb195a83d43531c465b6678ca6bd94ef205fea3 (diff) | |
| download | nixpkgs-f5bc58d733e57e5887e3224de14fa12e44aca84f.tar nixpkgs-f5bc58d733e57e5887e3224de14fa12e44aca84f.tar.gz nixpkgs-f5bc58d733e57e5887e3224de14fa12e44aca84f.tar.bz2 nixpkgs-f5bc58d733e57e5887e3224de14fa12e44aca84f.tar.lz nixpkgs-f5bc58d733e57e5887e3224de14fa12e44aca84f.tar.xz nixpkgs-f5bc58d733e57e5887e3224de14fa12e44aca84f.tar.zst nixpkgs-f5bc58d733e57e5887e3224de14fa12e44aca84f.zip | |
Merge pull request #7545 from offlinehacker/pkgs/kubernetes/fixes
kubernetes: update to 0.15, module fixes
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index d9ae0454ba5..6a775bb159f 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -224,7 +224,7 @@ in { machines = mkOption { description = "Kubernetes controller list of machines to schedule to schedule onto"; - default = []; + default = [config.networking.hostName]; type = types.listOf types.str; }; @@ -310,6 +310,12 @@ in { type = types.str; }; + master = mkOption { + description = "Kubernetes apiserver address"; + default = "${cfg.apiserver.address}:${toString cfg.apiserver.port}"; + type = types.str; + }; + extraOpts = mkOption { description = "Kubernetes proxy extra command line options."; default = ""; @@ -355,6 +361,7 @@ in { --secure_port=${toString cfg.apiserver.securePort} \ --portal_net=${cfg.apiserver.portalNet} \ --logtostderr=true \ + --runtime_config=api/v1beta3 \ ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ ${cfg.apiserver.extraOpts} ''; @@ -416,7 +423,6 @@ in { script = '' export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH" exec ${cfg.package}/bin/kubelet \ - --etcd_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \ --api_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.kubelet.apiServers} \ --address=${cfg.kubelet.address} \ --port=${toString cfg.kubelet.port} \ @@ -443,7 +449,7 @@ in { after = [ "network-interfaces.target" "etcd.service" ]; serviceConfig = { ExecStart = ''${cfg.package}/bin/kube-proxy \ - --etcd_servers=${concatMapStringsSep "," (s: "http://${s}") cfg.etcdServers} \ + --master=${cfg.proxy.master} \ --bind_address=${cfg.proxy.address} \ --logtostderr=true \ ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ |