Merge pull request #83840 from liggitt/json-iter

bump json-iterator dependency

Kubernetes-commit: 3387d6cfc73235fd554e5039b85abb7700eaf126
This commit is contained in:
Kubernetes Publisher 2019-11-08 17:32:34 -08:00
commit 4ff3358ee1
3 changed files with 17 additions and 17 deletions

10
Godeps/Godeps.json generated
View File

@ -208,7 +208,7 @@
},
{
"ImportPath": "github.com/json-iterator/go",
"Rev": "v1.1.7"
"Rev": "v1.1.8"
},
{
"ImportPath": "github.com/jstemmer/go-junit-report",
@ -424,19 +424,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "5d8c3d1f60af"
"Rev": "06f53b4b24f6"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "4ce4ee60b177"
"Rev": "ff79dfe72cae"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "14c92e3dc9df"
"Rev": "fcde0a10c837"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "c33f463e4c98"
"Rev": "a195ff441f6e"
},
{
"ImportPath": "k8s.io/gengo",

12
go.mod
View File

@ -5,15 +5,15 @@ module k8s.io/kube-controller-manager
go 1.12
require (
k8s.io/apimachinery v0.0.0-20191108101507-4ce4ee60b177
k8s.io/component-base v0.0.0-20191108101507-c33f463e4c98
k8s.io/apimachinery v0.0.0-20191109155659-ff79dfe72cae
k8s.io/component-base v0.0.0-20191109155659-a195ff441f6e
)
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7
k8s.io/api => k8s.io/api v0.0.0-20191108101507-5d8c3d1f60af
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191108101507-4ce4ee60b177
k8s.io/client-go => k8s.io/client-go v0.0.0-20191108101507-14c92e3dc9df
k8s.io/component-base => k8s.io/component-base v0.0.0-20191108101507-c33f463e4c98
k8s.io/api => k8s.io/api v0.0.0-20191109155659-06f53b4b24f6
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191109155659-ff79dfe72cae
k8s.io/client-go => k8s.io/client-go v0.0.0-20191109155659-fcde0a10c837
k8s.io/component-base => k8s.io/component-base v0.0.0-20191109155659-a195ff441f6e
)

12
go.sum
View File

@ -69,8 +69,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo=
github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.8 h1:QiWkFLKq0T7mpzwOTu6BzNDbfTE8OLrYhVKYMLF46Ok=
github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
@ -186,10 +186,10 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
gopkg.in/yaml.v2 v2.2.4/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-20191108101507-5d8c3d1f60af/go.mod h1:imUKtxJrdH7sLzxnW0ep/MClaxwk3jqcQByiz2y/424=
k8s.io/apimachinery v0.0.0-20191108101507-4ce4ee60b177/go.mod h1:nEP/6rwhzfljWYGVS6pfyES3ipZTR19vzMnSM+ur3ho=
k8s.io/client-go v0.0.0-20191108101507-14c92e3dc9df/go.mod h1:knaO7yT/V921wXXOrewm9oJL9XmH/gYVirmbn2DjiG4=
k8s.io/component-base v0.0.0-20191108101507-c33f463e4c98/go.mod h1:du1btQewgKDFheIU0R65f7Xc5cvOZi5hxfs8/CJSEYg=
k8s.io/api v0.0.0-20191109155659-06f53b4b24f6/go.mod h1:vIkJ/W88qqsmwke+iDxmt9IJZKj9hb9gE0lg63KzphA=
k8s.io/apimachinery v0.0.0-20191109155659-ff79dfe72cae/go.mod h1:+6CX7hP4aLfX2sb91JYDMIp0VqDSog2kZu0BHe+lP+s=
k8s.io/client-go v0.0.0-20191109155659-fcde0a10c837/go.mod h1:dlBmDo0puNrkoXvixIOutlVJ+ukWbJSXmkKwF2UbQWE=
k8s.io/component-base v0.0.0-20191109155659-a195ff441f6e/go.mod h1:P81VeSClc7b/ja5Px/2gW9R2j2G/eHt7XeVykA7Vxt4=
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=