diff --git a/pkg/controller/volume/attachdetach/attach_detach_controller.go b/pkg/controller/volume/attachdetach/attach_detach_controller.go index fa7086fdc16..12bdb494562 100644 --- a/pkg/controller/volume/attachdetach/attach_detach_controller.go +++ b/pkg/controller/volume/attachdetach/attach_detach_controller.go @@ -24,7 +24,7 @@ import ( "time" authenticationv1 "k8s.io/api/authentication/v1" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/types" @@ -779,7 +779,7 @@ func (adc *attachDetachController) DeleteServiceAccountTokenFunc() func(types.UI } func (adc *attachDetachController) GetExec(pluginName string) mount.Exec { - return mount.NewOsExec() + return mount.NewOSExec() } func (adc *attachDetachController) addNodeToDswp(node *v1.Node, nodeName types.NodeName) { diff --git a/pkg/controller/volume/expand/expand_controller.go b/pkg/controller/volume/expand/expand_controller.go index 3de8b3e2cd6..7c3ac55ea64 100644 --- a/pkg/controller/volume/expand/expand_controller.go +++ b/pkg/controller/volume/expand/expand_controller.go @@ -24,7 +24,7 @@ import ( "k8s.io/klog" authenticationv1 "k8s.io/api/authentication/v1" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/runtime" @@ -374,7 +374,7 @@ func (expc *expandController) GetMounter(pluginName string) mount.Interface { } func (expc *expandController) GetExec(pluginName string) mount.Exec { - return mount.NewOsExec() + return mount.NewOSExec() } func (expc *expandController) GetHostName() string { diff --git a/pkg/controller/volume/persistentvolume/volume_host.go b/pkg/controller/volume/persistentvolume/volume_host.go index 76f3de2ebcd..371807e4c6c 100644 --- a/pkg/controller/volume/persistentvolume/volume_host.go +++ b/pkg/controller/volume/persistentvolume/volume_host.go @@ -21,7 +21,7 @@ import ( "net" authenticationv1 "k8s.io/api/authentication/v1" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/record" @@ -117,7 +117,7 @@ func (ctrl *PersistentVolumeController) DeleteServiceAccountTokenFunc() func(typ } func (adc *PersistentVolumeController) GetExec(pluginName string) mount.Exec { - return mount.NewOsExec() + return mount.NewOSExec() } func (ctrl *PersistentVolumeController) GetNodeLabels() (map[string]string, error) { diff --git a/pkg/kubelet/volume_host.go b/pkg/kubelet/volume_host.go index 99d4d923425..34ac108734f 100644 --- a/pkg/kubelet/volume_host.go +++ b/pkg/kubelet/volume_host.go @@ -24,7 +24,7 @@ import ( "k8s.io/klog" authenticationv1 "k8s.io/api/authentication/v1" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" utilfeature "k8s.io/apiserver/pkg/util/feature" @@ -294,7 +294,7 @@ func (kvh *kubeletVolumeHost) GetExec(pluginName string) mount.Exec { exec = nil } if exec == nil { - return mount.NewOsExec() + return mount.NewOSExec() } return exec } diff --git a/pkg/util/mount/exec.go b/pkg/util/mount/exec.go index 0e6bb5c1ffd..30502b7028e 100644 --- a/pkg/util/mount/exec.go +++ b/pkg/util/mount/exec.go @@ -18,8 +18,8 @@ package mount import "k8s.io/utils/exec" -// NewOsExec returns a new Exec interface implementation based on exec() -func NewOsExec() Exec { +// NewOSExec returns a new Exec interface implementation based on exec() +func NewOSExec() Exec { return &osExec{} } diff --git a/pkg/volume/azure_dd/azure_common_test.go b/pkg/volume/azure_dd/azure_common_test.go index 0d1ca64ccdb..30fec92b8b0 100644 --- a/pkg/volume/azure_dd/azure_common_test.go +++ b/pkg/volume/azure_dd/azure_common_test.go @@ -125,7 +125,7 @@ func TestIoHandler(t *testing.T) { if runtime.GOOS != "windows" && runtime.GOOS != "linux" { t.Skipf("TestIoHandler not supported on GOOS=%s", runtime.GOOS) } - disk, err := findDiskByLun(lun, &fakeIOHandler{}, mount.NewOsExec()) + disk, err := findDiskByLun(lun, &fakeIOHandler{}, mount.NewOSExec()) if runtime.GOOS == "windows" { if err != nil { t.Errorf("no data disk found: disk %v err %v", disk, err)