let uninstall exit with 0

Author: voigt

cmd/node-installer/uninstall.go

@@ -39,8 +39,10 @@ var uninstallCmd = &cobra.Command{
 		restarter := containerd.NewRestarter()
 
 		if err := RunUninstall(config, rootFs, hostFs, restarter); err != nil {
-			slog.Error("failed to uninstall", "error", err)
-			os.Exit(1)
+			slog.Error("failed to uninstall shim", "error", err)
+
+			// Exiting with 0 to prevent Kubernetes Jobs from running repetitively
+			os.Exit(0)
 		}
 	},
 }
@@ -50,7 +52,7 @@ func init() {
 }
 
 func RunUninstall(config Config, rootFs, hostFs afero.Fs, restarter containerd.Restarter) error {
-	slog.Info("uninstall called")
+	slog.Info("uninstall called", "shim", config.Runtime.Name)
 	shimName := config.Runtime.Name
 	runtimeName := path.Join(config.Kwasm.Path, "bin", shimName)
 

internal/shim/uninstall.go

@@ -3,7 +3,6 @@ package shim
 import (
 	"errors"
 	"fmt"
-	"log/slog"
 	"os"
 
 	"github.com/spinkube/runtime-class-manager/internal/state"
@@ -16,18 +15,14 @@ func (c *Config) Uninstall(shimName string) (string, error) {
 	}
 	s, ok := st.Shims[shimName]
 	if !ok {
-		slog.Error("shim not installed", "shim", shimName)
-		os.Exit(0)
 		return "", fmt.Errorf("shim %s not installed", shimName)
 	}
 	filePath := s.Path
 
 	err = c.hostFs.Remove(filePath)
 	if err != nil {
 		if !errors.Is(err, os.ErrNotExist) {
-			slog.Error("shim binary did not exist, nothing to delete")
-			os.Exit(0)
-			return "", fmt.Errorf("shim binary did not exist, nothing to delete")
+			return "", fmt.Errorf("shim binary at %s does not exist, nothing to delete", filePath)
 		}
 	}
 	st.RemoveShim(shimName)

internal/shim/uninstall_test.go

@@ -38,16 +38,16 @@ func TestConfig_Uninstall(t *testing.T) {
 		want    string
 		wantErr bool
 	}{
-		// {
-		// 	"shim not installed",
-		// 	fields{
-		// 		tests.FixtureFs("../../testdata/node-installer/shim"),
-		// 		"/opt/kwasm",
-		// 	},
-		// 	args{"not-existing-shim"},
-		// 	"",
-		// 	false,
-		// },
+		{
+			"shim not installed",
+			fields{
+				tests.FixtureFs("../../testdata/node-installer/shim"),
+				"/opt/kwasm",
+			},
+			args{"not-existing-shim"},
+			"",
+			true,
+		},
 		{
 			"missing shim binary",
 			fields{