move swagger route to apiserver

Author: deads2k

hack/build-ui.sh

@@ -37,7 +37,7 @@ readonly SWAGGER_PKG="swagger"
 function kube::hack::build_ui() {
   local pkg="$1"
   local src="$2"
-  local output_file="pkg/genericapiserver/server/routes/data/${pkg}/datafile.go"
+  local output_file="staging/src/k8s.io/apiserver/pkg/server/routes/data/${pkg}/datafile.go"
 
   go-bindata -nocompress -o "${output_file}" -prefix ${PWD} -pkg "${pkg}" "${src}"
 

pkg/genericapiserver/server/routes/BUILD

@@ -24,7 +24,6 @@ go_library(
         "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library",
         "//pkg/genericapiserver/server/mux:go_default_library",
         "//pkg/genericapiserver/server/openapi:go_default_library",
-        "//pkg/genericapiserver/server/routes/data/swagger:go_default_library",
         "//vendor:github.com/elazarl/go-bindata-assetfs",
         "//vendor:github.com/emicklei/go-restful",
         "//vendor:github.com/emicklei/go-restful/swagger",
@@ -34,6 +33,7 @@ go_library(
         "//vendor:k8s.io/apimachinery/pkg/openapi",
         "//vendor:k8s.io/apimachinery/pkg/version",
         "//vendor:k8s.io/apiserver/pkg/endpoints/metrics",
+        "//vendor:k8s.io/apiserver/pkg/server/routes/data/swagger",
         "//vendor:k8s.io/apiserver/pkg/storage/etcd/metrics",
     ],
 )
@@ -47,9 +47,6 @@ filegroup(
 
 filegroup(
     name = "all-srcs",
-    srcs = [
-        ":package-srcs",
-        "//pkg/genericapiserver/server/routes/data/swagger:all-srcs",
-    ],
+    srcs = [":package-srcs"],
     tags = ["automanaged"],
 )

pkg/genericapiserver/server/routes/data/swagger/BUILD

@@ -21,8 +21,8 @@ import (
 
 	assetfs "github.com/elazarl/go-bindata-assetfs"
 
+	"k8s.io/apiserver/pkg/server/routes/data/swagger"
 	"k8s.io/kubernetes/pkg/genericapiserver/server/mux"
-	"k8s.io/kubernetes/pkg/genericapiserver/server/routes/data/swagger"
 )
 
 // SwaggerUI exposes files in third_party/swagger-ui/ under /swagger-ui.

pkg/genericapiserver/server/routes/swaggerui.go

@@ -14002,3 +14002,9 @@ go_library(
         "//vendor:k8s.io/client-go/util/clock",
     ],
 )
+
+go_library(
+    name = "k8s.io/apiserver/pkg/server/routes/data/swagger",
+    srcs = ["k8s.io/apiserver/pkg/server/routes/data/swagger/datafile.go"],
+    tags = ["automanaged"],
+)