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

Merge pull request #85153 from codenrhoden/mount-no-exec-int

Browse Source 
Retire mount.Exec for k8s.io/utils/exec
This commit is contained in:
Kubernetes Prow Robot
2019-11-13 17:28:32 -08:00
committed by GitHub
parent 072cf5bd58 367f879131
commit 565566f4b2
53 changed files with 449 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/controller/volume/attachdetach/BUILD
View File

@@ -46,6 +46,7 @@ go_library(
"//staging/src/k8s.io/client-go/util/workqueue:go_default_library",
"//staging/src/k8s.io/cloud-provider:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
"//vendor/k8s.io/utils/exec:go_default_library",
],
)

6
pkg/controller/volume/attachdetach/attach_detach_controller.go
View File

@@ -45,6 +45,8 @@ import (
"k8s.io/client-go/util/workqueue"
cloudprovider "k8s.io/cloud-provider"
"k8s.io/klog"
utilexec "k8s.io/utils/exec"
"k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache"
"k8s.io/kubernetes/pkg/controller/volume/attachdetach/metrics"
"k8s.io/kubernetes/pkg/controller/volume/attachdetach/populator"
@@ -768,8 +770,8 @@ func (adc *attachDetachController) DeleteServiceAccountTokenFunc() func(types.UI
}
}
func (adc *attachDetachController) GetExec(pluginName string) mount.Exec {
return mount.NewOSExec()
func (adc *attachDetachController) GetExec(pluginName string) utilexec.Interface {
return utilexec.New()
}
func (adc *attachDetachController) addNodeToDswp(node *v1.Node, nodeName types.NodeName) {

1
pkg/controller/volume/expand/BUILD
View File

@@ -33,6 +33,7 @@ go_library(
"//staging/src/k8s.io/client-go/util/workqueue:go_default_library",
"//staging/src/k8s.io/cloud-provider:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
"//vendor/k8s.io/utils/exec:go_default_library",
],
)

6
pkg/controller/volume/expand/expand_controller.go
View File

@@ -41,6 +41,8 @@ import (
"k8s.io/client-go/tools/record"
"k8s.io/client-go/util/workqueue"
cloudprovider "k8s.io/cloud-provider"
utilexec "k8s.io/utils/exec"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
"k8s.io/kubernetes/pkg/controller/volume/events"
"k8s.io/kubernetes/pkg/util/mount"
@@ -380,8 +382,8 @@ func (expc *expandController) GetMounter(pluginName string) mount.Interface {
return nil
}
func (expc *expandController) GetExec(pluginName string) mount.Exec {
return mount.NewOSExec()
func (expc *expandController) GetExec(pluginName string) utilexec.Interface {
return utilexec.New()
}
func (expc *expandController) GetHostName() string {

1
pkg/controller/volume/persistentvolume/BUILD
View File

@@ -56,6 +56,7 @@ go_library(
"//staging/src/k8s.io/cloud-provider/volume/errors:go_default_library",
"//staging/src/k8s.io/csi-translation-lib:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
"//vendor/k8s.io/utils/exec:go_default_library",
],
)

6
pkg/controller/volume/persistentvolume/volume_host.go
View File

@@ -27,6 +27,8 @@ import (
"k8s.io/client-go/tools/record"
cloudprovider "k8s.io/cloud-provider"
"k8s.io/klog"
utilexec "k8s.io/utils/exec"
"k8s.io/kubernetes/pkg/util/mount"
vol "k8s.io/kubernetes/pkg/volume"
"k8s.io/kubernetes/pkg/volume/util/subpath"
@@ -116,8 +118,8 @@ func (ctrl *PersistentVolumeController) DeleteServiceAccountTokenFunc() func(typ
}
}
func (adc *PersistentVolumeController) GetExec(pluginName string) mount.Exec {
return mount.NewOSExec()
func (adc *PersistentVolumeController) GetExec(pluginName string) utilexec.Interface {
return utilexec.New()
}
func (ctrl *PersistentVolumeController) GetNodeLabels() (map[string]string, error) {