Skip to content

Commit ee6385f

Browse files
committed
Drop unnecessary intermediate variable
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
1 parent e985448 commit ee6385f

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

pkg/agent/containerd/config_linux.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,13 @@ func setupContainerdConfig(ctx context.Context, cfg *config.Node) error {
5353
logrus.Warn("cgroup v2 controllers are not delegated for rootless. Disabling cgroup.")
5454
}
5555

56-
systemdCgroup := controllers["cpuset"] && os.Getenv("NOTIFY_SOCKET") != ""
57-
cfg.AgentConfig.Systemd = systemdCgroup
56+
cfg.AgentConfig.Systemd := controllers["cpuset"] && os.Getenv("NOTIFY_SOCKET") != ""
5857

5958
var containerdTemplate string
6059
containerdConfig := templates.ContainerdConfig{
6160
NodeConfig: cfg,
6261
DisableCgroup: disableCgroup,
63-
SystemdCgroup: systemdCgroup,
62+
SystemdCgroup: cfg.AgentConfig.Systemd,
6463
IsRunningInUserNS: isRunningInUserNS,
6564
PrivateRegistryConfig: privRegistries.Registry,
6665
ExtraRuntimes: findNvidiaContainerRuntimes(os.DirFS(string(os.PathSeparator))),

0 commit comments

Comments
 (0)