mirror of
https://github.com/kubernetes/sample-controller.git
synced 2025-03-31 19:58:45 +08:00
Merge pull request #90022 from liggitt/json-raw-1.16
Manual cherry pick of #89833: preserve integers decoding raw JSON values Kubernetes-commit: 4d8caa7d476ae12f362b031efd765d9d282d337e
This commit is contained in:
parent
d0d113a406
commit
99fcc3b064
10
Godeps/Godeps.json
generated
10
Godeps/Godeps.json
generated
@ -372,19 +372,19 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api",
|
||||
"Rev": "d64dbec685a4"
|
||||
"Rev": "34b661834646"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery",
|
||||
"Rev": "0c9ec93240c9"
|
||||
"Rev": "17ad11ffb845"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go",
|
||||
"Rev": "e3bfc0127563"
|
||||
"Rev": "b063729e49a6"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/code-generator",
|
||||
"Rev": "a3045e5e55c0"
|
||||
"Rev": "f5af5c5facff"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/gengo",
|
||||
@ -396,7 +396,7 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/kube-openapi",
|
||||
"Rev": "743ec37842bf"
|
||||
"Rev": "594e756bea31"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/utils",
|
||||
|
17
go.mod
17
go.mod
@ -5,18 +5,17 @@ module k8s.io/sample-controller
|
||||
go 1.12
|
||||
|
||||
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-20200429002227-34b661834646
|
||||
k8s.io/apimachinery v0.0.0-20200429001640-17ad11ffb845
|
||||
k8s.io/client-go v0.0.0-20200429002950-b063729e49a6
|
||||
k8s.io/code-generator v0.0.0-20200429001146-f5af5c5facff
|
||||
k8s.io/klog v1.0.0
|
||||
)
|
||||
|
||||
replace (
|
||||
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7
|
||||
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-20200429002227-34b661834646
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200429001640-17ad11ffb845
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20200429002950-b063729e49a6
|
||||
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200429001146-f5af5c5facff
|
||||
)
|
||||
|
4
go.sum
4
go.sum
@ -222,6 +222,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-20200429002227-34b661834646/go.mod h1:lD5MwhoIjefII061ohRW4/FzcKWtgadwK9Rog990YpQ=
|
||||
k8s.io/apimachinery v0.0.0-20200429001640-17ad11ffb845/go.mod h1:4HMHS3mDHtVttspuuhrJ1GGr/0S9B6iWYWZ57KnnZqQ=
|
||||
k8s.io/client-go v0.0.0-20200429002950-b063729e49a6/go.mod h1:1O4GO22PieeoMNkCxYUqWx9ciO9MnvxsOLGhR4c+Zqk=
|
||||
k8s.io/code-generator v0.0.0-20200429001146-f5af5c5facff/go.mod h1:J2H4yLa80/c3JcoMtjfRQ/cqZNWeJnNhrCtedYrPJ+k=
|
||||
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
|
||||
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
|
||||
k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKOxmGeKRbsXVmqYM=
|
||||
|
Loading…
x
Reference in New Issue
Block a user