Merge pull request #84692 from smarterclayton/protocol_errors

Fix watch negotiation when using a non-default mime type in the client

Kubernetes-commit: c28921f248a8e6c923096154c6e87efcc188b9f0
This commit is contained in:
Kubernetes Publisher 2019-11-10 21:41:56 -08:00
parent 26a8fb1b92
commit 707298a79a
3 changed files with 12 additions and 12 deletions

6
Godeps/Godeps.json generated
View File

@ -580,15 +580,15 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "fee41ff082ed"
"Rev": "6eb29fdf75dc"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "3c0d1af94be5"
"Rev": "a56922badea0"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "7fd2da093d6d"
"Rev": "cca8f4f7ce4d"
},
{
"ImportPath": "k8s.io/gengo",

12
go.mod
View File

@ -43,9 +43,9 @@ require (
gopkg.in/yaml.v2 v2.2.4
gotest.tools v2.2.0+incompatible // indirect
k8s.io/api v0.0.0-20191109101513-0171b7c15da1
k8s.io/apimachinery v0.0.0-20191109100838-fee41ff082ed
k8s.io/client-go v0.0.0-20191109102209-3c0d1af94be5
k8s.io/component-base v0.0.0-20191109103431-7fd2da093d6d
k8s.io/apimachinery v0.0.0-20191111054156-6eb29fdf75dc
k8s.io/client-go v0.0.0-20191111061043-a56922badea0
k8s.io/component-base v0.0.0-20191111061729-cca8f4f7ce4d
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d
@ -57,7 +57,7 @@ replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7
k8s.io/api => k8s.io/api v0.0.0-20191109101513-0171b7c15da1
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191109100838-fee41ff082ed
k8s.io/client-go => k8s.io/client-go v0.0.0-20191109102209-3c0d1af94be5
k8s.io/component-base => k8s.io/component-base v0.0.0-20191109103431-7fd2da093d6d
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191111054156-6eb29fdf75dc
k8s.io/client-go => k8s.io/client-go v0.0.0-20191111061043-a56922badea0
k8s.io/component-base => k8s.io/component-base v0.0.0-20191111061729-cca8f4f7ce4d
)

6
go.sum
View File

@ -348,9 +348,9 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20191109101513-0171b7c15da1/go.mod h1:VJq7+38rpM4TSUbRiZX4P5UVAKK2UQpNQLZClkFQkpE=
k8s.io/apimachinery v0.0.0-20191109100838-fee41ff082ed/go.mod h1:+6CX7hP4aLfX2sb91JYDMIp0VqDSog2kZu0BHe+lP+s=
k8s.io/client-go v0.0.0-20191109102209-3c0d1af94be5/go.mod h1:T9KDMwZhkD0ygfa5hs6lPRymsuj92WN84SowSq6gOEw=
k8s.io/component-base v0.0.0-20191109103431-7fd2da093d6d/go.mod h1:F5XFkRVuP+kTNNRw9X/Z/aXnfSuzTJkQrG9u9R6YyFU=
k8s.io/apimachinery v0.0.0-20191111054156-6eb29fdf75dc/go.mod h1:+6CX7hP4aLfX2sb91JYDMIp0VqDSog2kZu0BHe+lP+s=
k8s.io/client-go v0.0.0-20191111061043-a56922badea0/go.mod h1:I3EBqGceFHRV0+y6lxQtW0sQ8acGeb0wGVbzOugq4Z8=
k8s.io/component-base v0.0.0-20191111061729-cca8f4f7ce4d/go.mod h1:hCGnNyhGnZljl2XmSocXO/ySLrgK5bpKAMqSFAFES/E=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=