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

Merge pull request #76456 from codenrhoden/mv-exec-mounter

Browse Source 
Move ExecMount to pkg/volume/util/exec
This commit is contained in:
Kubernetes Prow Robot
2019-04-17 12:16:20 -07:00
committed by GitHub
parent 23e6f80304 96476fd054
commit 32a49828fe
8 changed files with 114 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/BUILD
View File

@@ -110,6 +110,7 @@ go_library(
"//pkg/volume:go_default_library",
"//pkg/volume/csi:go_default_library",
"//pkg/volume/util:go_default_library",
"//pkg/volume/util/exec:go_default_library",
"//pkg/volume/util/subpath:go_default_library",
"//pkg/volume/util/types:go_default_library",
"//pkg/volume/util/volumepathhandler:go_default_library",

3
pkg/kubelet/volume_host.go
View File

@@ -43,6 +43,7 @@ import (
"k8s.io/kubernetes/pkg/util/mount"
"k8s.io/kubernetes/pkg/volume"
"k8s.io/kubernetes/pkg/volume/util"
execmnt "k8s.io/kubernetes/pkg/volume/util/exec"
"k8s.io/kubernetes/pkg/volume/util/subpath"
)
@@ -230,7 +231,7 @@ func (kvh *kubeletVolumeHost) GetMounter(pluginName string) mount.Interface {
if exec == nil {
return kvh.kubelet.mounter
}
return mount.NewExecMounter(exec, kvh.kubelet.mounter)
return execmnt.NewExecMounter(exec, kvh.kubelet.mounter)
}
func (kvh *kubeletVolumeHost) GetHostName() string {