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 5335398820
commit 38d625004d
3 changed files with 34 additions and 15 deletions

28
Godeps/Godeps.json generated
View File

@ -18,6 +18,10 @@
"ImportPath": "github.com/BurntSushi/xgb",
"Rev": "27f122750802"
},
{
"ImportPath": "github.com/NYTimes/gziphandler",
"Rev": "56545f4a5d46"
},
{
"ImportPath": "github.com/PuerkitoBio/purell",
"Rev": "v1.1.1"
@ -54,6 +58,10 @@
"ImportPath": "github.com/fsnotify/fsnotify",
"Rev": "v1.4.7"
},
{
"ImportPath": "github.com/ghodss/yaml",
"Rev": "73d445a93680"
},
{
"ImportPath": "github.com/go-openapi/jsonpointer",
"Rev": "v0.19.2"
@ -150,6 +158,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"
@ -268,23 +280,23 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "31fe033ae6f9"
"Rev": "653c86b0609b"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "75ce4d1e60f1"
"Rev": "0bb8574e0887"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "611184f7c43a"
"Rev": "0c47f9da0001"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "93d7507fc8ff"
"Rev": "77f3a1fe56bb"
},
{
"ImportPath": "k8s.io/gengo",
"Rev": "f8a0810f38af"
"Rev": "0689ccc1d7d6"
},
{
"ImportPath": "k8s.io/klog",
@ -292,7 +304,7 @@
},
{
"ImportPath": "k8s.io/kube-openapi",
"Rev": "b3a7cee44a30"
"Rev": "33be087ad058"
},
{
"ImportPath": "k8s.io/utils",
@ -318,6 +330,10 @@
"ImportPath": "modernc.org/xc",
"Rev": "v1.0.0"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff",
"Rev": "15d366b2352e"
},
{
"ImportPath": "sigs.k8s.io/yaml",
"Rev": "v1.1.0"

17
go.mod
View File

@ -5,10 +5,10 @@ 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-20190717022910-653c86b0609b
k8s.io/apimachinery v0.0.0-20190717022731-0bb8574e0887
k8s.io/client-go v0.0.0-20190717023132-0c47f9da0001
k8s.io/code-generator v0.0.0-20190717022600-77f3a1fe56bb
k8s.io/klog v0.3.1
)
@ -19,9 +19,8 @@ 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/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-20190717022910-653c86b0609b
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190717022731-0bb8574e0887
k8s.io/client-go => k8s.io/client-go v0.0.0-20190717023132-0c47f9da0001
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190717022600-77f3a1fe56bb
)

4
go.sum
View File

@ -136,6 +136,10 @@ 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/api v0.0.0-20190717022910-653c86b0609b/go.mod h1:5UP0nKwb/iEVBSMrDGsFuoIlrOOjKvatkMrhuY0czQk=
k8s.io/apimachinery v0.0.0-20190717022731-0bb8574e0887/go.mod h1:sBJWIJZfxLhp7mRsRyuAE/NfKTr3kXGR1iaqg8O0gJo=
k8s.io/client-go v0.0.0-20190717023132-0c47f9da0001/go.mod h1:JvcLDbEoGrrziiUkPAV/sdE4llq5kUUrDdGtJ/RpAJQ=
k8s.io/code-generator v0.0.0-20190717022600-77f3a1fe56bb/go.mod h1:cDx5jQmWH25Ff74daM7NVYty9JWw9dvIS9zT9eIubCY=
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/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=