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

Fix kubectl PATH element, add logging verbosity

This commit is contained in:
Peter Rifel 2021-01-10 11:18:38 -06:00
parent 17468d496f
commit 1ffc565526
No known key found for this signature in database
GPG Key ID: BC6469E5B16DB2B6
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/e2e/pkg/tester/kubectl.go
View File

@ -52,7 +52,7 @@ func (t *Tester) AcquireKubectl() (string, error) {
}
t.Ginkgo.TestPackageVersion = lines[0]
klog.V(1).Infof("Kubectl package version was not specified. Defaulting to latest: %s", t.Ginkgo.TestPackageVersion)
klog.Infof("Kubectl package version was not specified. Defaulting to latest: %s", t.Ginkgo.TestPackageVersion)
}
clientTar := fmt.Sprintf("kubernetes-client-%s-%s.tar.gz", runtime.GOOS, runtime.GOARCH)
@ -135,7 +135,8 @@ func (t *Tester) ensureClientTar(downloadPath, clientTar string) error {
klog.Warning(err)
}
cmd := exec.Command("gsutil", "cp",
args := []string{
"gsutil", "cp",
fmt.Sprintf(
"gs://%s/%s/%s/%s",
t.Ginkgo.TestPackageBucket,
@ -144,7 +145,10 @@ func (t *Tester) ensureClientTar(downloadPath, clientTar string) error {
clientTar,
),
downloadPath,
)
}
klog.Info(strings.Join(args, " "))
cmd := exec.Command(args[0], args[1:]...)
exec.InheritOutput(cmd)
if err := cmd.Run(); err != nil {
return fmt.Errorf("failed to download release tar %s for release %s: %s", clientTar, t.Ginkgo.TestPackageVersion, err)

3
tests/e2e/pkg/tester/tester.go
View File

@ -19,6 +19,7 @@ package tester
import (
"fmt"
"os"
"path/filepath"
"k8s.io/klog/v2"
@ -44,7 +45,7 @@ func (t *Tester) pretestSetup() error {
return fmt.Errorf("failed to get kubectl package from published releases: %s", err)
}
existingPath := os.Getenv("PATH")
os.Setenv("PATH", fmt.Sprintf("%v:%v", kubectlPath, existingPath))
os.Setenv("PATH", fmt.Sprintf("%v:%v", filepath.Dir(kubectlPath), existingPath))
return nil
}