Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v6
with:
go-version: 1.24
go-version-file: go.mod
- name: golangci-lint
run: make lint
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,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)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build !disable_stackdriver_exporter
// +build !disable_stackdriver_exporter

/*
Copyright 2019 The Kubernetes Authors All rights reserved.
Expand Down
1 change: 0 additions & 1 deletion cmd/nodeproblemdetector/node_problem_detector_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build !disable_system_log_monitor
// +build !disable_system_log_monitor

/*
Copyright 2021 The Kubernetes Authors All rights reserved.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build !disable_system_log_monitor
// +build !disable_system_log_monitor

/*
Copyright 2021 The Kubernetes Authors All rights reserved.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build !disable_custom_plugin_monitor
// +build !disable_custom_plugin_monitor

/*
Copyright 2019 The Kubernetes Authors All rights reserved.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build !disable_system_log_monitor
// +build !disable_system_log_monitor

/*
Copyright 2019 The Kubernetes Authors All rights reserved.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build !disable_system_stats_monitor
// +build !disable_system_stats_monitor

/*
Copyright 2019 The Kubernetes Authors All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion pkg/custompluginmonitor/plugin/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion pkg/exporters/stackdriver/stackdriver_exporter_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build !disable_stackdriver_exporter
// +build !disable_stackdriver_exporter

/*
Copyright 2019 The Kubernetes Authors All rights reserved.
Expand Down
1 change: 1 addition & 0 deletions pkg/healthchecker/health_checker_darwin.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"time"

"k8s.io/klog/v2"

"k8s.io/node-problem-detector/cmd/healthchecker/options"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"runtime"

"k8s.io/klog/v2"

"k8s.io/node-problem-detector/pkg/systemlogmonitor/logwatchers/types"
)

Expand Down
1 change: 0 additions & 1 deletion pkg/systemlogmonitor/logwatchers/register_journald.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build journald
// +build journald

/*
Copyright 2016 The Kubernetes Authors All rights reserved.
Expand Down
4 changes: 3 additions & 1 deletion pkg/util/exec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package util

import (
"context"
"fmt"
"runtime"
"testing"
Expand All @@ -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")
Expand Down
5 changes: 3 additions & 2 deletions pkg/util/exec_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
5 changes: 3 additions & 2 deletions pkg/util/exec_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package util

import (
"context"
"fmt"
"os"
"os/exec"
Expand All @@ -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
Expand All @@ -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
Expand Down