diff options
| author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2018-09-30 20:51:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-30 20:51:48 +0200 |
| commit | a2e00dfb575dc11105cc87218b38b93a32c0c53f (patch) | |
| tree | ab5a8eb6f4dd99d05ca1135426ee3316ac36bc12 | |
| parent | aaef04f86528c19afc122d5ae4d4dc50101ca417 (diff) | |
| parent | a91c293aaf2f6b2939418e3be9f0d2b1b349e43c (diff) | |
| download | nixlib-a2e00dfb575dc11105cc87218b38b93a32c0c53f.tar nixlib-a2e00dfb575dc11105cc87218b38b93a32c0c53f.tar.gz nixlib-a2e00dfb575dc11105cc87218b38b93a32c0c53f.tar.bz2 nixlib-a2e00dfb575dc11105cc87218b38b93a32c0c53f.tar.lz nixlib-a2e00dfb575dc11105cc87218b38b93a32c0c53f.tar.xz nixlib-a2e00dfb575dc11105cc87218b38b93a32c0c53f.tar.zst nixlib-a2e00dfb575dc11105cc87218b38b93a32c0c53f.zip | |
Merge pull request #47560 from johanot/kubernetes-1.12
kubernetes: 1.11.3 -> 1.12.0
| -rw-r--r-- | nixos/modules/rename.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/networking/cluster/kubernetes/default.nix | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index bc9ff9f63dd7..eb74b9bcac12 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -39,6 +39,7 @@ with lib; (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"]) (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "") (mkRenamedOptionModule [ "services" "kubernetes" "addons" "dashboard" "enableRBAC" ] [ "services" "kubernetes" "addons" "dashboard" "rbac" "enable" ]) + (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "") (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ]) (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ]) (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "defaultListenAddress" ]) 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 != "") diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 96dab6aa66a1..776a1667514f 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.11.3"; + version = "1.12.0"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1gwb5gs9l0adv3qc70wf8dwvbjh1mmgd3hh1jkwsbbnach28dvzb"; + sha256 = "0bnfhrli9xqf7ygfq5i5p6nsgv7ic57b5b705zbqsxrc24pvsy4s"; }; buildInputs = [ removeReferencesTo makeWrapper which go_1_10 rsync go-bindata ]; |