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

Merge pull request #44264 from eonpatapon/kubelet-cgroup-stats

Browse Source 
nixos/kubernetes: fix kubelet cgroup stats
This commit is contained in:
Jörg Thalheim 2018-08-01 12:08:13 +01:00 committed by GitHub
commit 69a94a01c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -838,6 +838,8 @@ in {
path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ cfg.path; path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ cfg.path;
serviceConfig = { serviceConfig = {
Slice = "kubernetes.slice"; Slice = "kubernetes.slice";
CPUAccounting = true;
MemoryAccounting = true;
ExecStart = ''${cfg.package}/bin/kubelet \ ExecStart = ''${cfg.package}/bin/kubelet \
${optionalString (taints != "") ${optionalString (taints != "")
"--register-with-taints=${taints}"} \ "--register-with-taints=${taints}"} \