From 89dd2b2807f287f79cdb1a25115f94b21d3f3211 Mon Sep 17 00:00:00 2001 From: hangaoshuai Date: Thu, 31 May 2018 13:43:04 +0800 Subject: [PATCH] remove unused code in kubeadm error.go --- cmd/kubeadm/app/util/error.go | 10 +++------- cmd/kubeadm/app/util/error_test.go | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/cmd/kubeadm/app/util/error.go b/cmd/kubeadm/app/util/error.go index 58a892dd191..4eaf984fd4e 100644 --- a/cmd/kubeadm/app/util/error.go +++ b/cmd/kubeadm/app/util/error.go @@ -33,10 +33,6 @@ const ( ValidationExitCode = 3 ) -type debugError interface { - DebugError() (msg string, args []interface{}) -} - // fatal prints the message if set and then exits. func fatal(msg string, code int) { if len(msg) > 0 { @@ -56,7 +52,7 @@ func fatal(msg string, code int) { // This method is generic to the command in use and may be used by non-Kubectl // commands. func CheckErr(err error) { - checkErr("", err, fatal) + checkErr(err, fatal) } // preflightError allows us to know if the error is a preflight error or not @@ -66,8 +62,8 @@ type preflightError interface { } // checkErr formats a given error as a string and calls the passed handleErr -// func with that string and an kubectl exit code. -func checkErr(prefix string, err error, handleErr func(string, int)) { +// func with that string and an exit code. +func checkErr(err error, handleErr func(string, int)) { switch err.(type) { case nil: return diff --git a/cmd/kubeadm/app/util/error_test.go b/cmd/kubeadm/app/util/error_test.go index 94f131babae..20c4fdb8fb3 100644 --- a/cmd/kubeadm/app/util/error_test.go +++ b/cmd/kubeadm/app/util/error_test.go @@ -42,7 +42,7 @@ func TestCheckErr(t *testing.T) { for _, rt := range tokenTest { codeReturned = 0 - checkErr("", rt.e, errHandle) + checkErr(rt.e, errHandle) if codeReturned != rt.expected { t.Errorf( "failed checkErr:\n\texpected: %d\n\t actual: %d",