From c7a012f033055ca301bb5156976828004574f7b7 Mon Sep 17 00:00:00 2001 From: danielqsj Date: Tue, 29 Jan 2019 10:43:52 +0800 Subject: [PATCH] migrate the rest reference of pkg/util/exec to k8s.io/utils/exec --- pkg/kubelet/container/runtime.go | 2 +- pkg/util/mount/mount.go | 2 +- test/test_owners.csv | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/container/runtime.go b/pkg/kubelet/container/runtime.go index 2c6172f5e2..b0d3683e2e 100644 --- a/pkg/kubelet/container/runtime.go +++ b/pkg/kubelet/container/runtime.go @@ -155,7 +155,7 @@ type ContainerAttacher interface { type ContainerCommandRunner interface { // RunInContainer synchronously executes the command in the container, and returns the output. - // If the command completes with a non-0 exit code, a pkg/util/exec.ExitError will be returned. + // If the command completes with a non-0 exit code, a k8s.io/utils/exec.ExitError will be returned. RunInContainer(id ContainerID, cmd []string, timeout time.Duration) ([]byte, error) } diff --git a/pkg/util/mount/mount.go b/pkg/util/mount/mount.go index 682bdf80c4..dc108a8942 100644 --- a/pkg/util/mount/mount.go +++ b/pkg/util/mount/mount.go @@ -143,7 +143,7 @@ type Subpath struct { // Exec executes command where mount utilities are. This can be either the host, // container where kubelet runs or even a remote pod with mount utilities. -// Usual pkg/util/exec interface is not used because kubelet.RunInContainer does +// Usual k8s.io/utils/exec interface is not used because kubelet.RunInContainer does // not provide stdin/stdout/stderr streams. type Exec interface { // Run executes a command and returns its stdout + stderr combined in one diff --git a/test/test_owners.csv b/test/test_owners.csv index 16ba34c28d..4ccdc5f6d4 100644 --- a/test/test_owners.csv +++ b/test/test_owners.csv @@ -787,7 +787,6 @@ k8s.io/kubernetes/pkg/util/config,jszczepkowski,1, k8s.io/kubernetes/pkg/util/configz,ixdy,1, k8s.io/kubernetes/pkg/util/dbus,roberthbailey,1, k8s.io/kubernetes/pkg/util/env,asalkeld,0, -k8s.io/kubernetes/pkg/util/exec,krousey,1, k8s.io/kubernetes/pkg/util/goroutinemap,saad-ali,0, k8s.io/kubernetes/pkg/util/hash,timothysc,1, k8s.io/kubernetes/pkg/util/i18n,brendandburns,0,