Skip to content
Permalink
Browse files

Merge pull request #81546 from cblecker/1.13/go-1.11.13

Update golang/x/net dependency on release-1.13
  • Loading branch information...
k8s-ci-robot committed Aug 17, 2019
2 parents 52d3945 + e795732 commit 37d169313237cb4ceb2cc4bef300f2ae3053c1a2
Showing with 5,317 additions and 3,408 deletions.
  1. +29 −14 Godeps/Godeps.json
  2. +107 −2 Godeps/LICENSES
  3. +16 −2 hack/godep-save.sh
  4. +7 −7 staging/src/k8s.io/api/Godeps/Godeps.json
  5. +11 −11 staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json
  6. +10 −10 staging/src/k8s.io/apimachinery/Godeps/Godeps.json
  7. +11 −11 staging/src/k8s.io/apiserver/Godeps/Godeps.json
  8. +8 −8 staging/src/k8s.io/cli-runtime/Godeps/Godeps.json
  9. +9 −9 staging/src/k8s.io/client-go/Godeps/Godeps.json
  10. +8 −8 staging/src/k8s.io/cloud-provider/Godeps/Godeps.json
  11. +7 −7 staging/src/k8s.io/cluster-bootstrap/Godeps/Godeps.json
  12. +8 −8 staging/src/k8s.io/csi-api/Godeps/Godeps.json
  13. +13 −13 staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json
  14. +7 −7 staging/src/k8s.io/kube-controller-manager/Godeps/Godeps.json
  15. +7 −7 staging/src/k8s.io/kube-proxy/Godeps/Godeps.json
  16. +7 −7 staging/src/k8s.io/kube-scheduler/Godeps/Godeps.json
  17. +7 −7 staging/src/k8s.io/kubelet/Godeps/Godeps.json
  18. +8 −8 staging/src/k8s.io/metrics/Godeps/Godeps.json
  19. +11 −11 staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json
  20. +8 −8 staging/src/k8s.io/sample-cli-plugin/Godeps/Godeps.json
  21. +8 −8 staging/src/k8s.io/sample-controller/Godeps/Godeps.json
  22. +13 −0 third_party/forked/godep/pkg.go
  23. +2 −1 third_party/forked/godep/save.go
  24. +4 −1 vendor/BUILD
  25. +4 −1 vendor/golang.org/x/net/html/atom/gen.go
  26. +725 −719 vendor/golang.org/x/net/html/atom/table.go
  27. +1 −1 vendor/golang.org/x/net/html/const.go
  28. +2,077 −2,077 vendor/golang.org/x/net/html/entity.go
  29. +3 −3 vendor/golang.org/x/net/html/foreign.go
  30. +30 −3 vendor/golang.org/x/net/html/node.go
  31. +290 −77 vendor/golang.org/x/net/html/parse.go
  32. +6 −3 vendor/golang.org/x/net/{lex/httplex → http/httpguts}/BUILD
  33. +50 −0 vendor/golang.org/x/net/http/httpguts/guts.go
  34. +1 −6 vendor/golang.org/x/net/{lex/httplex → http/httpguts}/httplex.go
  35. +3 −1 vendor/golang.org/x/net/http2/BUILD
  36. +27 −1 vendor/golang.org/x/net/http2/client_conn_pool.go
  37. +5 −3 vendor/golang.org/x/net/http2/configure_transport.go
  38. +5 −5 vendor/golang.org/x/net/http2/flow.go
  39. +51 −16 vendor/golang.org/x/net/http2/frame.go
  40. +26 −0 vendor/golang.org/x/net/http2/go111.go
  41. +15 −0 vendor/golang.org/x/net/http2/go17.go
  42. +1 −1 vendor/golang.org/x/net/http2/hpack/encode.go
  43. +6 −0 vendor/golang.org/x/net/http2/hpack/hpack.go
  44. +15 −5 vendor/golang.org/x/net/http2/hpack/huffman.go
  45. +4 −4 vendor/golang.org/x/net/http2/http2.go
  46. +17 −0 vendor/golang.org/x/net/http2/not_go111.go
  47. +8 −0 vendor/golang.org/x/net/http2/not_go17.go
  48. +81 −50 vendor/golang.org/x/net/http2/server.go
  49. +190 −38 vendor/golang.org/x/net/http2/transport.go
  50. +2 −2 vendor/golang.org/x/net/http2/write.go
  51. +7 −1 vendor/golang.org/x/net/http2/writesched.go
  52. +33 −0 vendor/golang.org/x/net/internal/nettest/BUILD
  53. +53 −0 vendor/golang.org/x/net/internal/nettest/helper_bsd.go
  54. +15 −0 vendor/golang.org/x/net/internal/nettest/helper_nobsd.go
  55. +31 −0 vendor/golang.org/x/net/internal/nettest/helper_posix.go
  56. +32 −0 vendor/golang.org/x/net/internal/nettest/helper_stub.go
  57. +29 −0 vendor/golang.org/x/net/internal/nettest/helper_unix.go
  58. +42 −0 vendor/golang.org/x/net/internal/nettest/helper_windows.go
  59. +94 −0 vendor/golang.org/x/net/internal/nettest/interface.go
  60. +11 −0 vendor/golang.org/x/net/internal/nettest/rlimit.go
  61. +152 −0 vendor/golang.org/x/net/internal/nettest/stack.go
  62. +26 −0 vendor/golang.org/x/net/internal/socks/BUILD
  63. +168 −0 vendor/golang.org/x/net/internal/socks/client.go
  64. +316 −0 vendor/golang.org/x/net/internal/socks/socks.go
  65. +27 −0 vendor/golang.org/x/net/internal/sockstest/BUILD
  66. +241 −0 vendor/golang.org/x/net/internal/sockstest/server.go
  67. +1 −0 vendor/golang.org/x/net/proxy/BUILD
  68. +19 −197 vendor/golang.org/x/net/proxy/socks5.go
  69. +48 −19 vendor/golang.org/x/net/trace/trace.go
  70. +3 −0 vendor/golang.org/x/net/websocket/websocket.go

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

@@ -52,9 +52,23 @@ if [[ -d Godeps ]]; then
mv Godeps "${BACKUP}/Godeps"
fi

## Workaround "httplex" was dropped from golang.org/x/net repo and the code
## was moved to the "golang.org/x/net/http/httpguts" directory, we do not use
## this directly, however many packages we vendor are still using the older
## golang.org/x/net and we need to keep this until all those dependencies
## are switched to newer golang.org/x/net.
IGNORED_PACKAGES=(
"golang.org/x/net/lex/httplex"
)
REQUIRED_BINS=(
"golang.org/x/net/internal/nettest"
"golang.org/x/net/internal/socks"
"golang.org/x/net/internal/sockstest"
)

# Some things we want in godeps aren't code dependencies, so ./...
# won't pick them up.
REQUIRED_BINS=(
REQUIRED_BINS+=(
"github.com/onsi/ginkgo/ginkgo"
"github.com/jteeuwen/go-bindata/go-bindata"
"github.com/client9/misspell/cmd/misspell"
@@ -71,7 +85,7 @@ kube::log::status "Running godep save - this might take a while"
# This uses $(pwd) rather than ${KUBE_ROOT} because KUBE_ROOT will be
# realpath'ed, and godep barfs ("... is not using a known version control
# system") on our staging dirs.
GOPATH="${GOPATH}:$(pwd)/staging" ${KUBE_GODEP:?} save "${REQUIRED_BINS[@]}"
GOPATH="${GOPATH}:$(pwd)/staging" ${KUBE_GODEP:?} save -i $(IFS=,; echo "${IGNORED_PACKAGES[*]}") "${REQUIRED_BINS[@]}"

# create a symlink in vendor directory pointing to the staging client. This
# let other packages use the staging client as if it were vendored.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

0 comments on commit 37d1693

Please sign in to comment.
You can’t perform that action at this time.