Merge pull request #80142 from loqutus/master

remove github.com/kardianos/osext
This commit is contained in:
Kubernetes Prow Robot
2019-07-15 20:28:00 -07:00
committed by GitHub
17 changed files with 2 additions and 314 deletions

View File

@@ -196,7 +196,6 @@ go_test(
"//test/e2e/framework/config:go_default_library",
"//test/e2e/framework/testfiles:go_default_library",
"//test/e2e/generated:go_default_library",
"//vendor/github.com/kardianos/osext:go_default_library",
"//vendor/github.com/onsi/ginkgo/config:go_default_library",
"//vendor/github.com/onsi/ginkgo/reporters:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",

View File

@@ -46,7 +46,6 @@ import (
"k8s.io/kubernetes/test/e2e/generated"
"k8s.io/kubernetes/test/e2e_node/services"
"github.com/kardianos/osext"
. "github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/config"
morereporters "github.com/onsi/ginkgo/reporters"
@@ -204,7 +203,7 @@ var _ = SynchronizedAfterSuite(func() {}, func() {
// validateSystem runs system validation in a separate process and returns error if validation fails.
func validateSystem() error {
testBin, err := osext.Executable()
testBin, err := os.Executable()
if err != nil {
return fmt.Errorf("can't get current binary: %v", err)
}

View File

@@ -40,7 +40,6 @@ go_library(
"//test/e2e/framework:go_default_library",
"//test/e2e_node/builder:go_default_library",
"//test/e2e_node/remote:go_default_library",
"//vendor/github.com/kardianos/osext:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
],

View File

@@ -24,7 +24,6 @@ import (
"path"
"testing"
"github.com/kardianos/osext"
"k8s.io/klog"
utilfeature "k8s.io/apiserver/pkg/util/feature"
@@ -127,7 +126,7 @@ const (
// startInternalServices starts the internal services in a separate process.
func (e *E2EServices) startInternalServices() (*server, error) {
testBin, err := osext.Executable()
testBin, err := os.Executable()
if err != nil {
return nil, fmt.Errorf("can't get current binary: %v", err)
}