Merge pull request #137957 from tallclair/push-vxyyxtvrypxt

Fix user namespace test cleanup race

test/e2e_node/util.go

@@ -87,6 +87,7 @@ const (
 	// state files
 	cpuManagerStateFile    = "/var/lib/kubelet/cpu_manager_state"
 	memoryManagerStateFile = "/var/lib/kubelet/memory_manager_state"
+	usernsStateFiles       = "/var/lib/kubelet/pods/*/userns"
 )
 
 var (

test/e2e_node/util_kubeletconfig.go

@@ -84,6 +84,7 @@ func updateKubeletConfigWithOptions(ctx context.Context, f *framework.Framework,
 		if opts.deleteStateFiles {
 			deleteStateFile(cpuManagerStateFile)
 			deleteStateFile(memoryManagerStateFile)
+			deleteStateFile(usernsStateFiles)
 		}
 
 		framework.ExpectNoError(e2enodekubelet.WriteKubeletConfigFile(kubeletConfig))