Merge pull request #90019 from liggitt/json-raw-1.18

Manual cherry pick of #89833: preserve integers decoding raw JSON values

Kubernetes-commit: 1533a3d87f7c750263b07a426d47573e41bfd0d8
This commit is contained in:
Kubernetes Publisher 2020-04-29 03:36:24 -07:00
parent 1bcabdb7bb
commit 402682f45e
3 changed files with 17 additions and 14 deletions

10
Godeps/Godeps.json generated
View File

@ -348,19 +348,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "3b4a996260a0"
"Rev": "1b2a9461f0df"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "105e0c6d63f1"
"Rev": "6f2abe07e083"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "dc8515ba9674"
"Rev": "7b592a8174df"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "c3277d42784b"
"Rev": "67238afd2e27"
},
{
"ImportPath": "k8s.io/gengo",
@ -372,7 +372,7 @@
},
{
"ImportPath": "k8s.io/kube-openapi",
"Rev": "bf4fb3bd569c"
"Rev": "61e04a5be9a6"
},
{
"ImportPath": "k8s.io/utils",

17
go.mod
View File

@ -5,19 +5,18 @@ module k8s.io/sample-controller
go 1.13
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/api v0.0.0-20200429122142-1b2a9461f0df
k8s.io/apimachinery v0.0.0-20200429121720-6f2abe07e083
k8s.io/client-go v0.0.0-20200429122812-7b592a8174df
k8s.io/code-generator v0.0.0-20200429121245-67238afd2e27
k8s.io/klog v1.0.0
)
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
k8s.io/api => k8s.io/api v0.0.0-20200429122142-1b2a9461f0df
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200429121720-6f2abe07e083
k8s.io/client-go => k8s.io/client-go v0.0.0-20200429122812-7b592a8174df
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200429121245-67238afd2e27
)

4
go.sum
View File

@ -195,6 +195,10 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20200429122142-1b2a9461f0df/go.mod h1:3IQXHrU8AKFBlRNkA7Gg5ohimIUFCMZKj1udLSrDY6g=
k8s.io/apimachinery v0.0.0-20200429121720-6f2abe07e083/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
k8s.io/client-go v0.0.0-20200429122812-7b592a8174df/go.mod h1:P5cfN/46mnym6wCXqmy/v1g2Bo4VEJG08dMhea1Mz60=
k8s.io/code-generator v0.0.0-20200429121245-67238afd2e27/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=