Merge pull request #79843 from sttts/sttts-sample-apiserver-openapi

apiserver: wire OpenAPI into sample-apiserver

Kubernetes-commit: 6cd0392ced5a14409c0dd074bdb8b9c33a433f06

Godeps/Godeps.json

@@ -18,6 +18,14 @@
 			"ImportPath": "github.com/BurntSushi/xgb",
 			"Rev": "27f122750802"
 		},
+		{
+			"ImportPath": "github.com/PuerkitoBio/purell",
+			"Rev": "v1.1.1"
+		},
+		{
+			"ImportPath": "github.com/PuerkitoBio/urlesc",
+			"Rev": "de5bf2ad4578"
+		},
 		{
 			"ImportPath": "github.com/davecgh/go-spew",
 			"Rev": "v1.1.1"
@@ -34,6 +42,10 @@
 			"ImportPath": "github.com/elazarl/goproxy",
 			"Rev": "c4fc26588b6e"
 		},
+		{
+			"ImportPath": "github.com/emicklei/go-restful",
+			"Rev": "v2.9.5"
+		},
 		{
 			"ImportPath": "github.com/evanphx/json-patch",
 			"Rev": "v4.2.0"
@@ -42,6 +54,22 @@
 			"ImportPath": "github.com/fsnotify/fsnotify",
 			"Rev": "v1.4.7"
 		},
+		{
+			"ImportPath": "github.com/go-openapi/jsonpointer",
+			"Rev": "v0.19.2"
+		},
+		{
+			"ImportPath": "github.com/go-openapi/jsonreference",
+			"Rev": "v0.19.2"
+		},
+		{
+			"ImportPath": "github.com/go-openapi/spec",
+			"Rev": "v0.19.2"
+		},
+		{
+			"ImportPath": "github.com/go-openapi/swag",
+			"Rev": "v0.19.2"
+		},
 		{
 			"ImportPath": "github.com/gogo/protobuf",
 			"Rev": "v1.0.0"
@@ -104,12 +132,16 @@
 		},
 		{
 			"ImportPath": "github.com/kr/pty",
-			"Rev": "v1.1.1"
+			"Rev": "v1.1.5"
 		},
 		{
 			"ImportPath": "github.com/kr/text",
 			"Rev": "v0.1.0"
 		},
+		{
+			"ImportPath": "github.com/mailru/easyjson",
+			"Rev": "94de47d64c63"
+		},
 		{
 			"ImportPath": "github.com/modern-go/concurrent",
 			"Rev": "bacd9c7ef1dd"
@@ -152,7 +184,7 @@
 		},
 		{
 			"ImportPath": "github.com/stretchr/objx",
-			"Rev": "v0.1.0"
+			"Rev": "v0.2.0"
 		},
 		{
 			"ImportPath": "github.com/stretchr/testify",
@@ -240,15 +272,15 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "391ed67afa7b"
+			"Rev": "75ce4d1e60f1"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "e8d4ff64b701"
+			"Rev": "611184f7c43a"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "bc18bbf3b8f3"
+			"Rev": "93d7507fc8ff"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",

go.mod

@@ -5,10 +5,10 @@ module k8s.io/sample-controller
 go 1.12
 
 require (
-	k8s.io/api v0.0.0
+	k8s.io/api v0.0.0-20190712022805-31fe033ae6f9
-	k8s.io/apimachinery v0.0.0
+	k8s.io/apimachinery v0.0.0-20190712095106-75ce4d1e60f1
-	k8s.io/client-go v0.0.0
+	k8s.io/client-go v0.0.0-20190712102959-611184f7c43a
-	k8s.io/code-generator v0.0.0
+	k8s.io/code-generator v0.0.0-20190713022532-93d7507fc8ff
 	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/api => k8s.io/api v0.0.0-20190712022805-31fe033ae6f9
-	k8s.io/apimachinery => ../apimachinery
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190712095106-75ce4d1e60f1
-	k8s.io/client-go => ../client-go
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20190712102959-611184f7c43a
-	k8s.io/code-generator => ../code-generator
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190713022532-93d7507fc8ff
-	k8s.io/sample-controller => ../sample-controller
 )

go.sum

@@ -114,6 +114,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-20190712022805-31fe033ae6f9/go.mod h1:quCKyJONbDKoYS6YlndaZ0BUdM1jU4J8fCiC0S2ctLI=
+k8s.io/apimachinery v0.0.0-20190712095106-75ce4d1e60f1/go.mod h1:M2fZgZL9DbLfeJaPBCDqSqNsdsmLN+V29knYJnIXlMA=
+k8s.io/client-go v0.0.0-20190712102959-611184f7c43a/go.mod h1:fdQc9ByAiSeRWlHAp/NtRHzoYmdTblX8jATAi8iwHLU=
+k8s.io/code-generator v0.0.0-20190713022532-93d7507fc8ff/go.mod h1:mdlckYc+qIcm9LO4wF2aMreloe3RdtmWtJWN0a5jC7w=
 k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8sbdMQHtjNZ19dk=
 k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=