github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: use the right methods for logging if no args are passing

Browse Source 
Signed-off-by: Dave Chen <dave.chen@arm.com>
This commit is contained in:
Dave Chen 2022-11-03 10:47:10 +08:00
parent aae1f2a85f
commit a7b610c3bb
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/cmd/init_test.go
View File

@ -108,7 +108,7 @@ func TestNewInitData(t *testing.T) {
validate: func(t *testing.T, data *initData) { validate: func(t *testing.T, data *initData) {
// validate that node-name is overwritten // validate that node-name is overwritten
if data.cfg.NodeRegistration.Name != "anotherName" { 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) t.Fatalf("newInitData returned unexpected error: %v", err)
} }
if err == nil && tc.expectError { 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 // exec additional validation on the returned value

16
cmd/kubeadm/app/cmd/join_test.go
View File

@ -104,7 +104,7 @@ func TestNewJoinData(t *testing.T) {
validate: func(t *testing.T, data *joinData) { validate: func(t *testing.T, data *joinData) {
// validate that file discovery settings are set into join data // validate that file discovery settings are set into join data
if data.cfg.Discovery.File == nil || data.cfg.Discovery.File.KubeConfigPath != "https://foo" { 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.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.Token != "abcdef.0123456789abcdef" ||
data.cfg.Discovery.BootstrapToken.UnsafeSkipCAVerification != true { 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" || if data.cfg.Discovery.TLSBootstrapToken != "abcdef.0123456789abcdef" ||
data.cfg.Discovery.BootstrapToken == nil || data.cfg.Discovery.BootstrapToken == nil ||
data.cfg.Discovery.BootstrapToken.Token != "abcdef.0123456789abcdef" { 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" || if data.cfg.Discovery.TLSBootstrapToken != "abcdef.0123456789abcdef" ||
data.cfg.Discovery.BootstrapToken == nil || data.cfg.Discovery.BootstrapToken == nil ||
data.cfg.Discovery.BootstrapToken.Token != "defghi.0123456789defghi" { 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 || if data.cfg.ControlPlane == nil ||
data.cfg.ControlPlane.LocalAPIEndpoint.AdvertiseAddress != "1.2.3.4" || data.cfg.ControlPlane.LocalAPIEndpoint.AdvertiseAddress != "1.2.3.4" ||
data.cfg.ControlPlane.LocalAPIEndpoint.BindPort != 1234 { 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: func(t *testing.T, data *joinData) {
// validate that control plane attributes are unset in join data // validate that control plane attributes are unset in join data
if data.cfg.ControlPlane != nil { if data.cfg.ControlPlane != nil {
t.Errorf("Invalid ControlPlane") t.Error("Invalid ControlPlane")
} }
}, },
expectWarn: true, expectWarn: true,
@ -216,7 +216,7 @@ func TestNewJoinData(t *testing.T) {
validate: func(t *testing.T, data *joinData) { validate: func(t *testing.T, data *joinData) {
// validate that node-name is overwritten // validate that node-name is overwritten
if data.cfg.NodeRegistration.Name != "anotherName" { 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) t.Fatalf("newJoinData returned unexpected error: %v", err)
} }
if err == nil && tc.expectError { 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 // exec additional validation on the returned value