Skip to content
This repository was archived by the owner on Mar 22, 2018. It is now read-only.

Commit 25bba44

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request #49234 from mengqiy/master
Automatic merge from submit-queue (batch tested with PRs 49107, 47177, 49234, 49224, 49227) Move util/exec to vendor Move util/exec to vendor. Update import paths. Update godep Part of #48209 Associate PR against `k8s.io/utils` repo: kubernetes/utils#5 ```release-note NONE ``` /assign @apelisse
2 parents a44caf5 + 96a50fa commit 25bba44

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

pkg/cloudprovider/providers/openstack/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ go_library(
2626
"//pkg/api/v1/service:go_default_library",
2727
"//pkg/cloudprovider:go_default_library",
2828
"//pkg/controller:go_default_library",
29-
"//pkg/util/exec:go_default_library",
3029
"//pkg/util/mount:go_default_library",
3130
"//pkg/volume:go_default_library",
3231
"//vendor/github.com/golang/glog:go_default_library",
@@ -62,6 +61,7 @@ go_library(
6261
"//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library",
6362
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
6463
"//vendor/k8s.io/client-go/util/cert:go_default_library",
64+
"//vendor/k8s.io/utils/exec:go_default_library",
6565
],
6666
)
6767

pkg/cloudprovider/providers/openstack/metadata.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
"strings"
2929

3030
"github.com/golang/glog"
31-
"k8s.io/kubernetes/pkg/util/exec"
3231
"k8s.io/kubernetes/pkg/util/mount"
32+
"k8s.io/utils/exec"
3333
)
3434

3535
// metadataUrl is URL to OpenStack metadata server. It's hardcoded IPv4

pkg/volume/cinder/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ go_library(
2222
"//pkg/cloudprovider/providers/openstack:go_default_library",
2323
"//pkg/cloudprovider/providers/rackspace:go_default_library",
2424
"//pkg/kubelet/apis:go_default_library",
25-
"//pkg/util/exec:go_default_library",
2625
"//pkg/util/keymutex:go_default_library",
2726
"//pkg/util/mount:go_default_library",
2827
"//pkg/util/strings:go_default_library",
@@ -37,6 +36,7 @@ go_library(
3736
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
3837
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
3938
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
39+
"//vendor/k8s.io/utils/exec:go_default_library",
4040
],
4141
)
4242

pkg/volume/cinder/attacher.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import (
2626
"github.com/golang/glog"
2727
"k8s.io/apimachinery/pkg/types"
2828
"k8s.io/apimachinery/pkg/util/wait"
29-
"k8s.io/kubernetes/pkg/util/exec"
3029
"k8s.io/kubernetes/pkg/util/mount"
3130
"k8s.io/kubernetes/pkg/volume"
3231
volumeutil "k8s.io/kubernetes/pkg/volume/util"
32+
"k8s.io/utils/exec"
3333
)
3434

3535
type cinderDiskAttacher struct {

pkg/volume/cinder/cinder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ import (
3030
"k8s.io/kubernetes/pkg/cloudprovider"
3131
"k8s.io/kubernetes/pkg/cloudprovider/providers/openstack"
3232
"k8s.io/kubernetes/pkg/cloudprovider/providers/rackspace"
33-
"k8s.io/kubernetes/pkg/util/exec"
3433
"k8s.io/kubernetes/pkg/util/keymutex"
3534
"k8s.io/kubernetes/pkg/util/mount"
3635
"k8s.io/kubernetes/pkg/util/strings"
3736
"k8s.io/kubernetes/pkg/volume"
3837
"k8s.io/kubernetes/pkg/volume/util"
3938
"k8s.io/kubernetes/pkg/volume/util/volumehelper"
39+
"k8s.io/utils/exec"
4040
)
4141

4242
// This is the primary entrypoint for volume plugins.

pkg/volume/cinder/cinder_util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import (
3131
"k8s.io/apimachinery/pkg/util/sets"
3232
clientset "k8s.io/client-go/kubernetes"
3333
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
34-
"k8s.io/kubernetes/pkg/util/exec"
3534
"k8s.io/kubernetes/pkg/volume"
35+
"k8s.io/utils/exec"
3636
)
3737

3838
type CinderDiskUtil struct{}

0 commit comments

Comments
 (0)