Merge pull request #55 from Spground/feature/k8s-e2e-test

test(k8s): add sandbox-k8s-test workflow

Author: Pangjiping

.github/workflows/sandbox-k8s-test.yml

@@ -0,0 +1,35 @@
+name: Sandbox K8S Tests
+
+on:
+  pull_request:
+    branches: [ main ]
+    paths:
+      - 'kubernetes/**'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.24.0'
+
+      - name: Run golint
+        run: |
+          cd kubernetes
+          make lint
+
+      - name: Build binary
+        run: |
+          cd kubernetes
+          make build
+          make task-executor-build
+
+      - name: Run tests
+        run: |
+          cd kubernetes
+          make test

kubernetes/.golangci.yml

@@ -0,0 +1,72 @@
+version: "2"
+run:
+  concurrency: 4
+  issues-exit-code: 1
+  tests: true
+
+# output configuration options
+output:
+  formats:
+    text:
+      path: stdout
+      colors: true
+linters:
+  default: none
+  enable:
+    - depguard
+    - govet
+    - ineffassign
+    - misspell
+    - unconvert
+    - unused
+  settings:
+    misspell:
+      # Correct spellings using locale preferences for US or UK.
+      # Default is to use a neutral variety of English.
+      # Setting locale to US will correct the British spelling of 'colour' to 'color'.
+      locale: US
+    depguard:
+      rules:
+        forbid-pkg-errors:
+          deny:
+          - pkg: "github.com/pkg/errors"
+            desc: Should be replaced with standard lib errors or fmt.Errorf
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - path: (.+)\.go$
+        text: 'SA1019: package github.com/golang/protobuf/proto is deprecated: Use the "google.golang.org/protobuf/proto" package instead'
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+      - apis
+      - pkg/client
+      - vendor
+      - test
+formatters:
+  enable:
+  - gofmt
+  - goimports
+  settings:
+    gofmt:
+      simplify: true
+    goimports:
+      # put imports beginning with prefix after 3rd-party packages;
+      local-prefixes: 
+      - github.com/alibaba/OpenSandbox/sandbox-k8s
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+      - apis
+      - pkg/client
+      - vendor
+      - test

kubernetes/Makefile

@@ -293,7 +293,7 @@ CONTROLLER_TOOLS_VERSION ?= v0.18.0
 ENVTEST_VERSION ?= $(shell go list -m -f "{{ .Version }}" sigs.k8s.io/controller-runtime | awk -F'[v.]' '{printf "release-%d.%d", $$2, $$3}')
 #ENVTEST_K8S_VERSION is the version of Kubernetes to use for setting up ENVTEST binaries (i.e. 1.31)
 ENVTEST_K8S_VERSION ?= $(shell go list -m -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.%d", $$3}')
-GOLANGCI_LINT_VERSION ?= v2.1.0
+GOLANGCI_LINT_VERSION ?= v2.7.2
 
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.

kubernetes/cmd/task-executor/main.go

@@ -22,12 +22,13 @@ import (
 	"syscall"
 	"time"
 
+	"k8s.io/klog/v2"
+
 	"github.com/alibaba/OpenSandbox/sandbox-k8s/internal/task-executor/config"
 	"github.com/alibaba/OpenSandbox/sandbox-k8s/internal/task-executor/manager"
 	"github.com/alibaba/OpenSandbox/sandbox-k8s/internal/task-executor/runtime"
 	"github.com/alibaba/OpenSandbox/sandbox-k8s/internal/task-executor/server"
 	store "github.com/alibaba/OpenSandbox/sandbox-k8s/internal/task-executor/storage"
-	"k8s.io/klog/v2"
 )
 
 func main() {

kubernetes/internal/controller/batchsandbox_controller.go

@@ -174,7 +174,7 @@ func (r *BatchSandboxReconciler) Reconcile(ctx context.Context, req ctrl.Request
 				},
 			})
 			obj := &sandboxv1alpha1.BatchSandbox{ObjectMeta: metav1.ObjectMeta{Namespace: batchSbx.Namespace, Name: batchSbx.Name}}
-			if err := r.Patch(ctx, obj, client.RawPatch(types.MergePatchType, []byte(patchData))); err != nil {
+			if err := r.Patch(ctx, obj, client.RawPatch(types.MergePatchType, patchData)); err != nil {
 				klog.Errorf("failed to patch annotation %s, %s, body %s", AnnotationSandboxEndpoints, klog.KObj(batchSbx), patchData)
 				aggErrors = append(aggErrors, err)
 			}

kubernetes/internal/task-executor/manager/task_manager.go

@@ -424,7 +424,7 @@ func (m *taskManager) reconcileLoop(ctx context.Context) {
 			klog.InfoS("reconcile loop stopped")
 			return
 		case <-ctx.Done():
-			klog.InfoS("reconcile loop context cancelled")
+			klog.InfoS("reconcile loop context canceled")
 			return
 		}
 	}

kubernetes/internal/task-executor/runtime/process.go

@@ -99,7 +99,7 @@ func (e *processExecutor) Start(ctx context.Context, task *types.Task) error {
 	} else {
 		// Host Logic: Direct execution
 		// Use exec.Command instead of CommandContext to ensure the process survives
-		// after the HTTP request context is cancelled.
+		// after the HTTP request context is canceled.
 		cmd = exec.Command("/bin/sh", "-c", shimScript)
 		klog.InfoS("Starting host task", "name", task.Name, "cmd", safeCmdStr, "exitPath", exitPath)
 	}

kubernetes/pkg/task-executor/client.go

@@ -56,17 +56,19 @@ func (c *Client) Set(ctx context.Context, task *Task) (*Task, error) {
 	if task == nil {
 		// Delete request - send nil to clear tasks
 		req, err = http.NewRequestWithContext(ctx, "POST", c.baseURL+"/setTasks", bytes.NewReader([]byte("[]")))
+		if err != nil {
+			return nil, fmt.Errorf("failed to create request: %w", err)
+		}
 	} else {
 		// Create/Update request
 		data, err := json.Marshal([]Task{*task})
 		if err != nil {
 			return nil, fmt.Errorf("failed to marshal task: %w", err)
 		}
 		req, err = http.NewRequestWithContext(ctx, "POST", c.baseURL+"/setTasks", bytes.NewReader(data))
-	}
-
-	if err != nil {
-		return nil, fmt.Errorf("failed to create request: %w", err)
+		if err != nil {
+			return nil, fmt.Errorf("failed to create request: %w", err)
+		}
 	}
 
 	req.Header.Set("Content-Type", "application/json")

kubernetes/pkg/task-executor/types.go

@@ -15,8 +15,9 @@
 package task_executor
 
 import (
-	"github.com/alibaba/OpenSandbox/sandbox-k8s/api/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/alibaba/OpenSandbox/sandbox-k8s/api/v1alpha1"
 )
 
 // Task represents the internal local task resource (LocalTask)

kubernetes/test/e2e/e2e_suite_test.go

@@ -61,7 +61,7 @@ var _ = BeforeSuite(func() {
 	ExpectWithOffset(1, err).NotTo(HaveOccurred(), "Failed to build the manager(Operator) image")
 
 	By("building the task-executor image")
-	makeArgs = []string{"docker-build-task-executor", fmt.Sprintf("IMG=%s", taskExecutorImage)}
+	makeArgs = []string{"docker-build-task-executor", fmt.Sprintf("TASK_EXECUTOR_IMG=%s", taskExecutorImage)}
 	if dockerBuildArgs != "" {
 		makeArgs = append(makeArgs, fmt.Sprintf("DOCKER_BUILD_ARGS=%s", dockerBuildArgs))
 	}