From 3da7802b7c52d2d68fc0a87f4d15dfb41d2ace42 Mon Sep 17 00:00:00 2001
From: SataQiu <shidaqiu2018@gmail.com>
Date: Thu, 19 Oct 2023 14:44:02 +0800
Subject: [PATCH 1/2] 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()) {

From 259dd93e7195019e2dc909de8c246544b0f2f91f Mon Sep 17 00:00:00 2001
From: SataQiu <shidaqiu2018@gmail.com>
Date: Thu, 19 Oct 2023 15:08:47 +0800
Subject: [PATCH 2/2] kubeadm: skip CRI detection for 'kubeadm config validate'

---
 cmd/kubeadm/app/util/config/common.go      |  6 +++---
 cmd/kubeadm/app/util/config/common_test.go | 24 +++++++---------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/cmd/kubeadm/app/util/config/common.go b/cmd/kubeadm/app/util/config/common.go
index 7c3b8bb72a6..d038ccf4878 100644
--- a/cmd/kubeadm/app/util/config/common.go
+++ b/cmd/kubeadm/app/util/config/common.go
@@ -332,21 +332,21 @@ func ValidateConfig(config []byte, allowExperimental bool) error {
 
 	// Validate InitConfiguration and ClusterConfiguration if there are any in the config
 	if kubeadmutil.GroupVersionKindsHasInitConfiguration(gvks...) || kubeadmutil.GroupVersionKindsHasClusterConfiguration(gvks...) {
-		if _, err := documentMapToInitConfiguration(gvkmap, true, allowExperimental, true, false); err != nil {
+		if _, err := documentMapToInitConfiguration(gvkmap, true, allowExperimental, true, true); err != nil {
 			return err
 		}
 	}
 
 	// Validate JoinConfiguration if there is any
 	if kubeadmutil.GroupVersionKindsHasJoinConfiguration(gvks...) {
-		if _, err := documentMapToJoinConfiguration(gvkmap, true, allowExperimental, true, false); err != nil {
+		if _, err := documentMapToJoinConfiguration(gvkmap, true, allowExperimental, true, true); err != nil {
 			return err
 		}
 	}
 
 	// Validate ResetConfiguration if there is any
 	if kubeadmutil.GroupVersionKindsHasResetConfiguration(gvks...) {
-		if _, err := documentMapToResetConfiguration(gvkmap, true, allowExperimental, true, false); err != nil {
+		if _, err := documentMapToResetConfiguration(gvkmap, true, allowExperimental, true, true); err != nil {
 			return err
 		}
 	}
diff --git a/cmd/kubeadm/app/util/config/common_test.go b/cmd/kubeadm/app/util/config/common_test.go
index 729cbd7281b..54102a88d94 100644
--- a/cmd/kubeadm/app/util/config/common_test.go
+++ b/cmd/kubeadm/app/util/config/common_test.go
@@ -510,30 +510,24 @@ func TestValidateConfig(t *testing.T) {
 			cfg: dedent.Dedent(fmt.Sprintf(`
 			apiVersion: %s
 			kind: InitConfiguration
-			nodeRegistration:
-			  criSocket: %s
 			  name: foo bar # not a valid subdomain
-			`, gv, constants.UnknownCRISocket)),
+			`, gv)),
 			expectedError: true,
 		},
 		{
 			name: "unknown API GVK",
-			cfg: dedent.Dedent(fmt.Sprintf(`
+			cfg: dedent.Dedent(`
 			apiVersion: foo/bar # not a valid GroupVersion
 			kind: zzz # not a valid Kind
-			nodeRegistration:
-			  criSocket: %s
-			`, constants.UnknownCRISocket)),
+			`),
 			expectedError: true,
 		},
 		{
 			name: "legacy API GVK",
-			cfg: dedent.Dedent(fmt.Sprintf(`
+			cfg: dedent.Dedent(`
 			apiVersion: kubeadm.k8s.io/v1beta1 # legacy API
 			kind: InitConfiguration
-			nodeRegistration:
-			  criSocket: %s
-			`, constants.UnknownCRISocket)),
+			`),
 			expectedError: true,
 		},
 		{
@@ -542,9 +536,7 @@ func TestValidateConfig(t *testing.T) {
 			apiVersion: %s
 			kind: InitConfiguration
 			foo: bar
-			nodeRegistration:
-			  criSocket: %s
-			`, gv, constants.UnknownCRISocket)),
+			`, gv)),
 			expectedError: true,
 		},
 		{
@@ -552,9 +544,7 @@ func TestValidateConfig(t *testing.T) {
 			cfg: dedent.Dedent(fmt.Sprintf(`
 			apiVersion: %s
 			kind: InitConfiguration
-			nodeRegistration:
-			  criSocket: %s
-			`, gv, constants.UnknownCRISocket)),
+			`, gv)),
 			expectedError: false,
 		},
 		{