mirror of
https://github.com/kubernetes/sample-controller.git
synced 2025-03-31 19:58:45 +08:00
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:
parent
11d6f6b94b
commit
04a6536a6b
10
Godeps/Godeps.json
generated
10
Godeps/Godeps.json
generated
@ -372,19 +372,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/code-generator",
|
||||
"Rev": "f15a378f7704"
|
||||
"Rev": "c05f3fad9056"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/gengo",
|
||||
@ -396,7 +396,7 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/kube-openapi",
|
||||
"Rev": "82d701f24f9d"
|
||||
"Rev": "bcb3869e6f29"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/utils",
|
||||
|
17
go.mod
17
go.mod
@ -5,19 +5,18 @@ 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-20200429002347-41c764546815
|
||||
k8s.io/apimachinery v0.0.0-20200429001804-891b87d7c4bb
|
||||
k8s.io/client-go v0.0.0-20200429003608-ad3bb8e4ccf1
|
||||
k8s.io/code-generator v0.0.0-20200429001238-c05f3fad9056
|
||||
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-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/code-generator => k8s.io/code-generator v0.0.0-20200429001238-c05f3fad9056
|
||||
)
|
||||
|
4
go.sum
4
go.sum
@ -215,6 +215,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/code-generator v0.0.0-20200429001238-c05f3fad9056/go.mod h1:iiHz51+oTx+Z9D0vB3CH3O4HDDPWrvZyUgUYaIE9h9M=
|
||||
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