github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #73445 from danielqsj/fix-exec 

migrate the rest reference of pkg/util/exec to k8s.io/utils/exec
pull/564/head
Kubernetes Prow Robot 2019-02-01 17:14:15 -08:00 committed by GitHub
parent 8e05f0904b c7a012f033
commit 4331660fcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/container/runtime.go
View File

@ -155,7 +155,7 @@ type ContainerAttacher interface {
type ContainerCommandRunner interface { type ContainerCommandRunner interface {
// RunInContainer synchronously executes the command in the container, and returns the output. // 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) RunInContainer(id ContainerID, cmd []string, timeout time.Duration) ([]byte, error)
} }

2
pkg/util/mount/mount.go
View File

@ -143,7 +143,7 @@ type Subpath struct {
// Exec executes command where mount utilities are. This can be either the host, // 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. // 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. // not provide stdin/stdout/stderr streams.
type Exec interface { type Exec interface {
// Run executes a command and returns its stdout + stderr combined in one // Run executes a command and returns its stdout + stderr combined in one

1
test/test_owners.csv
View File

@ -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/configz,ixdy,1,
k8s.io/kubernetes/pkg/util/dbus,roberthbailey,1, k8s.io/kubernetes/pkg/util/dbus,roberthbailey,1,
k8s.io/kubernetes/pkg/util/env,asalkeld,0, 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/goroutinemap,saad-ali,0,
k8s.io/kubernetes/pkg/util/hash,timothysc,1, k8s.io/kubernetes/pkg/util/hash,timothysc,1,
k8s.io/kubernetes/pkg/util/i18n,brendandburns,0, k8s.io/kubernetes/pkg/util/i18n,brendandburns,0,

1 name owner auto-assigned sig
787 k8s.io/kubernetes/pkg/util/configz ixdy 1
788 k8s.io/kubernetes/pkg/util/dbus roberthbailey 1
789 k8s.io/kubernetes/pkg/util/env asalkeld 0
k8s.io/kubernetes/pkg/util/exec krousey 1
790 k8s.io/kubernetes/pkg/util/goroutinemap saad-ali 0
791 k8s.io/kubernetes/pkg/util/hash timothysc 1
792 k8s.io/kubernetes/pkg/util/i18n brendandburns 0