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

Merge pull request #4082 from justinsb/unattended_apt_get 

Automatic merge from submit-queue.

apt-get: specify unattended installation
This commit is contained in:
Kubernetes Submit Queue 2017-12-15 03:14:37 -08:00 committed by GitHub
parent 3a10a8c7cb 78b84d6c2c
commit f0303c80dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
upup/pkg/fi/nodeup/nodetasks/package.go
View File

@ -296,9 +296,10 @@ func (_ *Package) RenderLocal(t *local.LocalTarget, a, e, changes *Package) erro
} }
} else { } else {
var args []string var args []string
env := os.Environ()
if t.HasTag(tags.TagOSFamilyDebian) { if t.HasTag(tags.TagOSFamilyDebian) {
args = []string{"apt-get", "install", "--yes", e.Name} args = []string{"apt-get", "install", "--yes", e.Name}
env = append(env, "DEBIAN_FRONTEND=noninteractive")
} else if t.HasTag(tags.TagOSFamilyRHEL) { } else if t.HasTag(tags.TagOSFamilyRHEL) {
args = []string{"/usr/bin/yum", "install", "-y", e.Name} args = []string{"/usr/bin/yum", "install", "-y", e.Name}
} else { } else {
@ -307,6 +308,7 @@ func (_ *Package) RenderLocal(t *local.LocalTarget, a, e, changes *Package) erro
glog.Infof("running command %s", args) glog.Infof("running command %s", args)
cmd := exec.Command(args[0], args[1:]...) cmd := exec.Command(args[0], args[1:]...)
cmd.Env = env
output, err := cmd.CombinedOutput() output, err := cmd.CombinedOutput()
if err != nil { if err != nil {
return fmt.Errorf("error installing package %q: %v: %s", e.Name, err, string(output)) return fmt.Errorf("error installing package %q: %v: %s", e.Name, err, string(output))