Merge pull request #1278 from halaney/ahalaney/fix-sigterm

k8s-ci-robot · web-flow · commit 8a5df6d6deeb · 2026-05-27T14:57:50.000+05:30
fix: handle SIGTERM gracefully on unix
diff --git a/cmd/nodeproblemdetector/node_problem_detector_unix.go b/cmd/nodeproblemdetector/node_problem_detector_unix.go
@@ -21,6 +21,9 @@ package main
 import (
 	"context"
 	"flag"
+	"os"
+	"os/signal"
+	"syscall"
 
 	"github.com/spf13/pflag"
 	"k8s.io/klog/v2"
@@ -54,7 +57,9 @@ func main() {
 	}
 
 	pflag.Parse()
-	if err := npdMain(context.Background(), npdo); err != nil {
+	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
+	defer stop()
+	if err := npdMain(ctx, npdo); err != nil {
 		klog.Fatalf("Problem detector failed with error: %v", err)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,9 @@ package main`
`21`	`21`	`import (`
`22`	`22`	`"context"`
`23`	`23`	`"flag"`
	`24`	`+ "os"`
	`25`	`+ "os/signal"`
	`26`	`+ "syscall"`
`24`	`27`
`25`	`28`	`"github.com/spf13/pflag"`
`26`	`29`	`"k8s.io/klog/v2"`
`@@ -54,7 +57,9 @@ func main() {`
`54`	`57`	`}`
`55`	`58`
`56`	`59`	`pflag.Parse()`
`57`		`- if err := npdMain(context.Background(), npdo); err != nil {`
	`60`	`+ ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)`
	`61`	`+ defer stop()`
	`62`	`+ if err := npdMain(ctx, npdo); err != nil {`
`58`	`63`	`klog.Fatalf("Problem detector failed with error: %v", err)`
`59`	`64`	`}`
`60`	`65`	`}`