Update systemd logic, cleanup redundancy

Signed-off-by: Arjun Raja Yogidas <[email protected]>

Author: coderbirju

cmd/nerdctl/container/container_health_check_linux_test.go

@@ -32,7 +32,6 @@ import (
 	"github.com/containerd/nerdctl/mod/tigron/tig"
 
 	"github.com/containerd/nerdctl/v2/pkg/healthcheck"
-	"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
 	"github.com/containerd/nerdctl/v2/pkg/testutil"
 	"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
 )
@@ -44,9 +43,9 @@ func TestContainerHealthCheckBasic(t *testing.T) {
 	testCase.Require = require.Not(nerdtest.Docker)
 
 	// Skip systemd tests in rootless environment to bypass dbus permission issues
-	if rootlessutil.IsRootless() {
-		t.Skip("systemd healthcheck tests are skipped in rootless environment")
-	}
+	// if rootlessutil.IsRootless() {
+	// 	t.Skip("systemd healthcheck tests are skipped in rootless environment")
+	// }
 
 	testCase.SubTests = []*test.Case{
 		{
@@ -146,9 +145,9 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
 	testCase.Require = require.Not(nerdtest.Docker)
 
 	// Skip systemd tests in rootless environment to bypass dbus permission issues
-	if rootlessutil.IsRootless() {
-		t.Skip("systemd healthcheck tests are skipped in rootless environment")
-	}
+	// if rootlessutil.IsRootless() {
+	// 	t.Skip("systemd healthcheck tests are skipped in rootless environment")
+	// }
 
 	testCase.SubTests = []*test.Case{
 		{
@@ -618,9 +617,9 @@ func TestHealthCheck_SystemdIntegration_Basic(t *testing.T) {
 	testCase := nerdtest.Setup()
 	testCase.Require = require.Not(nerdtest.Docker)
 	// Skip systemd tests in rootless environment to bypass dbus permission issues
-	if rootlessutil.IsRootless() {
-		t.Skip("systemd healthcheck tests are skipped in rootless environment")
-	}
+	// if rootlessutil.IsRootless() {
+	// 	t.Skip("systemd healthcheck tests are skipped in rootless environment")
+	// }
 
 	testCase.SubTests = []*test.Case{
 		{
@@ -802,9 +801,9 @@ func TestHealthCheck_SystemdIntegration_Advanced(t *testing.T) {
 	testCase := nerdtest.Setup()
 	testCase.Require = require.Not(nerdtest.Docker)
 	// Skip systemd tests in rootless environment to bypass dbus permission issues
-	if rootlessutil.IsRootless() {
-		t.Skip("systemd healthcheck tests are skipped in rootless environment")
-	}
+	// if rootlessutil.IsRootless() {
+	// 	t.Skip("systemd healthcheck tests are skipped in rootless environment")
+	// }
 
 	testCase.SubTests = []*test.Case{
 		{

cmd/nerdctl/container/container_run.go

@@ -447,12 +447,9 @@ func runAction(cmd *cobra.Command, args []string) error {
 	}
 
 	// Setup container healthchecks.
-	if err := healthcheck.CreateTimer(ctx, c, (*config.Config)(&createOpt.GOptions)); err != nil {
+	if err := healthcheck.CreateAndStartTimer(ctx, c, (*config.Config)(&createOpt.GOptions)); err != nil {
 		return fmt.Errorf("failed to create healthcheck timer: %w", err)
 	}
-	if err := healthcheck.StartTimer(ctx, c, (*config.Config)(&createOpt.GOptions)); err != nil {
-		return fmt.Errorf("failed to start healthcheck timer: %w", err)
-	}
 
 	if createOpt.Detach {
 		fmt.Fprintln(createOpt.Stdout, id)

pkg/containerutil/containerutil.go

@@ -293,12 +293,9 @@ func Start(ctx context.Context, container containerd.Container, isAttach bool, i
 	}
 
 	// If container has health checks configured, create and start systemd timer/service files.
-	if err := healthcheck.CreateTimer(ctx, container, cfg); err != nil {
+	if err := healthcheck.CreateAndStartTimer(ctx, container, cfg); err != nil {
 		return fmt.Errorf("failed to create healthcheck timer: %w", err)
 	}
-	if err := healthcheck.StartTimer(ctx, container, cfg); err != nil {
-		return fmt.Errorf("failed to start healthcheck timer: %w", err)
-	}
 
 	if !isAttach {
 		return nil
@@ -532,12 +529,9 @@ func Unpause(ctx context.Context, client *containerd.Client, id string, cfg *con
 	}
 
 	// Recreate healthcheck related systemd timer/service files.
-	if err := healthcheck.CreateTimer(ctx, container, cfg); err != nil {
+	if err := healthcheck.CreateAndStartTimer(ctx, container, cfg); err != nil {
 		return fmt.Errorf("failed to create healthcheck timer: %w", err)
 	}
-	if err := healthcheck.StartTimer(ctx, container, cfg); err != nil {
-		return fmt.Errorf("failed to start healthcheck timer: %w", err)
-	}
 
 	switch status.Status {
 	case containerd.Paused:

pkg/healthcheck/healthcheck_manager_darwin.go

@@ -29,6 +29,11 @@ func CreateTimer(ctx context.Context, container containerd.Container, cfg *confi
 	return nil
 }
 
+// CreateAndStartTimer sets up the transient systemd timer and service for healthchecks.
+func CreateAndStartTimer(ctx context.Context, container containerd.Container, cfg *config.Config) error {
+	return nil
+}
+
 // StartTimer starts the healthcheck timer unit.
 func StartTimer(ctx context.Context, container containerd.Container, cfg *config.Config) error {
 	return nil

pkg/healthcheck/healthcheck_manager_freebsd.go

@@ -34,6 +34,11 @@ func StartTimer(ctx context.Context, container containerd.Container, cfg *config
 	return nil
 }
 
+// CreateAndStartTimer sets up the transient systemd timer and service for healthchecks.
+func CreateAndStartTimer(ctx context.Context, container containerd.Container, cfg *config.Config) error {
+	return nil
+}
+
 // RemoveTransientHealthCheckFiles stops and cleans up the transient timer and service.
 func RemoveTransientHealthCheckFiles(ctx context.Context, container containerd.Container) error {
 	return nil