diff options
| author | Jaka Hudoklin <jaka@gatehub.net> | 2019-02-21 00:26:11 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-02-21 00:26:11 +0100 |
| commit | 97a27fd2d27fa25dec8a527c4b578ab0af1a13c1 (patch) | |
| tree | 00298c7bfaa422ade0baf313d69299d8d0d0922b /nixos | |
| parent | 3a022054966fcae27f6c31a1bb4f292ec84ca379 (diff) | |
| download | nixpkgs-97a27fd2d27fa25dec8a527c4b578ab0af1a13c1.tar nixpkgs-97a27fd2d27fa25dec8a527c4b578ab0af1a13c1.tar.gz nixpkgs-97a27fd2d27fa25dec8a527c4b578ab0af1a13c1.tar.bz2 nixpkgs-97a27fd2d27fa25dec8a527c4b578ab0af1a13c1.tar.lz nixpkgs-97a27fd2d27fa25dec8a527c4b578ab0af1a13c1.tar.xz nixpkgs-97a27fd2d27fa25dec8a527c4b578ab0af1a13c1.tar.zst nixpkgs-97a27fd2d27fa25dec8a527c4b578ab0af1a13c1.zip | |
nixos/kubernetes: fix flannel and kubelet startup
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/flannel.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/kubelet.nix | 25 |
2 files changed, 9 insertions, 18 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixos/modules/services/cluster/kubernetes/flannel.nix index 6f97febf5ba..93ee2fd65ee 100644 --- a/nixos/modules/services/cluster/kubernetes/flannel.nix +++ b/nixos/modules/services/cluster/kubernetes/flannel.nix @@ -68,7 +68,7 @@ in systemd.services.docker = { environment.DOCKER_OPTS = "-b none"; - serviceConfig.EnvironmentFile = "/run/flannel/docker"; + serviceConfig.EnvironmentFile = "-/run/flannel/docker"; }; # read environment variables generated by mk-docker-opts diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index 51d1fd30959..c94bb28bf7f 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -244,12 +244,12 @@ in (mkIf cfg.enable { services.kubernetes.kubelet.seedDockerImages = [infraContainer]; - systemd.services.kubelet-bootstrap = { - description = "Boostrap Kubelet"; - wantedBy = ["kubernetes.target"]; - after = ["docker.service" "network.target"]; - path = with pkgs; [ docker ]; - script = '' + systemd.services.kubelet = { + description = "Kubernetes Kubelet Service"; + wantedBy = [ "kubernetes.target" ]; + after = [ "network.target" "docker.service" "kube-apiserver.service" ]; + path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ top.path; + preStart = '' ${concatMapStrings (img: '' echo "Seeding docker image: ${img}" docker load <${img} @@ -263,19 +263,10 @@ in ''; serviceConfig = { Slice = "kubernetes.slice"; - Type = "oneshot"; - }; - }; - - systemd.services.kubelet = { - description = "Kubernetes Kubelet Service"; - wantedBy = [ "kubernetes.target" ]; - after = [ "network.target" "docker.service" "kube-apiserver.service" "kubelet-bootstrap.service" ]; - path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ top.path; - serviceConfig = { - Slice = "kubernetes.slice"; CPUAccounting = true; MemoryAccounting = true; + Restart = "on-failure"; + RestartSec = "1000ms"; ExecStart = ''${top.package}/bin/kubelet \ --address=${cfg.address} \ --allow-privileged=${boolToString cfg.allowPrivileged} \ |