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 #81096 from roycaihw/update-vendor-json-iterator 

Update github.com/json-iterator/go dependency to fix emtpy byte marshaling

Kubernetes-commit: 3030a9d92750173ed72ea9cd37286bf6a41c2dcb
This commit is contained in:
Kubernetes Publisher 2019-08-08 08:00:13 -07:00
parent a3cf46610c
commit 961fb782a0
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Godeps/Godeps.json generated
View File

@ -108,7 +108,7 @@
},
{
"ImportPath": "github.com/json-iterator/go",
"Rev": "v1.1.6"
"Rev": "v1.1.7"
},
{
"ImportPath": "github.com/kisielk/errcheck",
@ -240,11 +240,11 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "162a2dabc72f"
"Rev": "ac5d3b819fc6"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "ddf6c23a6db8"
"Rev": "fceb63aacf50"
},
{
"ImportPath": "k8s.io/gengo",

9
go.mod
View File

@ -5,8 +5,8 @@ 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-20190808180622-ac5d3b819fc6
k8s.io/component-base v0.0.0-20190808181427-fceb63aacf50
)
replace (
@ -15,7 +15,6 @@ replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
k8s.io/apimachinery => ../apimachinery
k8s.io/component-base => ../component-base
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190808180622-ac5d3b819fc6
k8s.io/component-base => k8s.io/component-base v0.0.0-20190808181427-fceb63aacf50
)

2
go.sum
View File

@ -92,6 +92,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/apimachinery v0.0.0-20190808180622-ac5d3b819fc6/go.mod h1:Waf/xTS2FGRrgXCkO5FP3XxTOWh0qLf2QhL1qFZZ/R8=
k8s.io/component-base v0.0.0-20190808181427-fceb63aacf50/go.mod h1:rfisMcUeH5D2kny5e9iFct7ba40In1eyw3FzwbY//7k=
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=