vendor dependencies

vendor/k8s.io/apiserver/pkg/server/routes/OWNERS

@@ -1,2 +1,4 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
 reviewers:
 - sttts

vendor/k8s.io/apiserver/pkg/server/routes/doc.go

@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package routes holds a collection of optional genericapiserver http handlers.
-package routes
+package routes // import "k8s.io/apiserver/pkg/server/routes"

vendor/k8s.io/apiserver/pkg/server/routes/flags.go

@@ -24,7 +24,7 @@ import (
 	"path"
 	"sync"
 
-	"github.com/golang/glog"
+	"k8s.io/klog"
 
 	"k8s.io/apiserver/pkg/server/mux"
 )
@@ -57,7 +57,7 @@ func (f DebugFlags) Index(w http.ResponseWriter, r *http.Request) {
 	lock.RLock()
 	defer lock.RUnlock()
 	if err := indexTmpl.Execute(w, registeredFlags); err != nil {
-		glog.Error(err)
+		klog.Error(err)
 	}
 }
 

vendor/k8s.io/apiserver/pkg/server/routes/openapi.go

@@ -18,9 +18,11 @@ package routes
 
 import (
 	restful "github.com/emicklei/go-restful"
-	"github.com/golang/glog"
+	"github.com/go-openapi/spec"
+	"k8s.io/klog"
 
 	"k8s.io/apiserver/pkg/server/mux"
+	"k8s.io/kube-openapi/pkg/builder"
 	"k8s.io/kube-openapi/pkg/common"
 	"k8s.io/kube-openapi/pkg/handler"
 )
@@ -31,16 +33,14 @@ type OpenAPI struct {
 }
 
 // Install adds the SwaggerUI webservice to the given mux.
-func (oa OpenAPI) Install(c *restful.Container, mux *mux.PathRecorderMux) {
-	// NOTE: [DEPRECATION] We will announce deprecation for format-separated endpoints for OpenAPI spec,
-	// and switch to a single /openapi/v2 endpoint in Kubernetes 1.10. The design doc and deprecation process
-	// are tracked at: https://docs.google.com/document/d/19lEqE9lc4yHJ3WJAJxS_G7TcORIJXGHyq3wpwcH28nU.
-	_, err := handler.BuildAndRegisterOpenAPIService("/swagger.json", c.RegisteredWebServices(), oa.Config, mux)
+func (oa OpenAPI) Install(c *restful.Container, mux *mux.PathRecorderMux) (*handler.OpenAPIService, *spec.Swagger) {
+	spec, err := builder.BuildOpenAPISpec(c.RegisteredWebServices(), oa.Config)
 	if err != nil {
-		glog.Fatalf("Failed to register open api spec for root: %v", err)
+		klog.Fatalf("Failed to build open api spec for root: %v", err)
 	}
-	_, err = handler.BuildAndRegisterOpenAPIVersionedService("/openapi/v2", c.RegisteredWebServices(), oa.Config, mux)
+	openAPIVersionedService, err := handler.RegisterOpenAPIVersionedService(spec, "/openapi/v2", mux)
 	if err != nil {
-		glog.Fatalf("Failed to register versioned open api spec for root: %v", err)
+		klog.Fatalf("Failed to register versioned open api spec for root: %v", err)
 	}
+	return openAPIVersionedService, spec
 }

vendor/k8s.io/apiserver/pkg/server/routes/profiling.go

@@ -28,9 +28,16 @@ type Profiling struct{}
 
 // Install adds the Profiling webservice to the given mux.
 func (d Profiling) Install(c *mux.PathRecorderMux) {
-	c.UnlistedHandle("/debug/pprof", http.HandlerFunc(pprof.Index))
+	c.UnlistedHandleFunc("/debug/pprof", redirectTo("/debug/pprof/"))
 	c.UnlistedHandlePrefix("/debug/pprof/", http.HandlerFunc(pprof.Index))
 	c.UnlistedHandleFunc("/debug/pprof/profile", pprof.Profile)
 	c.UnlistedHandleFunc("/debug/pprof/symbol", pprof.Symbol)
 	c.UnlistedHandleFunc("/debug/pprof/trace", pprof.Trace)
 }
+
+// redirectTo redirects request to a certain destination.
+func redirectTo(to string) func(http.ResponseWriter, *http.Request) {
+	return func(rw http.ResponseWriter, req *http.Request) {
+		http.Redirect(rw, req, to, http.StatusFound)
+	}
+}

vendor/k8s.io/apiserver/pkg/server/routes/swagger.go

@@ -1,36 +0,0 @@
-/*
-Copyright 2016 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package routes
-
-import (
-	"github.com/emicklei/go-restful"
-	"github.com/emicklei/go-restful-swagger12"
-)
-
-// Swagger installs the /swaggerapi/ endpoint to allow schema discovery
-// and traversal. It is optional to allow consumers of the Kubernetes GenericAPIServer to
-// register their own web services into the Kubernetes mux prior to initialization
-// of swagger, so that other resource types show up in the documentation.
-type Swagger struct {
-	Config *swagger.Config
-}
-
-// Install adds the SwaggerUI webservice to the given mux.
-func (s Swagger) Install(c *restful.Container) {
-	s.Config.WebServices = c.RegisteredWebServices()
-	swagger.RegisterSwaggerService(*s.Config, c)
-}

vendor/k8s.io/apiserver/pkg/server/routes/swaggerui.go

@@ -1,40 +0,0 @@
-/*
-Copyright 2014 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package routes
-
-import (
-	"net/http"
-
-	assetfs "github.com/elazarl/go-bindata-assetfs"
-
-	"k8s.io/apiserver/pkg/server/mux"
-	"k8s.io/apiserver/pkg/server/routes/data/swagger"
-)
-
-// SwaggerUI exposes files in third_party/swagger-ui/ under /swagger-ui.
-type SwaggerUI struct{}
-
-// Install adds the SwaggerUI webservice to the given mux.
-func (l SwaggerUI) Install(c *mux.PathRecorderMux) {
-	fileServer := http.FileServer(&assetfs.AssetFS{
-		Asset:    swagger.Asset,
-		AssetDir: swagger.AssetDir,
-		Prefix:   "third_party/swagger-ui",
-	})
-	prefix := "/swagger-ui/"
-	c.HandlePrefix(prefix, http.StripPrefix(prefix, fileServer))
-}