diff options
| author | Johan Thomsen <jth@dbc.dk> | 2019-08-24 13:22:47 +0200 |
|---|---|---|
| committer | Sarah Brofeldt <sbrofeldt@gmail.com> | 2019-09-04 17:38:41 +0200 |
| commit | d891283aa42d383b3042a3556a4c38514fbb533b (patch) | |
| tree | 69adc6072d2fbb4e7d9da304d2d631f062c70bae /nixos | |
| parent | 10e416ce61eb1361dc889ef3bb125c7156af20c8 (diff) | |
| download | nixlib-d891283aa42d383b3042a3556a4c38514fbb533b.tar nixlib-d891283aa42d383b3042a3556a4c38514fbb533b.tar.gz nixlib-d891283aa42d383b3042a3556a4c38514fbb533b.tar.bz2 nixlib-d891283aa42d383b3042a3556a4c38514fbb533b.tar.lz nixlib-d891283aa42d383b3042a3556a4c38514fbb533b.tar.xz nixlib-d891283aa42d383b3042a3556a4c38514fbb533b.tar.zst nixlib-d891283aa42d383b3042a3556a4c38514fbb533b.zip | |
nixos/kubernetes: make module compatible with v1.15.x
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/rename.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/flannel.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/kubelet.nix | 7 |
3 files changed, 2 insertions, 9 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 9e0ab60ca679..1fa91f05030d 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -34,6 +34,7 @@ with lib; (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "caFile" ] [ "services" "kubernetes" "apiserver" "etcd" "caFile" ]) (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "applyManifests" ] "") (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "") + (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "allowPrivileged" ] "") (mkRenamedOptionModule [ "services" "kubernetes" "proxy" "address" ] ["services" "kubernetes" "proxy" "bindAddress"]) (mkRemovedOptionModule [ "services" "kubernetes" "verbose" ] "") (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ]) diff --git a/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixos/modules/services/cluster/kubernetes/flannel.nix index 93ee2fd65eeb..74d10d684375 100644 --- a/nixos/modules/services/cluster/kubernetes/flannel.nix +++ b/nixos/modules/services/cluster/kubernetes/flannel.nix @@ -14,10 +14,9 @@ let buildInputs = [ pkgs.makeWrapper ]; } '' mkdir -p $out - cp ${pkgs.kubernetes.src}/cluster/centos/node/bin/mk-docker-opts.sh $out/mk-docker-opts.sh # bashInteractive needed for `compgen` - makeWrapper ${pkgs.bashInteractive}/bin/bash $out/mk-docker-opts --add-flags "$out/mk-docker-opts.sh" + makeWrapper ${pkgs.bashInteractive}/bin/bash $out/mk-docker-opts --add-flags "${pkgs.kubernetes}/bin/mk-docker-opts.sh" ''; in { diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index e93062d97437..250da4c807ec 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -61,12 +61,6 @@ in type = str; }; - allowPrivileged = mkOption { - description = "Whether to allow Kubernetes containers to request privileged mode."; - default = false; - type = bool; - }; - clusterDns = mkOption { description = "Use alternative DNS."; default = "10.1.0.1"; @@ -262,7 +256,6 @@ in RestartSec = "1000ms"; ExecStart = ''${top.package}/bin/kubelet \ --address=${cfg.address} \ - --allow-privileged=${boolToString cfg.allowPrivileged} \ --authentication-token-webhook \ --authentication-token-webhook-cache-ttl="10s" \ --authorization-mode=Webhook \ |