From aae1f2a85f40fcf0168582b27fb844999b4629ed Mon Sep 17 00:00:00 2001 From: Dave Chen Date: Thu, 3 Nov 2022 10:30:31 +0800 Subject: [PATCH] kubeadm: `cri-socket` is not allowed for mixed configuration 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 --- cmd/kubeadm/app/cmd/init_test.go | 2 +- cmd/kubeadm/app/cmd/join_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/kubeadm/app/cmd/init_test.go b/cmd/kubeadm/app/cmd/init_test.go index b3f12e0e014..8fde9183a62 100644 --- a/cmd/kubeadm/app/cmd/init_test.go +++ b/cmd/kubeadm/app/cmd/init_test.go @@ -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{ options.CfgPath: configFilePath, options.NodeName: "anotherName", diff --git a/cmd/kubeadm/app/cmd/join_test.go b/cmd/kubeadm/app/cmd/join_test.go index 743e4d3aee4..d3b21d234f7 100644 --- a/cmd/kubeadm/app/cmd/join_test.go +++ b/cmd/kubeadm/app/cmd/join_test.go @@ -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{ options.CfgPath: configFilePath, options.NodeName: "anotherName",