Bumping k8s dependencies to 1.13

vendor/golang.org/x/tools/godoc/vfs/os.go

@@ -14,6 +14,14 @@ import (
 	"runtime"
 )
 
+// We expose a new variable because otherwise we need to copy the findGOROOT logic again
+// from cmd/godoc which is already copied twice from the standard library.
+
+// GOROOT is the GOROOT path under which the godoc binary is running.
+// It is needed to check whether a filesystem root is under GOROOT or not.
+// This is set from cmd/godoc/main.go.
+var GOROOT = runtime.GOROOT()
+
 // OS returns an implementation of FileSystem reading from the
 // tree rooted at root.  Recording a root is convenient everywhere
 // but necessary on Windows, because the slash-separated path
@@ -22,7 +30,7 @@ import (
 func OS(root string) FileSystem {
 	var t RootType
 	switch {
-	case root == runtime.GOROOT():
+	case root == GOROOT:
 		t = RootTypeGoRoot
 	case isGoPath(root):
 		t = RootTypeGoPath

vendor/golang.org/x/tools/godoc/vfs/zipfs/zipfs.go

@@ -25,7 +25,6 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"runtime"
 	"sort"
 	"strings"
 	"time"
@@ -87,7 +86,7 @@ func (fs *zipFS) String() string {
 func (fs *zipFS) RootType(abspath string) vfs.RootType {
 	var t vfs.RootType
 	switch {
-	case abspath == runtime.GOROOT():
+	case exists(path.Join(vfs.GOROOT, abspath)):
 		t = vfs.RootTypeGoRoot
 	case isGoPath(abspath):
 		t = vfs.RootTypeGoPath
@@ -95,15 +94,20 @@ func (fs *zipFS) RootType(abspath string) vfs.RootType {
 	return t
 }
 
-func isGoPath(path string) bool {
+func isGoPath(abspath string) bool {
 	for _, p := range filepath.SplitList(build.Default.GOPATH) {
-		if p == path {
+		if exists(path.Join(p, abspath)) {
 			return true
 		}
 	}
 	return false
 }
 
+func exists(path string) bool {
+	_, err := os.Stat(path)
+	return err == nil
+}
+
 func (fs *zipFS) Close() error {
 	fs.list = nil
 	return fs.ReadCloser.Close()

vendor/golang.org/x/tools/godoc/vfs/zipfs/zipfs_test.go

@@ -187,3 +187,20 @@ func TestZipFSOpenSeek(t *testing.T) {
 		}
 	}
 }
+
+func TestRootType(t *testing.T) {
+	tests := []struct {
+		path   string
+		fsType vfs.RootType
+	}{
+		{"/src/net/http", vfs.RootTypeGoRoot},
+		{"/src/badpath", ""},
+		{"/", vfs.RootTypeGoRoot},
+	}
+
+	for _, item := range tests {
+		if fs.RootType(item.path) != item.fsType {
+			t.Errorf("unexpected fsType. Expected- %v, Got- %v", item.fsType, fs.RootType(item.path))
+		}
+	}
+}