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 #90020 from liggitt/json-raw-1.17 

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

Kubernetes-commit: 72f8a95ea4a373ad001f504d00def972918127a5
This commit is contained in:
Kubernetes Publisher 2020-04-28 10:16:06 -07:00
parent 60ee3b8e38
commit ca344ab32e
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

@ -424,19 +424,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "2a93acf49b83"
"Rev": "41c764546815"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "491fc9063aba"
"Rev": "891b87d7c4bb"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "9ffc32955335"
"Rev": "ad3bb8e4ccf1"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "2983c2d1a1f3"
"Rev": "74f34cc7fbf0"
},
{
"ImportPath": "k8s.io/gengo",
@ -448,7 +448,7 @@
},
{
"ImportPath": "k8s.io/kube-openapi",
"Rev": "82d701f24f9d"
"Rev": "bcb3869e6f29"
},
{
"ImportPath": "k8s.io/utils",

13
go.mod
View File

@ -5,16 +5,15 @@ 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-20200429001804-891b87d7c4bb
k8s.io/component-base v0.0.0-20200429005003-74f34cc7fbf0
)
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/component-base => ../component-base
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20200429002347-41c764546815
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200429001804-891b87d7c4bb
k8s.io/client-go => k8s.io/client-go v0.0.0-20200429003608-ad3bb8e4ccf1
k8s.io/component-base => k8s.io/component-base v0.0.0-20200429005003-74f34cc7fbf0
)

4
go.sum
View File

@ -182,6 +182,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-20200429002347-41c764546815/go.mod h1:dBYF1kkAf8aP+M9W6fXC8mpzak3JkUN+Mfe4miPZh0o=
k8s.io/apimachinery v0.0.0-20200429001804-891b87d7c4bb/go.mod h1:Lg8zZ5iC/O8UjCqW6DNhcQG2m4TdjF9kwG3891OWbbA=
k8s.io/client-go v0.0.0-20200429003608-ad3bb8e4ccf1/go.mod h1:r2c3DZGDAR84ATxF+9GCZp8ZnZSMLKDGg9fGYs7hqEU=
k8s.io/component-base v0.0.0-20200429005003-74f34cc7fbf0/go.mod h1:aviF1Sk6bHhvNB4eNdQxDi5ueAhPJ5c8kNnrJTGehFY=
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=