Unverified Commit 27323e52 authored by benaryorg's avatar benaryorg
Browse files

nixos/systemd: CPUAccounting is deprecated 



systemd 258 has the following changes noted in systemd.resource-control(5):

> `CPUAccounting=` setting is deprecated, because it is always available on the unified cgroup hierarchy and such setting has no effect.

This commit removes it from the three services using it directly, as well as one instance of example text.

Signed-off-by: default avatarbenaryorg <binary@benary.org>
parent 0e30ffe0

nixos/modules/services/cluster/kubernetes/kubelet.nix

+0 −1
Original line number Diff line number Diff line
@@ -364,7 +364,6 @@ in 
        '';

        serviceConfig = {

          Slice = "kubernetes.slice";

          CPUAccounting = true;

          MemoryAccounting = true;

          Restart = "on-failure";

          RestartSec = "1000ms";

nixos/modules/services/scheduling/prefect.nix

+0 −2
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ in 
          ProtectKernelLogs = true;

          ProtectControlGroups = true;

          MemoryAccounting = true;

          CPUAccounting = true;



          ExecStart = "${pkgs.prefect}/bin/prefect server start --host ${cfg.host} --port ${toString cfg.port}";

          Restart = "always";
@@ -216,7 +215,6 @@ in 
          ProtectKernelLogs = true;

          ProtectControlGroups = true;

          MemoryAccounting = true;

          CPUAccounting = true;

          ExecStart = ''

            ${pkgs.prefect}/bin/prefect worker start \

              --pool ${poolName} \

nixos/modules/system/boot/systemd/user.nix

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ in 
    systemd.user.extraConfig = mkOption {

      default = "";

      type = types.lines;

      example = "DefaultCPUAccounting=yes";

      example = "DefaultTimeoutStartSec=60";

      description = ''

        Extra config options for systemd user instances. See {manpage}`systemd-user.conf(5)` for

        available options.

nixos/modules/virtualisation/waagent.nix

+0 −1
Original line number Diff line number Diff line
@@ -370,7 +370,6 @@ in 
        Type = "simple";

        Restart = "always";

        Slice = "azure.slice";

        CPUAccounting = true;

        MemoryAccounting = true;

      };

    };