kubernetes: 1.11.3 -> 1.12.0

- kubelet CAdvisor port has been removed
This commit is contained in:
Johan Thomsen
2018-09-30 14:49:26 +02:00
parent b66d6f404e
commit a91c293aaf
3 changed files with 3 additions and 10 deletions

View File

@@ -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 != "")