ref(node-installer): rm unused Env param from Restarter

Signed-off-by: Vaughn Dice <[email protected]>

Author: vdice

cmd/node-installer/install.go

@@ -45,14 +45,12 @@ var installCmd = &cobra.Command{
 		}
 
 		config.Runtime.ConfigPath = distro.ConfigPath
-		env := preset.Env{ConfigPath: distro.ConfigPath, HostFs: hostFs}
-
-		if err = distro.Setup(env); err != nil {
+		if err = distro.Setup(preset.Env{ConfigPath: distro.ConfigPath, HostFs: hostFs}); err != nil {
 			slog.Error("failed to run distro setup", "error", err)
 			os.Exit(1)
 		}
 
-		if err := RunInstall(config, rootFs, hostFs, distro.Restarter(env)); err != nil {
+		if err := RunInstall(config, rootFs, hostFs, distro.Restarter()); err != nil {
 			slog.Error("failed to install", "error", err)
 			os.Exit(1)
 		}

cmd/node-installer/uninstall.go

@@ -26,7 +26,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/spinkube/runtime-class-manager/internal/containerd"
-	"github.com/spinkube/runtime-class-manager/internal/preset"
 	"github.com/spinkube/runtime-class-manager/internal/shim"
 )
 
@@ -46,7 +45,7 @@ var uninstallCmd = &cobra.Command{
 
 		config.Runtime.ConfigPath = distro.ConfigPath
 
-		if err := RunUninstall(config, rootFs, hostFs, distro.Restarter(preset.Env{ConfigPath: distro.ConfigPath, HostFs: hostFs})); err != nil {
+		if err := RunUninstall(config, rootFs, hostFs, distro.Restarter()); err != nil {
 			slog.Error("failed to uninstall", "error", err)
 			os.Exit(1)
 		}

internal/preset/preset.go

@@ -13,7 +13,7 @@ import (
 type Settings struct {
 	ConfigPath string
 	Setup      func(Env) error
-	Restarter  func(Env) containerd.Restarter
+	Restarter  func() containerd.Restarter
 }
 
 type Env struct {
@@ -24,7 +24,7 @@ type Env struct {
 var Default = Settings{
 	ConfigPath: "/etc/containerd/config.toml",
 	Setup:      func(_ Env) error { return nil },
-	Restarter:  func(_ Env) containerd.Restarter { return containerd.NewRestarter() },
+	Restarter:  func() containerd.Restarter { return containerd.NewRestarter() },
 }
 
 func (s Settings) WithConfigPath(path string) Settings {