Merge pull request #103123 from dims/remove-fakefs-to-drop-spf13/afer…

…o-dependency

Remove fakefs to drop spf13/afero dependency

cmd/kubelet/app/server.go

@@ -372,7 +372,7 @@ func loadConfigFile(name string) (*kubeletconfiginternal.KubeletConfiguration, e
 	if err != nil {
 		return nil, fmt.Errorf(errFmt, name, err)
 	}
-	loader, err := configfiles.NewFsLoader(utilfs.DefaultFs{}, kubeletConfigFile)
+	loader, err := configfiles.NewFsLoader(&utilfs.DefaultFs{}, kubeletConfigFile)
 	if err != nil {
 		return nil, fmt.Errorf(errFmt, name, err)
 	}

go.mod

@@ -77,7 +77,6 @@ require (
 	github.com/prometheus/common v0.26.0
 	github.com/quobyte/api v0.1.8
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/spf13/afero v1.2.2
 	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5
 	github.com/storageos/go-api v2.2.0+incompatible

pkg/kubelet/checkpointmanager/checkpoint_manager.go

@@ -54,7 +54,7 @@ type impl struct {
 
 // NewCheckpointManager returns a new instance of a checkpoint manager
 func NewCheckpointManager(checkpointDir string) (CheckpointManager, error) {
-	fstore, err := utilstore.NewFileStore(checkpointDir, utilfs.DefaultFs{})
+	fstore, err := utilstore.NewFileStore(checkpointDir, &utilfs.DefaultFs{})
 	if err != nil {
 		return nil, err
 	}

pkg/kubelet/kubeletconfig/checkpoint/store/fsstore_test.go

@@ -41,7 +41,7 @@ import (
 func newInitializedFakeFsStore() (*fsStore, error) {
 	// Test with the default filesystem, the fake filesystem has an issue caused by afero: https://github.com/spf13/afero/issues/141
 	// The default filesystem also behaves more like production, so we should probably not mock the filesystem for unit tests.
-	fs := utilfs.DefaultFs{}
+	fs := &utilfs.DefaultFs{}
 
 	tmpDir, err := fs.TempDir("", "fsstore-test-")
 	if err != nil {

pkg/kubelet/kubeletconfig/configfiles/configfiles_test.go

@@ -152,7 +152,8 @@ foo: bar`),
 
 	for _, c := range cases {
 		t.Run(c.desc, func(t *testing.T) {
-			fs := utilfs.NewFakeFs()
+			fs := utilfs.NewTempFs()
+			fs.MkdirAll(configDir, 0777)
 			path := filepath.Join(configDir, kubeletFile)
 			if c.file != nil {
 				if err := addFile(fs, path, *c.file); err != nil {

pkg/kubelet/kubeletconfig/controller.go

@@ -90,7 +90,7 @@ func NewController(dynamicConfigDir string, transform TransformFunc) *Controller
 		// channels must have capacity at least 1, since we signal with non-blocking writes
 		pendingConfigSource: make(chan bool, 1),
 		configStatus:        status.NewNodeConfigStatus(),
-		checkpointStore:     store.NewFsStore(utilfs.DefaultFs{}, filepath.Join(dynamicConfigDir, storeDir)),
+		checkpointStore:     store.NewFsStore(&utilfs.DefaultFs{}, filepath.Join(dynamicConfigDir, storeDir)),
 	}
 }
 

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

@@ -205,7 +205,7 @@ func TestHelpers(t *testing.T) {
 	}
 	for _, c := range cases {
 		t.Run(c.desc, func(t *testing.T) {
-			c.run(t, utilfs.DefaultFs{})
+			c.run(t, &utilfs.DefaultFs{})
 		})
 	}
 }
@@ -241,7 +241,7 @@ func TestFileExists(t *testing.T) {
 	}
 	for _, c := range cases {
 		t.Run(c.desc, func(t *testing.T) {
-			c.run(t, utilfs.DefaultFs{})
+			c.run(t, &utilfs.DefaultFs{})
 		})
 	}
 }
@@ -276,7 +276,7 @@ func TestEnsureFile(t *testing.T) {
 	}
 	for _, c := range cases {
 		t.Run(c.desc, func(t *testing.T) {
-			c.run(t, utilfs.DefaultFs{})
+			c.run(t, &utilfs.DefaultFs{})
 		})
 	}
 }
@@ -317,7 +317,7 @@ func TestReplaceFile(t *testing.T) {
 	}
 	for _, c := range cases {
 		t.Run(c.desc, func(t *testing.T) {
-			c.run(t, utilfs.DefaultFs{})
+			c.run(t, &utilfs.DefaultFs{})
 		})
 	}
 }
@@ -353,7 +353,7 @@ func TestDirExists(t *testing.T) {
 	}
 	for _, c := range cases {
 		t.Run(c.desc, func(t *testing.T) {
-			c.run(t, utilfs.DefaultFs{})
+			c.run(t, &utilfs.DefaultFs{})
 		})
 	}
 }
@@ -388,7 +388,7 @@ func TestEnsureDir(t *testing.T) {
 	}
 	for _, c := range cases {
 		t.Run(c.desc, func(t *testing.T) {
-			c.run(t, utilfs.DefaultFs{})
+			c.run(t, &utilfs.DefaultFs{})
 		})
 	}
 }
@@ -405,7 +405,7 @@ func TestWriteTempDir(t *testing.T) {
 			return nil
 		},
 	}
-	c.run(t, utilfs.DefaultFs{})
+	c.run(t, &utilfs.DefaultFs{})
 }
 
 func TestReplaceDir(t *testing.T) {
@@ -471,7 +471,7 @@ func TestReplaceDir(t *testing.T) {
 	}
 	for _, c := range cases {
 		t.Run(c.desc, func(t *testing.T) {
-			c.run(t, utilfs.DefaultFs{})
+			c.run(t, &utilfs.DefaultFs{})
 		})
 	}
 }

pkg/kubelet/util/store/filestore_test.go

@@ -17,8 +17,6 @@ limitations under the License.
 package store
 
 import (
-	"io/ioutil"
-	"os"
 	"sort"
 	"testing"
 
@@ -28,16 +26,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)
-}
-
-func TestFakeFileStore(t *testing.T) {
-	store, err := NewFileStore("/tmp/test-fake-file-store", filesystem.NewFakeFs())
+	store, err := NewFileStore("/FileStore", filesystem.NewTempFs())
 	assert.NoError(t, err)
 	testStore(t, store)
 }