From 3da7802b7c52d2d68fc0a87f4d15dfb41d2ace42 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Thu, 19 Oct 2023 14:44:02 +0800 Subject: [PATCH] kubeadm: cleanup UnknownCRISocket from staticpods test --- cmd/kubeadm/app/phases/upgrade/staticpods_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/kubeadm/app/phases/upgrade/staticpods_test.go b/cmd/kubeadm/app/phases/upgrade/staticpods_test.go index 3d21e5e4cee..d500ce16c7a 100644 --- a/cmd/kubeadm/app/phases/upgrade/staticpods_test.go +++ b/cmd/kubeadm/app/phases/upgrade/staticpods_test.go @@ -61,7 +61,6 @@ apiVersion: %s kind: InitConfiguration nodeRegistration: name: foo - criSocket: %s localAPIEndpoint: advertiseAddress: 192.168.2.2 bindPort: 6443 @@ -86,7 +85,7 @@ networking: dnsDomain: cluster.local podSubnet: "" serviceSubnet: 10.96.0.0/12 -`, kubeadmapiv1.SchemeGroupVersion.String(), constants.UnknownCRISocket) +`, kubeadmapiv1.SchemeGroupVersion.String()) // fakeWaiter is a fake apiclient.Waiter that returns errors it was initialized with type fakeWaiter struct { @@ -600,7 +599,7 @@ func getConfig(version, certsDir, etcdDataDir string) (*kubeadmapi.InitConfigura configBytes := []byte(fmt.Sprintf(testConfiguration, certsDir, etcdDataDir, version)) // Unmarshal the config - return configutil.BytesToInitConfiguration(configBytes, false) + return configutil.BytesToInitConfiguration(configBytes, true /* skipCRIDetect */) } func getTempDir(t *testing.T, name string) (string, func()) {