Move HostUtil to pkg/volume/util/hostutil

This patch moves the HostUtil functionality from the util/mount package
to the volume/util/hostutil package.

All `*NewHostUtil*` calls are changed to return concrete types instead
of interfaces.

All callers are changed to use the `*NewHostUtil*` methods instead of
directly instantiating the concrete types.
This commit is contained in:
Travis Rhoden
2019-08-22 23:18:23 -06:00
parent e176e47719
commit 935c23f2ad
51 changed files with 496 additions and 364 deletions

View File

@@ -21,15 +21,15 @@ import (
"os"
"testing"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/uuid"
"k8s.io/client-go/kubernetes/fake"
utilmount "k8s.io/kubernetes/pkg/util/mount"
"k8s.io/kubernetes/pkg/volume"
volumetest "k8s.io/kubernetes/pkg/volume/testing"
"k8s.io/kubernetes/pkg/volume/util/hostutil"
utilpath "k8s.io/utils/path"
)
@@ -358,13 +358,13 @@ func TestOSFileTypeChecker(t *testing.T) {
{
name: "Existing Folder",
path: "/tmp/ExistingFolder",
desiredType: string(utilmount.FileTypeDirectory),
desiredType: string(hostutil.FileTypeDirectory),
isDir: true,
},
{
name: "Existing File",
path: "/tmp/ExistingFolder/foo",
desiredType: string(utilmount.FileTypeFile),
desiredType: string(hostutil.FileTypeFile),
isFile: true,
},
{
@@ -388,11 +388,10 @@ func TestOSFileTypeChecker(t *testing.T) {
}
for i, tc := range testCases {
fakeFTC := &utilmount.FakeHostUtil{
Filesystem: map[string]utilmount.FileType{
tc.path: utilmount.FileType(tc.desiredType),
},
}
fakeFTC := hostutil.NewFakeHostUtil(
map[string]hostutil.FileType{
tc.path: hostutil.FileType(tc.desiredType),
})
oftc := newFileTypeChecker(tc.path, fakeFTC)
path := oftc.GetPath()