kubernetes
/
kube-controller-manager
mirror of https://github.com/kubernetes/kube-controller-manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Kubernetes Publisher 2020-04-28 14:58:24 -07:00
parent 1bf01f5d4f
commit 098e82d8f1
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Godeps/Godeps.json generated
View File

@ -376,19 +376,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/component-base",
"Rev": "bff703ecca66"
"Rev": "f49ada33f0e4"
},
{
"ImportPath": "k8s.io/gengo",
@ -400,7 +400,7 @@
},
{
"ImportPath": "k8s.io/kube-openapi",
"Rev": "743ec37842bf"
"Rev": "594e756bea31"
},
{
"ImportPath": "k8s.io/utils",

13
go.mod
View File

@ -5,15 +5,14 @@ module k8s.io/kube-controller-manager
go 1.12
require (
k8s.io/apimachinery v0.0.0
k8s.io/component-base v0.0.0
k8s.io/apimachinery v0.0.0-20200429001640-17ad11ffb845
k8s.io/component-base v0.0.0-20200429004915-f49ada33f0e4
)
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/component-base => ../component-base
k8s.io/kube-controller-manager => ../kube-controller-manager
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/component-base => k8s.io/component-base v0.0.0-20200429004915-f49ada33f0e4
)

4
go.sum
View File

@ -169,6 +169,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/component-base v0.0.0-20200429004915-f49ada33f0e4/go.mod h1:1mYRnATsoLTfCHZ8AYtGqfXZUN31cnM+00m5+Db5jJo=
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=