*: fix lint issue

Signed-off-by: Wei Fu <[email protected]>
Azure · Mar 28, 2024 · c684725 · c684725
1 parent b392b8c
commit c684725
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/contrib/cmd/runkperf/commands/ekswarmup/command.go b/contrib/cmd/runkperf/commands/ekswarmup/command.go
@@ -149,7 +149,7 @@ func deployWarmupRunnerGroup(ctx context.Context, kubeCfgPath string, runnerImag
 	if err != nil {
 		return fmt.Errorf("failed to create temporary file for %s: %w", target, err)
 	}
-	defer cleanup()
+	defer func() { _ = cleanup() }()
 
 	kr := utils.NewKperfRunner(kubeCfgPath, runnerImage)
 

diff --git a/contrib/internal/mountns/ns.go b/contrib/internal/mountns/ns.go
@@ -18,20 +18,17 @@ func Executes(run func() error) error {
 	wg.Add(1)
 
 	var innerErr error
-	go func() (retErr error) {
+	go func() {
 		defer wg.Done()
 
-		defer func() {
-			innerErr = retErr
-		}()
-
 		runtime.LockOSThread()
 
 		err := unix.Unshare(unix.CLONE_FS | unix.CLONE_NEWNS)
 		if err != nil {
-			return fmt.Errorf("failed to create a new mount namespace: %w", err)
+			innerErr = fmt.Errorf("failed to create a new mount namespace: %w", err)
+			return
 		}
-		return run()
+		innerErr = run()
 	}()
 	wg.Wait()
 

diff --git a/contrib/internal/utils/kubectl_cmd.go b/contrib/internal/utils/kubectl_cmd.go
@@ -68,7 +68,7 @@ func (kr *KubectlRunner) Metrics(ctx context.Context, timeout time.Duration, fqd
 		if err != nil {
 			return err
 		}
-		defer cleanup()
+		defer func() { _ = cleanup() }()
 
 		target := "/etc/hosts"
 

diff --git a/contrib/internal/utils/utils.go b/contrib/internal/utils/utils.go
@@ -32,7 +32,7 @@ func RepeatJobWith3KPod(ctx context.Context, kubeCfgPath string, namespace strin
 	if err != nil {
 		panic(fmt.Errorf("unexpected error when create job yaml: %v", err))
 	}
-	defer cleanup()
+	defer func() { _ = cleanup() }()
 
 	kr := NewKubectlRunner(kubeCfgPath, namespace)
 
@@ -120,7 +120,7 @@ func CreateTempFileWithContent(data []byte) (_name string, _cleanup func() error
 	fName := f.Name()
 	defer func() {
 		if retErr != nil {
-			os.RemoveAll(fName)
+			_ = os.RemoveAll(fName)
 		}
 	}()