Skip to content

Commit fe04041

Browse files
authored
Merge pull request kubernetes#80142 from loqutus/master
remove github.com/kardianos/osext
2 parents a155f3b + b4ce777 commit fe04041

File tree

17 files changed

+2
-314
lines changed

17 files changed

+2
-314
lines changed

Godeps/LICENSES

Lines changed: 0 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ require (
8787
github.com/jonboulle/clockwork v0.1.0
8888
github.com/json-iterator/go v1.1.6
8989
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024
90-
github.com/kardianos/osext v0.0.0-20150410034420-8fef92e41e22
9190
github.com/karrick/godirwalk v1.7.5 // indirect
9291
github.com/libopenstorage/openstorage v0.0.0-20170906232338-093a0c388875
9392
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
@@ -312,7 +311,6 @@ replace (
312311
github.com/json-iterator/go => github.com/json-iterator/go v1.1.6
313312
github.com/jstemmer/go-junit-report => github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024
314313
github.com/jtolds/gls => github.com/jtolds/gls v4.20.0+incompatible
315-
github.com/kardianos/osext => github.com/kardianos/osext v0.0.0-20150410034420-8fef92e41e22
316314
github.com/karrick/godirwalk => github.com/karrick/godirwalk v1.7.5
317315
github.com/klauspost/cpuid => github.com/klauspost/cpuid v1.2.0
318316
github.com/konsorten/go-windows-terminal-sequences => github.com/konsorten/go-windows-terminal-sequences v1.0.1

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,6 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024 h1:rBMNdl
243243
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
244244
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
245245
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
246-
github.com/kardianos/osext v0.0.0-20150410034420-8fef92e41e22 h1:eLCQd4nxsC7sumkwNg4OiB6bGiD7I5l1MSfBAxmxkKQ=
247-
github.com/kardianos/osext v0.0.0-20150410034420-8fef92e41e22/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
248246
github.com/karrick/godirwalk v1.7.5 h1:VbzFqwXwNbAZoA6W5odrLr+hKK197CcENcPh6E/gJ0M=
249247
github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34=
250248
github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=

test/e2e_node/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ go_test(
196196
"//test/e2e/framework/config:go_default_library",
197197
"//test/e2e/framework/testfiles:go_default_library",
198198
"//test/e2e/generated:go_default_library",
199-
"//vendor/github.com/kardianos/osext:go_default_library",
200199
"//vendor/github.com/onsi/ginkgo/config:go_default_library",
201200
"//vendor/github.com/onsi/ginkgo/reporters:go_default_library",
202201
"//vendor/github.com/spf13/pflag:go_default_library",

test/e2e_node/e2e_node_suite_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ import (
4646
"k8s.io/kubernetes/test/e2e/generated"
4747
"k8s.io/kubernetes/test/e2e_node/services"
4848

49-
"github.com/kardianos/osext"
5049
. "github.com/onsi/ginkgo"
5150
"github.com/onsi/ginkgo/config"
5251
morereporters "github.com/onsi/ginkgo/reporters"
@@ -204,7 +203,7 @@ var _ = SynchronizedAfterSuite(func() {}, func() {
204203

205204
// validateSystem runs system validation in a separate process and returns error if validation fails.
206205
func validateSystem() error {
207-
testBin, err := osext.Executable()
206+
testBin, err := os.Executable()
208207
if err != nil {
209208
return fmt.Errorf("can't get current binary: %v", err)
210209
}

test/e2e_node/services/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ go_library(
4040
"//test/e2e/framework:go_default_library",
4141
"//test/e2e_node/builder:go_default_library",
4242
"//test/e2e_node/remote:go_default_library",
43-
"//vendor/github.com/kardianos/osext:go_default_library",
4443
"//vendor/github.com/spf13/pflag:go_default_library",
4544
"//vendor/k8s.io/klog:go_default_library",
4645
],

test/e2e_node/services/services.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"path"
2525
"testing"
2626

27-
"github.com/kardianos/osext"
2827
"k8s.io/klog"
2928

3029
utilfeature "k8s.io/apiserver/pkg/util/feature"
@@ -127,7 +126,7 @@ const (
127126

128127
// startInternalServices starts the internal services in a separate process.
129128
func (e *E2EServices) startInternalServices() (*server, error) {
130-
testBin, err := osext.Executable()
129+
testBin, err := os.Executable()
131130
if err != nil {
132131
return nil, fmt.Errorf("can't get current binary: %v", err)
133132
}

vendor/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,6 @@ filegroup(
275275
"//vendor/github.com/jonboulle/clockwork:all-srcs",
276276
"//vendor/github.com/json-iterator/go:all-srcs",
277277
"//vendor/github.com/jstemmer/go-junit-report:all-srcs",
278-
"//vendor/github.com/kardianos/osext:all-srcs",
279278
"//vendor/github.com/karrick/godirwalk:all-srcs",
280279
"//vendor/github.com/konsorten/go-windows-terminal-sequences:all-srcs",
281280
"//vendor/github.com/libopenstorage/openstorage/api:all-srcs",

vendor/github.com/kardianos/osext/BUILD

Lines changed: 0 additions & 29 deletions
This file was deleted.

vendor/github.com/kardianos/osext/LICENSE

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)