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

Merge pull request #9203 from hakman/fix-repo-pkgs 

Fix repo packages not being installed
This commit is contained in:
Kubernetes Prow Robot 2020-05-28 20:09:15 -07:00 committed by GitHub
parent 2534023d4d f2a87f767c
commit aa6e09ca12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,7 +297,7 @@ func (_ *Package) RenderLocal(t *local.LocalTarget, a, e, changes *Package) erro
if a == nil || changes.Version != nil { if a == nil || changes.Version != nil {
klog.Infof("Installing package %q (dependencies: %v)", e.Name, e.Deps) klog.Infof("Installing package %q (dependencies: %v)", e.Name, e.Deps)
var localPkgs []string var pkgs []string
if e.Source != nil { if e.Source != nil {
// Install a deb or rpm. // Install a deb or rpm.
@ -317,10 +317,10 @@ func (_ *Package) RenderLocal(t *local.LocalTarget, a, e, changes *Package) erro
} }
// Download all the debs/rpms. // Download all the debs/rpms.
localPkgs = make([]string, 1+len(e.Deps)) pkgs = make([]string, 1+len(e.Deps))
for i, pkg := range append([]*Package{e}, e.Deps...) { for i, pkg := range append([]*Package{e}, e.Deps...) {
local := path.Join(localPackageDir, pkg.Name+ext) local := path.Join(localPackageDir, pkg.Name+ext)
localPkgs[i] = local pkgs[i] = local
var hash *hashing.Hash var hash *hashing.Hash
if fi.StringValue(pkg.Hash) != "" { if fi.StringValue(pkg.Hash) != "" {
parsed, err := hashing.FromString(fi.StringValue(pkg.Hash)) parsed, err := hashing.FromString(fi.StringValue(pkg.Hash))
@ -334,6 +334,8 @@ func (_ *Package) RenderLocal(t *local.LocalTarget, a, e, changes *Package) erro
return err return err
} }
} }
} else {
pkgs = append(pkgs, e.Name)
} }
var args []string var args []string
@ -350,7 +352,7 @@ func (_ *Package) RenderLocal(t *local.LocalTarget, a, e, changes *Package) erro
} else { } else {
return fmt.Errorf("unsupported package system") return fmt.Errorf("unsupported package system")
} }
args = append(args, localPkgs...) args = append(args, pkgs...)
klog.Infof("running command %s", args) klog.Infof("running command %s", args)
cmd := exec.Command(args[0], args[1:]...) cmd := exec.Command(args[0], args[1:]...)