From d8894676ccf0e7742de23afe5a8d3c1202ccbcd1 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 29 Jan 2021 08:09:40 -0800 Subject: [PATCH] Merge pull request #98565 from adisky/move-spdystream Move dependency docker/spdystream to moby/spdystream Kubernetes-commit: 64a6ee4321d37740b84a5c5c7aaa67e0bf6b6508 --- Godeps/Godeps.json | 24 ++++++++++++------------ go.mod | 31 +++++++++++++++---------------- go.sum | 8 ++++++++ 3 files changed, 35 insertions(+), 28 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 5643a30dc..3e3b8bea8 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -210,10 +210,6 @@ "ImportPath": "github.com/docker/distribution", "Rev": "v2.7.1" }, - { - "ImportPath": "github.com/docker/spdystream", - "Rev": "449fdfce4d96" - }, { "ImportPath": "github.com/docopt/docopt-go", "Rev": "ee0de3bc6815" @@ -594,6 +590,10 @@ "ImportPath": "github.com/mitchellh/mapstructure", "Rev": "v1.1.2" }, + { + "ImportPath": "github.com/moby/spdystream", + "Rev": "v0.2.0" + }, { "ImportPath": "github.com/moby/term", "Rev": "672ec06f55cd" @@ -924,31 +924,31 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "0d6bea24dc49" + "Rev": "cfb031d9922e" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "ee96543cc673" + "Rev": "d656fe577b19" }, { "ImportPath": "k8s.io/cli-runtime", - "Rev": "3659b9895efa" + "Rev": "4a1e813a5738" }, { "ImportPath": "k8s.io/client-go", - "Rev": "b72204b2445d" + "Rev": "c8e0107904fe" }, { "ImportPath": "k8s.io/code-generator", - "Rev": "468be548890f" + "Rev": "062b17e0c65f" }, { "ImportPath": "k8s.io/component-base", - "Rev": "6b412b2ef0d8" + "Rev": "090761b6f2fb" }, { "ImportPath": "k8s.io/component-helpers", - "Rev": "f2e8fa560240" + "Rev": "daf7e8a321eb" }, { "ImportPath": "k8s.io/gengo", @@ -964,7 +964,7 @@ }, { "ImportPath": "k8s.io/metrics", - "Rev": "08fd6e46d1e4" + "Rev": "f74e2b7a539e" }, { "ImportPath": "k8s.io/utils", diff --git a/go.mod b/go.mod index c6cb8bd43..570843d28 100644 --- a/go.mod +++ b/go.mod @@ -34,28 +34,27 @@ require ( github.com/stretchr/testify v1.6.1 golang.org/x/sys v0.0.0-20201112073958-5cba982894dd gopkg.in/yaml.v2 v2.2.8 - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/cli-runtime v0.0.0 - k8s.io/client-go v0.0.0 - k8s.io/component-base v0.0.0 - k8s.io/component-helpers v0.0.0 + k8s.io/api v0.0.0-20210129201028-cfb031d9922e + k8s.io/apimachinery v0.0.0-20210129200846-d656fe577b19 + k8s.io/cli-runtime v0.0.0-20210129203039-4a1e813a5738 + k8s.io/client-go v0.0.0-20210129201247-c8e0107904fe + k8s.io/component-base v0.0.0-20210129201716-090761b6f2fb + k8s.io/component-helpers v0.0.0-20210129201817-daf7e8a321eb k8s.io/klog/v2 v2.4.0 k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd - k8s.io/metrics v0.0.0 + k8s.io/metrics v0.0.0-20210129202932-f74e2b7a539e k8s.io/utils v0.0.0-20201110183641-67b214c5f920 sigs.k8s.io/kustomize v2.0.3+incompatible sigs.k8s.io/yaml v1.2.0 ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/cli-runtime => ../cli-runtime - k8s.io/client-go => ../client-go - k8s.io/code-generator => ../code-generator - k8s.io/component-base => ../component-base - k8s.io/component-helpers => ../component-helpers - k8s.io/kubectl => ../kubectl - k8s.io/metrics => ../metrics + k8s.io/api => k8s.io/api v0.0.0-20210129201028-cfb031d9922e + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210129200846-d656fe577b19 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210129203039-4a1e813a5738 + k8s.io/client-go => k8s.io/client-go v0.0.0-20210129201247-c8e0107904fe + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210129160940-062b17e0c65f + k8s.io/component-base => k8s.io/component-base v0.0.0-20210129201716-090761b6f2fb + k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210129201817-daf7e8a321eb + k8s.io/metrics => k8s.io/metrics v0.0.0-20210129202932-f74e2b7a539e ) diff --git a/go.sum b/go.sum index 1bff2718b..0019139cb 100644 --- a/go.sum +++ b/go.sum @@ -632,6 +632,13 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +k8s.io/api v0.0.0-20210129201028-cfb031d9922e/go.mod h1:53ABT5N3hbUIrqvj8AtqG/pdaa+rfxmCsKQ2aRBQ4ZU= +k8s.io/apimachinery v0.0.0-20210129200846-d656fe577b19/go.mod h1:Zn8td2uhRkPcF1lQatcpuW4aZakbEeCk1Zz0TKhD3zQ= +k8s.io/cli-runtime v0.0.0-20210129203039-4a1e813a5738/go.mod h1:TSrRF+D7BzYYA7PYRsLouDaRRkkXsjgerc4hFWTvMP8= +k8s.io/client-go v0.0.0-20210129201247-c8e0107904fe/go.mod h1:qptrXnBIECLVceUzdc+pr0sppAlf+G0kKxYEcOROS0o= +k8s.io/code-generator v0.0.0-20210129160940-062b17e0c65f/go.mod h1:4n8UGwhxQWSnXnDBVEtX8cKaE/oMp1ui3M7yFmjT1fo= +k8s.io/component-base v0.0.0-20210129201716-090761b6f2fb/go.mod h1:zCJsv7PRwbJGJ9/R0dUiIa/m6rA9AWiquiM2VGykxSI= +k8s.io/component-helpers v0.0.0-20210129201817-daf7e8a321eb/go.mod h1:MWFZUop8TORbxdhxjUyvRPdRJ+/sHYTXTv+mymXlGGI= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= @@ -640,6 +647,7 @@ k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= +k8s.io/metrics v0.0.0-20210129202932-f74e2b7a539e/go.mod h1:r8Zz9M+C/hKUqXYHuEdgTgbBi2R2maUUC5jBapntmhc= k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=