diff options
| author | Johan Thomsen <jth@dbc.dk> | 2018-09-30 14:49:26 +0200 |
|---|---|---|
| committer | Johan Thomsen <jth@dbc.dk> | 2018-09-30 14:49:26 +0200 |
| commit | a91c293aaf2f6b2939418e3be9f0d2b1b349e43c (patch) | |
| tree | d2b082b00031a2fd3c03baf4f45463da23eea61c /nixos/modules/services/cluster/kubernetes | |
| parent | b66d6f404ef73035dfb13acedf360ac796f38ec8 (diff) | |
| download | nixlib-a91c293aaf2f6b2939418e3be9f0d2b1b349e43c.tar nixlib-a91c293aaf2f6b2939418e3be9f0d2b1b349e43c.tar.gz nixlib-a91c293aaf2f6b2939418e3be9f0d2b1b349e43c.tar.bz2 nixlib-a91c293aaf2f6b2939418e3be9f0d2b1b349e43c.tar.lz nixlib-a91c293aaf2f6b2939418e3be9f0d2b1b349e43c.tar.xz nixlib-a91c293aaf2f6b2939418e3be9f0d2b1b349e43c.tar.zst nixlib-a91c293aaf2f6b2939418e3be9f0d2b1b349e43c.zip | |
kubernetes: 1.11.3 -> 1.12.0
- kubelet CAdvisor port has been removed
Diffstat (limited to 'nixos/modules/services/cluster/kubernetes')
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/default.nix | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index aeaa6bd66c99..e63d91eb9aca 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -622,13 +622,6 @@ in { type = types.bool; }; - # TODO: remove this deprecated flag - cadvisorPort = mkOption { - description = "Kubernetes kubelet local cadvisor port."; - default = 4194; - type = types.int; - }; - clusterDns = mkOption { description = "Use alternative DNS."; default = "10.1.0.1"; @@ -862,7 +855,6 @@ in { --hostname-override=${cfg.kubelet.hostname} \ --allow-privileged=${boolToString cfg.kubelet.allowPrivileged} \ --root-dir=${cfg.dataDir} \ - --cadvisor_port=${toString cfg.kubelet.cadvisorPort} \ ${optionalString (cfg.kubelet.clusterDns != "") "--cluster-dns=${cfg.kubelet.clusterDns}"} \ ${optionalString (cfg.kubelet.clusterDomain != "") |