Skip to content

Commit

Permalink
Drop unnecessary intermediate variable
Browse files Browse the repository at this point in the history
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
  • Loading branch information
brandond committed Apr 19, 2022
1 parent e985448 commit ee6385f
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions pkg/agent/containerd/config_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,13 @@ func setupContainerdConfig(ctx context.Context, cfg *config.Node) error {
logrus.Warn("cgroup v2 controllers are not delegated for rootless. Disabling cgroup.")
}

systemdCgroup := controllers["cpuset"] && os.Getenv("NOTIFY_SOCKET") != ""
cfg.AgentConfig.Systemd = systemdCgroup
cfg.AgentConfig.Systemd := controllers["cpuset"] && os.Getenv("NOTIFY_SOCKET") != ""

var containerdTemplate string
containerdConfig := templates.ContainerdConfig{
NodeConfig: cfg,
DisableCgroup: disableCgroup,
SystemdCgroup: systemdCgroup,
SystemdCgroup: cfg.AgentConfig.Systemd,
IsRunningInUserNS: isRunningInUserNS,
PrivateRegistryConfig: privRegistries.Registry,
ExtraRuntimes: findNvidiaContainerRuntimes(os.DirFS(string(os.PathSeparator))),
Expand Down

0 comments on commit ee6385f

Please sign in to comment.