Update golangci-lint to v2.6.1

hakman · hakman · commit d359d354782d · 2025-11-12T06:21:30.000-05:00
diff --git a/Makefile b/Makefile
@@ -119,7 +119,7 @@ else
 	LOGCOUNTER=*dont-include-log-counter
 endif
 
-GOLANGCI_LINT_VERSION := v2.2.0
+GOLANGCI_LINT_VERSION := v2.6.1
 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/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.

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
`@@ -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`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ import (`
`20`	`20`	`"runtime"`
`21`	`21`
`22`	`22`	`"k8s.io/klog/v2"`
	`23`	`+`
`23`	`24`	`"k8s.io/node-problem-detector/pkg/systemlogmonitor/logwatchers/types"`
`24`	`25`	`)`
`25`	`26`