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 81d0042a66
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": "59e77acf588f"
"Rev": "6d4d1612ba53"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "c18f71bf2947"
"Rev": "dffb012825f2"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "f8f007fd456c"
"Rev": "3c0d1af94be5"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "4b9966ca0181"
"Rev": "7fd2da093d6d"
},
{
"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-20191108065633-c18f71bf2947
k8s.io/component-base v0.0.0-20191108070619-4b9966ca0181
k8s.io/apimachinery v0.0.0-20191109100837-dffb012825f2
k8s.io/component-base v0.0.0-20191109103431-7fd2da093d6d
)
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-20191108065827-59e77acf588f
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191108065633-c18f71bf2947
k8s.io/client-go => k8s.io/client-go v0.0.0-20191108070106-f8f007fd456c
k8s.io/component-base => k8s.io/component-base v0.0.0-20191108070619-4b9966ca0181
k8s.io/api => k8s.io/api v0.0.0-20191109101512-6d4d1612ba53
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191109100837-dffb012825f2
k8s.io/client-go => k8s.io/client-go v0.0.0-20191109102209-3c0d1af94be5
k8s.io/component-base => k8s.io/component-base v0.0.0-20191109103431-7fd2da093d6d
)

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-20191108065827-59e77acf588f/go.mod h1:uQDmBYHoPSuhbg8FGTRzrOdaNqLiws/LAtBrHv0kN5U=
k8s.io/apimachinery v0.0.0-20191108065633-c18f71bf2947/go.mod h1:nEP/6rwhzfljWYGVS6pfyES3ipZTR19vzMnSM+ur3ho=
k8s.io/client-go v0.0.0-20191108070106-f8f007fd456c/go.mod h1:D6hkzmLWI59QLvDVt8tlD5J2X1YDjcattS6vw8lP1hc=
k8s.io/component-base v0.0.0-20191108070619-4b9966ca0181/go.mod h1:OnLnQI0ti1wNBL+pCumQcG9Plt1S6L+lOXsQwQJ+m9g=
k8s.io/api v0.0.0-20191109101512-6d4d1612ba53/go.mod h1:VJq7+38rpM4TSUbRiZX4P5UVAKK2UQpNQLZClkFQkpE=
k8s.io/apimachinery v0.0.0-20191109100837-dffb012825f2/go.mod h1:+6CX7hP4aLfX2sb91JYDMIp0VqDSog2kZu0BHe+lP+s=
k8s.io/client-go v0.0.0-20191109102209-3c0d1af94be5/go.mod h1:T9KDMwZhkD0ygfa5hs6lPRymsuj92WN84SowSq6gOEw=
k8s.io/component-base v0.0.0-20191109103431-7fd2da093d6d/go.mod h1:F5XFkRVuP+kTNNRw9X/Z/aXnfSuzTJkQrG9u9R6YyFU=
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=