Merge pull request kubernetes#78775 from johscheuer/fix-kube-proxy-cleanup-error

k8s-ci-robot · web-flow · commit a7c81c663d4a · 2019-08-14T07:26:26.000-07:00
Check if options returning an error
diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go
@@ -435,7 +435,10 @@ with the apiserver API to configure the proxy.`,
 			if err := opts.Validate(args); err != nil {
 				klog.Fatalf("failed validate: %v", err)
 			}
-			klog.Fatal(opts.Run())
+
+			if err := opts.Run(); err != nil {
+				klog.Exit(err)
+			}
 		},
 	}
 

Original file line number	Diff line number	Diff line change
@@ -435,7 +435,10 @@ with the apiserver API to configure the proxy.`,
`435`	`435`	`if err := opts.Validate(args); err != nil {`
`436`	`436`	`klog.Fatalf("failed validate: %v", err)`
`437`	`437`	`}`
`438`		`- klog.Fatal(opts.Run())`
	`438`	`+`
	`439`	`+ if err := opts.Run(); err != nil {`
	`440`	`+ klog.Exit(err)`
	`441`	`+ }`
`439`	`442`	`},`
`440`	`443`	`}`
`441`	`444`