github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 10:20:51 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: cri-socket is not allowed for mixed configuration

Browse Source 
Set the `cri-socket` both in flags and config file will hit errors,
this should not be a valid case to validate in current testcases.

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

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

@ -100,7 +100,7 @@ func TestNewInitData(t *testing.T) {
}, },
}, },
{ {
name: "--cri-socket and --node-name flags override config from file", name: "--node-name flags override config from file",
flags: map[string]string{ flags: map[string]string{
options.CfgPath: configFilePath, options.CfgPath: configFilePath,
options.NodeName: "anotherName", options.NodeName: "anotherName",

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

@ -208,7 +208,7 @@ func TestNewJoinData(t *testing.T) {
}, },
}, },
{ {
name: "--cri-socket and --node-name flags override config from file", name: "--node-name flags override config from file",
flags: map[string]string{ flags: map[string]string{
options.CfgPath: configFilePath, options.CfgPath: configFilePath,
options.NodeName: "anotherName", options.NodeName: "anotherName",