github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move HostUtil to pkg/volume/util/hostutil

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/volume/hostpath/host_path.go
View File

@@ -28,6 +28,7 @@ import (
"k8s.io/kubernetes/pkg/util/mount"
"k8s.io/kubernetes/pkg/volume"
"k8s.io/kubernetes/pkg/volume/util"
"k8s.io/kubernetes/pkg/volume/util/hostutil"
"k8s.io/kubernetes/pkg/volume/util/recyclerclient"
"k8s.io/kubernetes/pkg/volume/validation"
)
@@ -207,7 +208,7 @@ type hostPathMounter struct {
*hostPath
readOnly bool
mounter mount.Interface
hu mount.HostUtils
hu hostutil.HostUtils
}
var _ volume.Mounter = &hostPathMounter{}
@@ -361,7 +362,7 @@ type hostPathTypeChecker interface {
type fileTypeChecker struct {
path string
exists bool
hu mount.HostUtils
hu hostutil.HostUtils
}
func (ftc *fileTypeChecker) Exists() bool {
@@ -423,12 +424,12 @@ func (ftc *fileTypeChecker) GetPath() string {
return ftc.path
}
func newFileTypeChecker(path string, hu mount.HostUtils) hostPathTypeChecker {
func newFileTypeChecker(path string, hu hostutil.HostUtils) hostPathTypeChecker {
return &fileTypeChecker{path: path, hu: hu}
}
// checkType checks whether the given path is the exact pathType
func checkType(path string, pathType *v1.HostPathType, hu mount.HostUtils) error {
func checkType(path string, pathType *v1.HostPathType, hu hostutil.HostUtils) error {
return checkTypeInternal(newFileTypeChecker(path, hu), pathType)
}