diff -uPNr kubernetes-1.15.0/Godeps/LICENSES kubernetes-1.15.0.new/Godeps/LICENSES
--- kubernetes-1.15.0/Godeps/LICENSES 2019-06-14 20:58:09.000000000 -0400
+++ kubernetes-1.15.0.new/Godeps/LICENSES 2019-07-13 05:19:24.183203795 -0400
@@ -11958,41 +11958,6 @@
================================================================================
-= vendor/github.com/kardianos/osext licensed under: =
-
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-= vendor/github.com/kardianos/osext/LICENSE 591778525c869cdde0ab5a1bf283cd81
-================================================================================
-
-
-================================================================================
= vendor/github.com/karrick/godirwalk licensed under: =
BSD 2-Clause License
diff -uPNr kubernetes-1.15.0/go.mod kubernetes-1.15.0.new/go.mod
--- kubernetes-1.15.0/go.mod 2019-06-14 20:58:09.000000000 -0400
+++ kubernetes-1.15.0.new/go.mod 2019-07-13 05:19:33.791132246 -0400
@@ -89,7 +89,6 @@
github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024
github.com/jteeuwen/go-bindata v0.0.0-20151023091102-a0ff2567cfb7
- github.com/kardianos/osext v0.0.0-20150410034420-8fef92e41e22
github.com/karrick/godirwalk v1.7.5 // indirect
github.com/kr/fs v0.0.0-20131111012553-2788f0dbd169 // indirect
github.com/kr/pretty v0.0.0-20140812000539-f31442d60e51 // indirect
@@ -314,7 +313,6 @@
github.com/jstemmer/go-junit-report => github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024
github.com/jteeuwen/go-bindata => github.com/jteeuwen/go-bindata v0.0.0-20151023091102-a0ff2567cfb7
github.com/jtolds/gls => github.com/jtolds/gls v4.20.0+incompatible
- github.com/kardianos/osext => github.com/kardianos/osext v0.0.0-20150410034420-8fef92e41e22
github.com/karrick/godirwalk => github.com/karrick/godirwalk v1.7.5
github.com/konsorten/go-windows-terminal-sequences => github.com/konsorten/go-windows-terminal-sequences v1.0.1
github.com/kr/fs => github.com/kr/fs v0.0.0-20131111012553-2788f0dbd169
diff -uPNr kubernetes-1.15.0/go.sum kubernetes-1.15.0.new/go.sum
--- kubernetes-1.15.0/go.sum 2019-06-14 20:58:09.000000000 -0400
+++ kubernetes-1.15.0.new/go.sum 2019-07-13 05:19:36.986108453 -0400
@@ -233,8 +233,6 @@
github.com/jteeuwen/go-bindata v0.0.0-20151023091102-a0ff2567cfb7/go.mod h1:JVvhzYOiGBnFSYRyV00iY8q7/0PThjIYav1p9h5dmKs=
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/kardianos/osext v0.0.0-20150410034420-8fef92e41e22 h1:eLCQd4nxsC7sumkwNg4OiB6bGiD7I5l1MSfBAxmxkKQ=
-github.com/kardianos/osext v0.0.0-20150410034420-8fef92e41e22/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
github.com/karrick/godirwalk v1.7.5 h1:VbzFqwXwNbAZoA6W5odrLr+hKK197CcENcPh6E/gJ0M=
github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34=
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
diff -uPNr kubernetes-1.15.0/pkg/cloudprovider/providers/cloudstack/BUILD kubernetes-1.15.0.new/pkg/cloudprovider/providers/cloudstack/BUILD
--- kubernetes-1.15.0/pkg/cloudprovider/providers/cloudstack/BUILD 2019-06-14 20:58:09.000000000 -0400
+++ kubernetes-1.15.0.new/pkg/cloudprovider/providers/cloudstack/BUILD 2019-07-13 05:18:57.277404164 -0400
@@ -22,7 +22,6 @@
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/cloud-provider:go_default_library",
"//vendor/github.com/d2g/dhcp4:go_default_library",
- "//vendor/github.com/kardianos/osext:go_default_library",
"//vendor/github.com/xanzy/go-cloudstack/cloudstack:go_default_library",
"//vendor/gopkg.in/gcfg.v1:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
diff -uPNr kubernetes-1.15.0/pkg/cloudprovider/providers/cloudstack/cloudstack.go kubernetes-1.15.0.new/pkg/cloudprovider/providers/cloudstack/cloudstack.go
--- kubernetes-1.15.0/pkg/cloudprovider/providers/cloudstack/cloudstack.go 2019-06-14 20:58:09.000000000 -0400
+++ kubernetes-1.15.0.new/pkg/cloudprovider/providers/cloudstack/cloudstack.go 2019-07-13 05:19:02.486365373 -0400
@@ -24,7 +24,6 @@
"os"
"path/filepath"
- "github.com/kardianos/osext"
"github.com/xanzy/go-cloudstack/cloudstack"
"gopkg.in/gcfg.v1"
"k8s.io/apimachinery/pkg/types"
@@ -87,7 +86,7 @@
zone: cfg.Global.Zone,
}
- exe, err := osext.Executable()
+ exe, err := os.Executable()
if err != nil {
return nil, fmt.Errorf("cloud not find the service executable: %v", err)
}
diff -uPNr kubernetes-1.15.0/test/e2e_node/BUILD kubernetes-1.15.0.new/test/e2e_node/BUILD
--- kubernetes-1.15.0/test/e2e_node/BUILD 2019-06-14 20:58:09.000000000 -0400
+++ kubernetes-1.15.0.new/test/e2e_node/BUILD 2019-07-13 05:18:39.417537161 -0400
@@ -190,7 +190,6 @@
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/yaml:go_default_library",
"//staging/src/k8s.io/client-go/tools/cache: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",
diff -uPNr kubernetes-1.15.0/test/e2e_node/e2e_node_suite_test.go kubernetes-1.15.0.new/test/e2e_node/e2e_node_suite_test.go
--- kubernetes-1.15.0/test/e2e_node/e2e_node_suite_test.go 2019-06-14 20:58:09.000000000 -0400
+++ kubernetes-1.15.0.new/test/e2e_node/e2e_node_suite_test.go 2019-07-13 05:18:45.598491134 -0400
@@ -43,7 +43,6 @@
"k8s.io/kubernetes/test/e2e/framework"
"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"
@@ -193,7 +192,7 @@
// 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)
}
diff -uPNr kubernetes-1.15.0/test/e2e_node/services/BUILD kubernetes-1.15.0.new/test/e2e_node/services/BUILD
--- kubernetes-1.15.0/test/e2e_node/services/BUILD 2019-06-14 20:58:09.000000000 -0400
+++ kubernetes-1.15.0.new/test/e2e_node/services/BUILD 2019-07-13 05:18:54.732423116 -0400
@@ -40,7 +40,6 @@
"//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",
],
diff -uPNr kubernetes-1.15.0/test/e2e_node/services/services.go kubernetes-1.15.0.new/test/e2e_node/services/services.go
--- kubernetes-1.15.0/test/e2e_node/services/services.go 2019-06-14 20:58:09.000000000 -0400
+++ kubernetes-1.15.0.new/test/e2e_node/services/services.go 2019-07-13 05:18:51.094450205 -0400
@@ -24,7 +24,6 @@
"path"
"testing"
- "github.com/kardianos/osext"
"k8s.io/klog"
utilfeature "k8s.io/apiserver/pkg/util/feature"
@@ -127,7 +126,7 @@
// 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)
}