Update golangci-lint to v2.6.2

hakman · hakman · commit a720d92378dd · 2026-02-08T10:40:25.000+02:00
diff --git a/Makefile b/Makefile
@@ -123,7 +123,7 @@ else
 	LOGCOUNTER=*dont-include-log-counter
 endif
 
-GOLANGCI_LINT_VERSION := v2.2.0
+GOLANGCI_LINT_VERSION := v2.6.2
 GOLANGCI_LINT := ./.bin/golangci-lint
 
 lint: $(GOLANGCI_LINT)
diff --git a/cmd/nodeproblemdetector/exporterplugins/stackdriver_exporter_plugin.go b/cmd/nodeproblemdetector/exporterplugins/stackdriver_exporter_plugin.go
@@ -1,5 +1,4 @@
 //go:build !disable_stackdriver_exporter
-// +build !disable_stackdriver_exporter
 
 /*
 Copyright 2019 The Kubernetes Authors All rights reserved.
diff --git a/cmd/nodeproblemdetector/node_problem_detector_test.go b/cmd/nodeproblemdetector/node_problem_detector_test.go
@@ -1,5 +1,4 @@
 //go:build !disable_system_log_monitor
-// +build !disable_system_log_monitor
 
 /*
 Copyright 2021 The Kubernetes Authors All rights reserved.
diff --git a/cmd/nodeproblemdetector/node_problem_detector_windows_test.go b/cmd/nodeproblemdetector/node_problem_detector_windows_test.go
@@ -1,5 +1,4 @@
 //go:build !disable_system_log_monitor
-// +build !disable_system_log_monitor
 
 /*
 Copyright 2021 The Kubernetes Authors All rights reserved.
diff --git a/cmd/nodeproblemdetector/problemdaemonplugins/custom_plugin_monitor_plugin.go b/cmd/nodeproblemdetector/problemdaemonplugins/custom_plugin_monitor_plugin.go
@@ -1,5 +1,4 @@
 //go:build !disable_custom_plugin_monitor
-// +build !disable_custom_plugin_monitor
 
 /*
 Copyright 2019 The Kubernetes Authors All rights reserved.
diff --git a/cmd/nodeproblemdetector/problemdaemonplugins/system_log_monitor_plugin.go b/cmd/nodeproblemdetector/problemdaemonplugins/system_log_monitor_plugin.go
@@ -1,5 +1,4 @@
 //go:build !disable_system_log_monitor
-// +build !disable_system_log_monitor
 
 /*
 Copyright 2019 The Kubernetes Authors All rights reserved.
diff --git a/cmd/nodeproblemdetector/problemdaemonplugins/system_stats_monitor_plugin.go b/cmd/nodeproblemdetector/problemdaemonplugins/system_stats_monitor_plugin.go
@@ -1,5 +1,4 @@
 //go:build !disable_system_stats_monitor
-// +build !disable_system_stats_monitor
 
 /*
 Copyright 2019 The Kubernetes Authors All rights reserved.
diff --git a/pkg/custompluginmonitor/plugin/plugin.go b/pkg/custompluginmonitor/plugin/plugin.go
@@ -154,7 +154,7 @@ func (p *Plugin) run(rule cpmtypes.CustomRule) (exitStatus cpmtypes.Status, outp
 	}
 	defer cancel()
 
-	cmd := util.Exec(rule.Path, rule.Args...)
+	cmd := util.Exec(ctx, rule.Path, rule.Args...)
 
 	stdoutPipe, err := cmd.StdoutPipe()
 	if err != nil {
diff --git a/pkg/exporters/stackdriver/stackdriver_exporter_test.go b/pkg/exporters/stackdriver/stackdriver_exporter_test.go
@@ -1,5 +1,4 @@
 //go:build !disable_stackdriver_exporter
-// +build !disable_stackdriver_exporter
 
 /*
 Copyright 2019 The Kubernetes Authors All rights reserved.
diff --git a/pkg/healthchecker/health_checker_darwin.go b/pkg/healthchecker/health_checker_darwin.go
@@ -21,6 +21,7 @@ import (
 	"time"
 
 	"k8s.io/klog/v2"
+
 	"k8s.io/node-problem-detector/cmd/healthchecker/options"
 )
 
diff --git a/pkg/systemlogmonitor/logwatchers/kmsg/log_watcher_darwin.go b/pkg/systemlogmonitor/logwatchers/kmsg/log_watcher_darwin.go
@@ -20,6 +20,7 @@ import (
 	"runtime"
 
 	"k8s.io/klog/v2"
+
 	"k8s.io/node-problem-detector/pkg/systemlogmonitor/logwatchers/types"
 )
 
diff --git a/pkg/systemlogmonitor/logwatchers/register_journald.go b/pkg/systemlogmonitor/logwatchers/register_journald.go
@@ -1,5 +1,4 @@
 //go:build journald
-// +build journald
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/pkg/util/exec_test.go b/pkg/util/exec_test.go
@@ -17,6 +17,7 @@ limitations under the License.
 package util
 
 import (
+	"context"
 	"fmt"
 	"runtime"
 	"testing"
@@ -41,10 +42,11 @@ func TestExec(t *testing.T) {
 		}
 	}
 
+	ctx := context.TODO()
 	for _, v := range cmds {
 		args := v
 		t.Run(fmt.Sprintf("%v", args), func(t *testing.T) {
-			cmd := Exec(args[0], args[1:]...)
+			cmd := Exec(ctx, args[0], args[1:]...)
 
 			if err := Kill(cmd); err == nil {
 				t.Error("Kill(cmd) expected to have error because of empty handle, got none")
diff --git a/pkg/util/exec_unix.go b/pkg/util/exec_unix.go
@@ -19,18 +19,19 @@ limitations under the License.
 package util
 
 import (
+	"context"
 	"fmt"
 	"os/exec"
 	"syscall"
 )
 
 // Exec creates a new process with the specified arguments.
-func Exec(name string, arg ...string) *exec.Cmd {
+func Exec(ctx context.Context, name string, arg ...string) *exec.Cmd {
 	// create a process group
 	sysProcAttr := &syscall.SysProcAttr{
 		Setpgid: true,
 	}
-	cmd := exec.Command(name, arg...)
+	cmd := exec.CommandContext(ctx, name, arg...)
 	cmd.SysProcAttr = sysProcAttr
 	return cmd
 }
diff --git a/pkg/util/exec_windows.go b/pkg/util/exec_windows.go
@@ -17,6 +17,7 @@ limitations under the License.
 package util
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"os/exec"
@@ -27,7 +28,7 @@ import (
 )
 
 // Exec creates a new process with the specified arguments.
-func Exec(name string, arg ...string) *exec.Cmd {
+func Exec(ctx context.Context, name string, arg ...string) *exec.Cmd {
 	// Windows does not handle relative path names in exec very well.
 	name = filepath.Clean(name)
 	cmdArgs := arg
@@ -48,7 +49,7 @@ func Exec(name string, arg ...string) *exec.Cmd {
 		// Run directly.
 	}
 
-	return exec.Command(name, cmdArgs...)
+	return exec.CommandContext(ctx, name, cmdArgs...)
 }
 
 // Powershell creates a new powershell process with the specified arguments

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !disable_stackdriver_exporter`
`2`		`-// +build !disable_stackdriver_exporter`
`3`	`2`
`4`	`3`	`/*`
`5`	`4`	`Copyright 2019 The Kubernetes Authors All rights reserved.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !disable_system_log_monitor`
`2`		`-// +build !disable_system_log_monitor`
`3`	`2`
`4`	`3`	`/*`
`5`	`4`	`Copyright 2021 The Kubernetes Authors All rights reserved.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !disable_custom_plugin_monitor`
`2`		`-// +build !disable_custom_plugin_monitor`
`3`	`2`
`4`	`3`	`/*`
`5`	`4`	`Copyright 2019 The Kubernetes Authors All rights reserved.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !disable_system_stats_monitor`
`2`		`-// +build !disable_system_stats_monitor`
`3`	`2`
`4`	`3`	`/*`
`5`	`4`	`Copyright 2019 The Kubernetes Authors All rights reserved.`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ func (p *Plugin) run(rule cpmtypes.CustomRule) (exitStatus cpmtypes.Status, outp`
`154`	`154`	`}`
`155`	`155`	`defer cancel()`
`156`	`156`
`157`		`- cmd := util.Exec(rule.Path, rule.Args...)`
	`157`	`+ cmd := util.Exec(ctx, rule.Path, rule.Args...)`
`158`	`158`
`159`	`159`	`stdoutPipe, err := cmd.StdoutPipe()`
`160`	`160`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import (`
`21`	`21`	`"time"`
`22`	`22`
`23`	`23`	`"k8s.io/klog/v2"`
	`24`	`+`
`24`	`25`	`"k8s.io/node-problem-detector/cmd/healthchecker/options"`
`25`	`26`	`)`
`26`	`27`