github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 10:43:56 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: cleanup UnknownCRISocket from staticpods test

Browse Source
This commit is contained in:
SataQiu 2023-10-19 14:44:02 +08:00
parent 8095ea32b0
commit 3da7802b7c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/kubeadm/app/phases/upgrade/staticpods_test.go
View File

@ -61,7 +61,6 @@ apiVersion: %s
kind: InitConfiguration kind: InitConfiguration
nodeRegistration: nodeRegistration:
name: foo name: foo
criSocket: %s
localAPIEndpoint: localAPIEndpoint:
advertiseAddress: 192.168.2.2 advertiseAddress: 192.168.2.2
bindPort: 6443 bindPort: 6443
@ -86,7 +85,7 @@ networking:
dnsDomain: cluster.local dnsDomain: cluster.local
podSubnet: "" podSubnet: ""
serviceSubnet: 10.96.0.0/12 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 // fakeWaiter is a fake apiclient.Waiter that returns errors it was initialized with
type fakeWaiter struct { type fakeWaiter struct {
@ -600,7 +599,7 @@ func getConfig(version, certsDir, etcdDataDir string) (*kubeadmapi.InitConfigura
configBytes := []byte(fmt.Sprintf(testConfiguration, certsDir, etcdDataDir, version)) configBytes := []byte(fmt.Sprintf(testConfiguration, certsDir, etcdDataDir, version))
// Unmarshal the config // Unmarshal the config
return configutil.BytesToInitConfiguration(configBytes, false) return configutil.BytesToInitConfiguration(configBytes, true /* skipCRIDetect */)
} }
func getTempDir(t *testing.T, name string) (string, func()) { func getTempDir(t *testing.T, name string) (string, func()) {