Merge pull request #80123 from sttts/sttts-bump-kube-openapi2

Bump kube-openapi and structured-merge-diff

Kubernetes-commit: eee3a3749add92cd67b4c6f80567cd438a6c24e6
This commit is contained in:
Kubernetes Publisher 2019-07-16 17:37:12 -07:00
parent ebdae1d528
commit b8c54d218c
3 changed files with 61 additions and 8 deletions

58
Godeps/Godeps.json generated
View File

@ -6,6 +6,18 @@
"./..."
],
"Deps": [
{
"ImportPath": "github.com/NYTimes/gziphandler",
"Rev": "56545f4a5d46"
},
{
"ImportPath": "github.com/PuerkitoBio/purell",
"Rev": "v1.0.0"
},
{
"ImportPath": "github.com/PuerkitoBio/urlesc",
"Rev": "5bd2802263f2"
},
{
"ImportPath": "github.com/beorn7/perks",
"Rev": "3a771d992973"
@ -26,6 +38,10 @@
"ImportPath": "github.com/elazarl/goproxy",
"Rev": "c4fc26588b6e"
},
{
"ImportPath": "github.com/emicklei/go-restful",
"Rev": "ff4f55a20633"
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "v4.2.0"
@ -34,6 +50,26 @@
"ImportPath": "github.com/fsnotify/fsnotify",
"Rev": "v1.4.7"
},
{
"ImportPath": "github.com/ghodss/yaml",
"Rev": "73d445a93680"
},
{
"ImportPath": "github.com/go-openapi/jsonpointer",
"Rev": "46af16f9f7b1"
},
{
"ImportPath": "github.com/go-openapi/jsonreference",
"Rev": "13c6e3589ad9"
},
{
"ImportPath": "github.com/go-openapi/spec",
"Rev": "6aced65f8501"
},
{
"ImportPath": "github.com/go-openapi/swag",
"Rev": "1d0bd113de87"
},
{
"ImportPath": "github.com/gogo/protobuf",
"Rev": "v1.0.0"
@ -86,6 +122,10 @@
"ImportPath": "github.com/kr/text",
"Rev": "v0.1.0"
},
{
"ImportPath": "github.com/mailru/easyjson",
"Rev": "d5b7844b561a"
},
{
"ImportPath": "github.com/matttproud/golang_protobuf_extensions",
"Rev": "v1.0.1"
@ -98,6 +138,10 @@
"ImportPath": "github.com/modern-go/reflect2",
"Rev": "v1.0.1"
},
{
"ImportPath": "github.com/munnerz/goautoneg",
"Rev": "a547fc61f48d"
},
{
"ImportPath": "github.com/mxk/go-flowrate",
"Rev": "cca7078d478f"
@ -188,11 +232,15 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "7bf792636534"
"Rev": "0bb8574e0887"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "4ad84870f76c"
"Rev": "b4f50308a616"
},
{
"ImportPath": "k8s.io/gengo",
"Rev": "0689ccc1d7d6"
},
{
"ImportPath": "k8s.io/klog",
@ -200,12 +248,16 @@
},
{
"ImportPath": "k8s.io/kube-openapi",
"Rev": "b3a7cee44a30"
"Rev": "33be087ad058"
},
{
"ImportPath": "k8s.io/utils",
"Rev": "c55fbcfc754a"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff",
"Rev": "15d366b2352e"
},
{
"ImportPath": "sigs.k8s.io/yaml",
"Rev": "v1.1.0"

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-20190717022731-0bb8574e0887
k8s.io/component-base v0.0.0-20190717023551-b4f50308a616
)
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-20190717022731-0bb8574e0887
k8s.io/component-base => k8s.io/component-base v0.0.0-20190717023551-b4f50308a616
)

2
go.sum
View File

@ -88,6 +88,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-20190717022731-0bb8574e0887/go.mod h1:sBJWIJZfxLhp7mRsRyuAE/NfKTr3kXGR1iaqg8O0gJo=
k8s.io/component-base v0.0.0-20190717023551-b4f50308a616/go.mod h1:rmsv93RgoeVNzVrQzry5PiCqJozaaNBavTs3Z6NxeMM=
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=