From a7b610c3bb29c7d224ac23240a4946fd443e2645 Mon Sep 17 00:00:00 2001 From: Dave Chen Date: Thu, 3 Nov 2022 10:47:10 +0800 Subject: [PATCH] kubeadm: use the right methods for logging if no args are passing Signed-off-by: Dave Chen --- cmd/kubeadm/app/cmd/init_test.go | 4 ++-- cmd/kubeadm/app/cmd/join_test.go | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cmd/kubeadm/app/cmd/init_test.go b/cmd/kubeadm/app/cmd/init_test.go index 8fde9183a62..075c8c7304f 100644 --- a/cmd/kubeadm/app/cmd/init_test.go +++ b/cmd/kubeadm/app/cmd/init_test.go @@ -108,7 +108,7 @@ func TestNewInitData(t *testing.T) { validate: func(t *testing.T, data *initData) { // validate that node-name is overwritten if data.cfg.NodeRegistration.Name != "anotherName" { - t.Errorf("Invalid NodeRegistration.Name") + t.Error("Invalid NodeRegistration.Name") } }, }, @@ -162,7 +162,7 @@ func TestNewInitData(t *testing.T) { t.Fatalf("newInitData returned unexpected error: %v", err) } if err == nil && tc.expectError { - t.Fatalf("newInitData didn't return error when expected") + t.Fatal("newInitData didn't return error when expected") } // exec additional validation on the returned value diff --git a/cmd/kubeadm/app/cmd/join_test.go b/cmd/kubeadm/app/cmd/join_test.go index d3b21d234f7..37ecf27d30b 100644 --- a/cmd/kubeadm/app/cmd/join_test.go +++ b/cmd/kubeadm/app/cmd/join_test.go @@ -104,7 +104,7 @@ func TestNewJoinData(t *testing.T) { validate: func(t *testing.T, data *joinData) { // validate that file discovery settings are set into join data if data.cfg.Discovery.File == nil || data.cfg.Discovery.File.KubeConfigPath != "https://foo" { - t.Errorf("Invalid data.cfg.Discovery.File") + t.Error("Invalid data.cfg.Discovery.File") } }, }, @@ -121,7 +121,7 @@ func TestNewJoinData(t *testing.T) { data.cfg.Discovery.BootstrapToken.APIServerEndpoint != "1.2.3.4:6443" || //only first arg should be kept as APIServerEndpoint data.cfg.Discovery.BootstrapToken.Token != "abcdef.0123456789abcdef" || data.cfg.Discovery.BootstrapToken.UnsafeSkipCAVerification != true { - t.Errorf("Invalid data.cfg.Discovery.BootstrapToken") + t.Error("Invalid data.cfg.Discovery.BootstrapToken") } }, }, @@ -137,7 +137,7 @@ func TestNewJoinData(t *testing.T) { if data.cfg.Discovery.TLSBootstrapToken != "abcdef.0123456789abcdef" || data.cfg.Discovery.BootstrapToken == nil || data.cfg.Discovery.BootstrapToken.Token != "abcdef.0123456789abcdef" { - t.Errorf("Invalid TLSBootstrapToken or BootstrapToken.Token") + t.Error("Invalid TLSBootstrapToken or BootstrapToken.Token") } }, }, @@ -155,7 +155,7 @@ func TestNewJoinData(t *testing.T) { if data.cfg.Discovery.TLSBootstrapToken != "abcdef.0123456789abcdef" || data.cfg.Discovery.BootstrapToken == nil || data.cfg.Discovery.BootstrapToken.Token != "defghi.0123456789defghi" { - t.Errorf("Invalid TLSBootstrapToken or BootstrapToken.Token") + t.Error("Invalid TLSBootstrapToken or BootstrapToken.Token") } }, }, @@ -172,7 +172,7 @@ func TestNewJoinData(t *testing.T) { if data.cfg.ControlPlane == nil || data.cfg.ControlPlane.LocalAPIEndpoint.AdvertiseAddress != "1.2.3.4" || data.cfg.ControlPlane.LocalAPIEndpoint.BindPort != 1234 { - t.Errorf("Invalid ControlPlane") + t.Error("Invalid ControlPlane") } }, }, @@ -187,7 +187,7 @@ func TestNewJoinData(t *testing.T) { validate: func(t *testing.T, data *joinData) { // validate that control plane attributes are unset in join data if data.cfg.ControlPlane != nil { - t.Errorf("Invalid ControlPlane") + t.Error("Invalid ControlPlane") } }, expectWarn: true, @@ -216,7 +216,7 @@ func TestNewJoinData(t *testing.T) { validate: func(t *testing.T, data *joinData) { // validate that node-name is overwritten if data.cfg.NodeRegistration.Name != "anotherName" { - t.Errorf("Invalid NodeRegistration.Name") + t.Error("Invalid NodeRegistration.Name") } }, }, @@ -304,7 +304,7 @@ func TestNewJoinData(t *testing.T) { t.Fatalf("newJoinData returned unexpected error: %v", err) } if err == nil && tc.expectError { - t.Fatalf("newJoinData didn't return error when expected") + t.Fatal("newJoinData didn't return error when expected") } // exec additional validation on the returned value