Merge pull request #92288 from zhijianli88/cleanup-tempfiles

Cleanup tempfiles

cluster/images/conformance/go-runner/tar_test.go

@@ -36,7 +36,7 @@ func TestTar(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer os.Remove(tmp)
+	defer os.RemoveAll(tmp)
 
 	if err := os.Mkdir(filepath.Join(tmp, "subdir"), os.FileMode(0755)); err != nil {
 		t.Fatal(err)

cluster/images/etcd/migrate/data_dir_test.go

@@ -88,6 +88,7 @@ func TestExistingDataDirWithoutVersionFile(t *testing.T) {
 func TestNonexistingDataDir(t *testing.T) {
 	targetVersion := &EtcdVersionPair{&EtcdVersion{latestVersion}, storageEtcd3}
 	path := newTestPath(t)
+	defer os.RemoveAll(path)
 	d, err := OpenOrCreateDataDirectory(filepath.Join(path, "data-dir"))
 	if err != nil {
 		t.Fatalf("Failed to open data dir: %v", err)
@@ -128,6 +129,7 @@ func TestNonexistingDataDir(t *testing.T) {
 
 func TestBackup(t *testing.T) {
 	path := newTestPath(t)
+	defer os.RemoveAll(path)
 	d, err := OpenOrCreateDataDirectory(filepath.Join(path, "data-dir"))
 	if err != nil {
 		t.Fatalf("Failed to open data dir: %v", err)

pkg/kubelet/cm/devicemanager/manager_test.go

@@ -469,6 +469,7 @@ func TestCheckpoint(t *testing.T) {
 	as := assert.New(t)
 	tmpDir, err := ioutil.TempDir("", "checkpoint")
 	as.Nil(err)
+	defer os.RemoveAll(tmpDir)
 	ckm, err := checkpointmanager.NewCheckpointManager(tmpDir)
 	as.Nil(err)
 	testManager := &ManagerImpl{
@@ -873,6 +874,7 @@ func TestUpdatePluginResources(t *testing.T) {
 	monitorCallback := func(resourceName string, devices []pluginapi.Device) {}
 	tmpDir, err := ioutil.TempDir("", "checkpoint")
 	as.Nil(err)
+	defer os.RemoveAll(tmpDir)
 
 	ckm, err := checkpointmanager.NewCheckpointManager(tmpDir)
 	as.Nil(err)
@@ -973,6 +975,7 @@ func TestResetExtendedResource(t *testing.T) {
 	as := assert.New(t)
 	tmpDir, err := ioutil.TempDir("", "checkpoint")
 	as.Nil(err)
+	defer os.RemoveAll(tmpDir)
 	ckm, err := checkpointmanager.NewCheckpointManager(tmpDir)
 	as.Nil(err)
 	testManager := &ManagerImpl{

pkg/kubelet/kubelet_node_status_test.go

@@ -1954,6 +1954,7 @@ func TestReconcileExtendedResource(t *testing.T) {
 	testKubelet.kubelet.kubeClient = nil // ensure only the heartbeat client is used
 	testKubelet.kubelet.containerManager = cm.NewStubContainerManagerWithExtendedResource(true /* shouldResetExtendedResourceCapacity*/)
 	testKubeletNoReset := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
+	defer testKubeletNoReset.Cleanup()
 	extendedResourceName1 := v1.ResourceName("test.com/resource1")
 	extendedResourceName2 := v1.ResourceName("test.com/resource2")
 

pkg/kubelet/kubeletconfig/util/files/files_test.go

@@ -144,6 +144,7 @@ func (c *test) run(t *testing.T, fs utilfs.Filesystem) {
 	if err != nil {
 		t.Fatalf("error creating temporary directory for test: %v", err)
 	}
+	defer os.RemoveAll(dir)
 	c.write(t, fs, dir)
 	// if fn exists, check errors from fn, then check expected files
 	if c.fn != nil {

pkg/kubelet/util/store/filestore_test.go

@@ -18,6 +18,7 @@ package store
 
 import (
 	"io/ioutil"
+	"os"
 	"sort"
 	"testing"
 
@@ -29,6 +30,7 @@ import (
 func TestFileStore(t *testing.T) {
 	path, err := ioutil.TempDir("", "FileStore")
 	assert.NoError(t, err)
+	defer os.RemoveAll(path)
 	store, err := NewFileStore(path, filesystem.DefaultFs{})
 	assert.NoError(t, err)
 	testStore(t, store)

pkg/volume/csi/nodeinfomanager/nodeinfomanager_test.go

@@ -21,6 +21,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"math"
+	"os"
 	"reflect"
 	"testing"
 
@@ -963,6 +964,7 @@ func TestInstallCSIDriverExistingAnnotation(t *testing.T) {
 		if err != nil {
 			t.Fatalf("can't create temp dir: %v", err)
 		}
+		defer os.RemoveAll(tmpDir)
 		host := volumetest.NewFakeVolumeHostWithCSINodeName(t,
 			tmpDir,
 			client,
@@ -1025,6 +1027,7 @@ func test(t *testing.T, addNodeInfo bool, csiNodeInfoEnabled bool, testcases []t
 		if err != nil {
 			t.Fatalf("can't create temp dir: %v", err)
 		}
+		defer os.RemoveAll(tmpDir)
 		host := volumetest.NewFakeVolumeHostWithCSINodeName(t,
 			tmpDir,
 			client,

pkg/volume/rbd/rbd_test.go

@@ -675,6 +675,7 @@ func TestGetAccessModes(t *testing.T) {
 
 func TestRequiresRemount(t *testing.T) {
 	tmpDir, _ := utiltesting.MkTmpdir("rbd_test")
+	defer os.RemoveAll(tmpDir)
 	plugMgr := volume.VolumePluginMgr{}
 	plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
 	plug, _ := plugMgr.FindPluginByName("kubernetes.io/rbd")

pkg/volume/util/hostutil/hostutil_linux_test.go

@@ -283,6 +283,7 @@ func TestGetFileType(t *testing.T) {
 
 	for idx, tc := range testCase {
 		path, cleanUpPath, err := tc.setUp()
+		defer os.RemoveAll(cleanUpPath) // RemoveAll can deal with a empty path ""
 		if err != nil {
 			// Locally passed, but upstream CI is not friendly to create such device files
 			// Leave "Operation not permitted" out, which can be covered in an e2e test
@@ -291,9 +292,6 @@ func TestGetFileType(t *testing.T) {
 			}
 			t.Fatalf("[%d-%s] unexpected error : %v", idx, tc.name, err)
 		}
-		if len(cleanUpPath) > 0 {
-			defer os.RemoveAll(cleanUpPath)
-		}
 
 		fileType, err := hu.GetFileType(path)
 		if err != nil {

staging/src/k8s.io/apiserver/pkg/admission/config_test.go

@@ -37,6 +37,7 @@ func TestReadAdmissionConfiguration(t *testing.T) {
 	if err != nil {
 		t.Fatalf("unexpected err: %v", err)
 	}
+	defer os.Remove(configFile.Name())
 	if err = configFile.Close(); err != nil {
 		t.Fatalf("unexpected err: %v", err)
 	}
@@ -206,6 +207,7 @@ func TestEmbeddedConfiguration(t *testing.T) {
 	if err != nil {
 		t.Fatalf("unexpected err: %v", err)
 	}
+	defer os.Remove(configFile.Name())
 	if err = configFile.Close(); err != nil {
 		t.Fatalf("unexpected err: %v", err)
 	}