github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #75713 from SataQiu/fix-e2e_node-builder-20190326 

Fix golint failures in test/e2e_node/builder
k3s-v1.15.3
Kubernetes Prow Robot 2019-04-13 19:18:00 -07:00 committed by GitHub
parent 0a59758c58 b1cb58fdf2
commit 0e157cbc36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.golint_failures
View File

@ -654,7 +654,6 @@ test/e2e/storage/utils
test/e2e/storage/vsphere test/e2e/storage/vsphere
test/e2e_kubeadm test/e2e_kubeadm
test/e2e_node test/e2e_node
test/e2e_node/builder
test/e2e_node/remote test/e2e_node/remote
test/e2e_node/runner/remote test/e2e_node/runner/remote
test/e2e_node/services test/e2e_node/services

10
test/e2e_node/builder/build.go
View File

@ -37,11 +37,12 @@ var buildTargets = []string{
"cluster/gce/gci/mounter", "cluster/gce/gci/mounter",
} }
// BuildGo builds k8s binaries.
func BuildGo() error { func BuildGo() error {
klog.Infof("Building k8s binaries...") klog.Infof("Building k8s binaries...")
k8sRoot, err := utils.GetK8sRootDir() k8sRoot, err := utils.GetK8sRootDir()
if err != nil { if err != nil {
return fmt.Errorf("failed to locate kubernetes root directory %v.", err) return fmt.Errorf("failed to locate kubernetes root directory %v", err)
} }
targets := strings.Join(buildTargets, " ") targets := strings.Join(buildTargets, " ")
cmd := exec.Command("make", "-C", k8sRoot, fmt.Sprintf("WHAT=%s", targets)) cmd := exec.Command("make", "-C", k8sRoot, fmt.Sprintf("WHAT=%s", targets))
@ -49,7 +50,7 @@ func BuildGo() error {
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
err = cmd.Run() err = cmd.Run()
if err != nil { if err != nil {
return fmt.Errorf("failed to build go packages %v\n", err) return fmt.Errorf("failed to build go packages %v", err)
} }
return nil return nil
} }
@ -62,14 +63,14 @@ func getK8sBin(bin string) (string, error) {
return "", err return "", err
} }
if _, err := os.Stat(filepath.Join(*k8sBinDir, bin)); err != nil { if _, err := os.Stat(filepath.Join(*k8sBinDir, bin)); err != nil {
return "", fmt.Errorf("Could not find %s under directory %s.", bin, absPath) return "", fmt.Errorf("Could not find %s under directory %s", bin, absPath)
} }
return filepath.Join(absPath, bin), nil return filepath.Join(absPath, bin), nil
} }
path, err := filepath.Abs(filepath.Dir(os.Args[0])) path, err := filepath.Abs(filepath.Dir(os.Args[0]))
if err != nil { if err != nil {
return "", fmt.Errorf("Could not find absolute path of directory containing the tests %s.", filepath.Dir(os.Args[0])) return "", fmt.Errorf("Could not find absolute path of directory containing the tests %s", filepath.Dir(os.Args[0]))
} }
if _, err := os.Stat(filepath.Join(path, bin)); err == nil { if _, err := os.Stat(filepath.Join(path, bin)); err == nil {
return filepath.Join(path, bin), nil return filepath.Join(path, bin), nil
@ -87,6 +88,7 @@ func getK8sBin(bin string) (string, error) {
return "", fmt.Errorf("unable to locate %s, Can be defined using --k8s-path", bin) return "", fmt.Errorf("unable to locate %s, Can be defined using --k8s-path", bin)
} }
// GetKubeletServerBin returns the path of kubelet binary.
func GetKubeletServerBin() string { func GetKubeletServerBin() string {
bin, err := getK8sBin("kubelet") bin, err := getK8sBin("kubelet")
if err != nil { if err != nil {