public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/kubernetes: fix flannel and kubelet startup

Browse Source
This commit is contained in:
Jaka Hudoklin 2019-02-21 00:26:11 +01:00 committed by Franz Pletz
parent 3a02205496
commit 97a27fd2d2
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/cluster/kubernetes/flannel.nix
View File

@ -68,7 +68,7 @@ in
systemd.services.docker = { systemd.services.docker = {
environment.DOCKER_OPTS = "-b none"; environment.DOCKER_OPTS = "-b none";
serviceConfig.EnvironmentFile = "/run/flannel/docker"; serviceConfig.EnvironmentFile = "-/run/flannel/docker";
}; };
# read environment variables generated by mk-docker-opts # read environment variables generated by mk-docker-opts

25
nixos/modules/services/cluster/kubernetes/kubelet.nix
View File

@ -244,12 +244,12 @@ in
(mkIf cfg.enable { (mkIf cfg.enable {
services.kubernetes.kubelet.seedDockerImages = [infraContainer]; services.kubernetes.kubelet.seedDockerImages = [infraContainer];
systemd.services.kubelet-bootstrap = { systemd.services.kubelet = {
description = "Boostrap Kubelet"; description = "Kubernetes Kubelet Service";
wantedBy = ["kubernetes.target"]; wantedBy = [ "kubernetes.target" ];
after = ["docker.service" "network.target"]; after = [ "network.target" "docker.service" "kube-apiserver.service" ];
path = with pkgs; [ docker ]; path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ top.path;
script = '' preStart = ''
${concatMapStrings (img: '' ${concatMapStrings (img: ''
echo "Seeding docker image: ${img}" echo "Seeding docker image: ${img}"
docker load <${img} docker load <${img}
@ -261,21 +261,12 @@ in
ln -fs ${package}/bin/* /opt/cni/bin ln -fs ${package}/bin/* /opt/cni/bin
'') cfg.cni.packages} '') cfg.cni.packages}
''; '';
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 = { serviceConfig = {
Slice = "kubernetes.slice"; Slice = "kubernetes.slice";
CPUAccounting = true; CPUAccounting = true;
MemoryAccounting = true; MemoryAccounting = true;
Restart = "on-failure";
RestartSec = "1000ms";
ExecStart = ''${top.package}/bin/kubelet \ ExecStart = ''${top.package}/bin/kubelet \
--address=${cfg.address} \ --address=${cfg.address} \
--allow-privileged=${boolToString cfg.allowPrivileged} \ --allow-privileged=${boolToString cfg.allowPrivileged} \