kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove verbose options

pull/9918/head
Ling Samuel 2020-12-10 14:25:55 +08:00
parent ead11c65cd
commit 634f0ae0a9
No known key found for this signature in database
GPG Key ID: 1405A670863B367F
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/preload-images/generate.go
View File

@ -181,7 +181,7 @@ func createImageTarball(tarballFilename, containerRuntime string) error {
dirs = append(dirs, "./lib/containers")
}
args := []string{"exec", profile, "sudo", "tar", "-I", "lz4", "-C", "/var", "-cvf", tarballFilename}
args := []string{"exec", profile, "sudo", "tar", "-I", "lz4", "-C", "/var", "-cf", tarballFilename}
args = append(args, dirs...)
cmd := exec.Command("docker", args...)
cmd.Stdout = os.Stdout

2
pkg/drivers/kic/oci/volumes.go
View File

@ -90,7 +90,7 @@ func ExtractTarballToVolume(ociBin string, tarballPath, volumeName, imageName st
if ociBin == Podman && runtime.GOOS == "linux" {
cmdArgs = append(cmdArgs, "--security-opt", "label=disable")
}
cmdArgs = append(cmdArgs, "-v", fmt.Sprintf("%s:/preloaded.tar:ro", tarballPath), "-v", fmt.Sprintf("%s:/extractDir", volumeName), imageName, "-I", "lz4", "-xvf", "/preloaded.tar", "-C", "/extractDir")
cmdArgs = append(cmdArgs, "-v", fmt.Sprintf("%s:/preloaded.tar:ro", tarballPath), "-v", fmt.Sprintf("%s:/extractDir", volumeName), imageName, "-I", "lz4", "-xf", "/preloaded.tar", "-C", "/extractDir")
cmd := exec.Command(ociBin, cmdArgs...)
if _, err := runCmd(cmd); err != nil {
return err

2
pkg/minikube/cruntime/containerd.go
View File

@ -346,7 +346,7 @@ func (r *Containerd) Preload(cfg config.KubernetesConfig) error {
t = time.Now()
// extract the tarball to /var in the VM
if rr, err := r.Runner.RunCmd(exec.Command("sudo", "tar", "-I", "lz4", "-C", "/var", "-xvf", dest)); err != nil {
if rr, err := r.Runner.RunCmd(exec.Command("sudo", "tar", "-I", "lz4", "-C", "/var", "-xf", dest)); err != nil {
return errors.Wrapf(err, "extracting tarball: %s", rr.Output())
}
klog.Infof("Took %f seconds t extract the tarball", time.Since(t).Seconds())

2
pkg/minikube/cruntime/crio.go
View File

@ -264,7 +264,7 @@ func (r *CRIO) Preload(cfg config.KubernetesConfig) error {
t = time.Now()
// extract the tarball to /var in the VM
if rr, err := r.Runner.RunCmd(exec.Command("sudo", "tar", "-I", "lz4", "-C", "/var", "-xvf", dest)); err != nil {
if rr, err := r.Runner.RunCmd(exec.Command("sudo", "tar", "-I", "lz4", "-C", "/var", "-xf", dest)); err != nil {
return errors.Wrapf(err, "extracting tarball: %s", rr.Output())
}
klog.Infof("Took %f seconds t extract the tarball", time.Since(t).Seconds())

2
pkg/minikube/cruntime/docker.go
View File

@ -347,7 +347,7 @@ func (r *Docker) Preload(cfg config.KubernetesConfig) error {
klog.Infof("Took %f seconds to copy over tarball", time.Since(t).Seconds())
// extract the tarball to /var in the VM
if rr, err := r.Runner.RunCmd(exec.Command("sudo", "tar", "-I", "lz4", "-C", "/var", "-xvf", dest)); err != nil {
if rr, err := r.Runner.RunCmd(exec.Command("sudo", "tar", "-I", "lz4", "-C", "/var", "-xf", dest)); err != nil {
return errors.Wrapf(err, "extracting tarball: %s", rr.Output())
}