From ac2729ed0a5f2a1f02e61f725a5e5c08ace0cfa7 Mon Sep 17 00:00:00 2001 From: netroby Date: Fri, 18 Aug 2017 13:05:58 +0800 Subject: [PATCH 1/5] If command.Execute() return err, print to stdErr --- cmd/kube-proxy/proxy.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/kube-proxy/proxy.go b/cmd/kube-proxy/proxy.go index 9ec68a51fed..dad632b8df5 100644 --- a/cmd/kube-proxy/proxy.go +++ b/cmd/kube-proxy/proxy.go @@ -18,6 +18,7 @@ package main import ( goflag "flag" + "fmt" "os" "github.com/spf13/pflag" @@ -41,7 +42,8 @@ func main() { logs.InitLogs() defer logs.FlushLogs() - if err := command.Execute(); err != nil { + if err := command.Execute(); err != nil { + fmt.Fprintf(os.Stderr, "%v\n", err) os.Exit(1) } } From 3196300fc247493fbbb45e380c6f27eef276efca Mon Sep 17 00:00:00 2001 From: huzhifeng Date: Fri, 18 Aug 2017 16:03:25 +0800 Subject: [PATCH 2/5] Run go fmt Signed-off-by: huzhifeng --- cmd/kube-proxy/proxy.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/kube-proxy/proxy.go b/cmd/kube-proxy/proxy.go index dad632b8df5..a9c958d6b2d 100644 --- a/cmd/kube-proxy/proxy.go +++ b/cmd/kube-proxy/proxy.go @@ -42,8 +42,8 @@ func main() { logs.InitLogs() defer logs.FlushLogs() - if err := command.Execute(); err != nil { - fmt.Fprintf(os.Stderr, "%v\n", err) + if err := command.Execute(); err != nil { + fmt.Fprintf(os.Stderr, "error: %v\n", err) os.Exit(1) } } From 2b3a871df537476d7be4c2e0071fbfd40e3ca0c3 Mon Sep 17 00:00:00 2001 From: huzhifeng Date: Fri, 18 Aug 2017 16:07:56 +0800 Subject: [PATCH 3/5] Add fmt.printf for other need Signed-off-by: huzhifeng --- cmd/kubeadm/kubeadm.go | 2 ++ cmd/kubectl/kubectl.go | 2 ++ cmd/kubelet/kubelet.go | 1 + 3 files changed, 5 insertions(+) diff --git a/cmd/kubeadm/kubeadm.go b/cmd/kubeadm/kubeadm.go index 6aca5a18f3d..233b13f5cbc 100644 --- a/cmd/kubeadm/kubeadm.go +++ b/cmd/kubeadm/kubeadm.go @@ -17,6 +17,7 @@ limitations under the License. package main import ( + "fmt" "os" "k8s.io/kubernetes/cmd/kubeadm/app" @@ -24,6 +25,7 @@ import ( func main() { if err := app.Run(); err != nil { + fmt.Fprintf(os.Stderr, "error: %v\n", err) os.Exit(1) } os.Exit(0) diff --git a/cmd/kubectl/kubectl.go b/cmd/kubectl/kubectl.go index 3fce17f4086..5864a5ae68a 100644 --- a/cmd/kubectl/kubectl.go +++ b/cmd/kubectl/kubectl.go @@ -17,6 +17,7 @@ limitations under the License. package main import ( + "fmt" "os" "k8s.io/kubernetes/cmd/kubectl/app" @@ -24,6 +25,7 @@ import ( func main() { if err := app.Run(); err != nil { + fmt.Fprintf(os.Stderr, "error: %v\n", err) os.Exit(1) } os.Exit(0) diff --git a/cmd/kubelet/kubelet.go b/cmd/kubelet/kubelet.go index d26d213e5eb..c1e1e11f175 100644 --- a/cmd/kubelet/kubelet.go +++ b/cmd/kubelet/kubelet.go @@ -106,6 +106,7 @@ func main() { // run the kubelet if err := app.Run(kubeletServer, kubeletDeps); err != nil { + fmt.Fprintf(os.Stderr, "error: %v\n", err) die(err) } } From 89e38d9d7cdc978c54977a6e90a5968f2ead06be Mon Sep 17 00:00:00 2001 From: netroby Date: Wed, 1 Nov 2017 07:53:14 +0800 Subject: [PATCH 4/5] Fix one line, remove fprintf --- cmd/kubelet/kubelet.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/kubelet/kubelet.go b/cmd/kubelet/kubelet.go index c1e1e11f175..464b5a1171a 100644 --- a/cmd/kubelet/kubelet.go +++ b/cmd/kubelet/kubelet.go @@ -105,8 +105,7 @@ func main() { } // run the kubelet - if err := app.Run(kubeletServer, kubeletDeps); err != nil { - fmt.Fprintf(os.Stderr, "error: %v\n", err) + if err := app.Run(kubeletServer, kubeletDeps); err != nil { die(err) } } From 0914db052e62763079dda0937caa4169b9a9661c Mon Sep 17 00:00:00 2001 From: netroby Date: Wed, 1 Nov 2017 07:53:46 +0800 Subject: [PATCH 5/5] Remove spaces --- cmd/kubelet/kubelet.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/kubelet/kubelet.go b/cmd/kubelet/kubelet.go index 464b5a1171a..d26d213e5eb 100644 --- a/cmd/kubelet/kubelet.go +++ b/cmd/kubelet/kubelet.go @@ -105,7 +105,7 @@ func main() { } // run the kubelet - if err := app.Run(kubeletServer, kubeletDeps); err != nil { + if err := app.Run(kubeletServer, kubeletDeps); err != nil { die(err) } }