github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

refactor NsenterWriter to utilize pkg/util/nsenter

Browse Source
This commit is contained in:
Di Xu 2017-09-18 18:15:13 +08:00
parent 7fb445c92d
commit 53d340f0a1
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/util/io/BUILD
View File

@ -12,7 +12,10 @@ go_library(
"writer.go", "writer.go",
], ],
importpath = "k8s.io/kubernetes/pkg/util/io", importpath = "k8s.io/kubernetes/pkg/util/io",
deps = ["//vendor/github.com/golang/glog:go_default_library"], deps = [
"//pkg/util/nsenter:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
],
) )
filegroup( filegroup(

24
pkg/util/io/writer.go
View File

@ -21,7 +21,8 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os" "os"
"os/exec"
"k8s.io/kubernetes/pkg/util/nsenter"
"github.com/golang/glog" "github.com/golang/glog"
) )
@ -54,25 +55,20 @@ type NsenterWriter struct{}
// WriteFile calls 'nsenter cat - > <the file>' and 'nsenter chmod' to create a // WriteFile calls 'nsenter cat - > <the file>' and 'nsenter chmod' to create a
// file on the host. // file on the host.
func (writer *NsenterWriter) WriteFile(filename string, data []byte, perm os.FileMode) error { func (writer *NsenterWriter) WriteFile(filename string, data []byte, perm os.FileMode) error {
cmd := "nsenter" ne := nsenter.NewNsenter()
baseArgs := []string{ echoArgs := []string{"-c", fmt.Sprintf("cat > %s", filename)}
"--mount=/rootfs/proc/1/ns/mnt", glog.V(5).Infof("nsenter: write data to file %s by nsenter", filename)
"--", command := ne.Exec("sh", echoArgs)
} command.SetStdin(bytes.NewBuffer(data))
echoArgs := append(baseArgs, "sh", "-c", fmt.Sprintf("cat > %s", filename))
glog.V(5).Infof("Command to write data to file: %v %v", cmd, echoArgs)
command := exec.Command(cmd, echoArgs...)
command.Stdin = bytes.NewBuffer(data)
outputBytes, err := command.CombinedOutput() outputBytes, err := command.CombinedOutput()
if err != nil { if err != nil {
glog.Errorf("Output from writing to %q: %v", filename, string(outputBytes)) glog.Errorf("Output from writing to %q: %v", filename, string(outputBytes))
return err return err
} }
chmodArgs := append(baseArgs, "chmod", fmt.Sprintf("%o", perm), filename) chmodArgs := []string{fmt.Sprintf("%o", perm), filename}
glog.V(5).Infof("Command to change permissions to file: %v %v", cmd, chmodArgs) glog.V(5).Infof("nsenter: change permissions of file %s to %s", filename, chmodArgs[0])
outputBytes, err = exec.Command(cmd, chmodArgs...).CombinedOutput() outputBytes, err = ne.Exec("chmod", chmodArgs).CombinedOutput()
if err != nil { if err != nil {
glog.Errorf("Output from chmod command: %v", string(outputBytes)) glog.Errorf("Output from chmod command: %v", string(outputBytes))
return err return err