genericapiserver: fix imports

cmd/cloud-controller-manager/BUILD

@@ -30,7 +30,7 @@ go_library(
         "//pkg/version/verflag:go_default_library",
         "//vendor:github.com/golang/glog",
         "//vendor:github.com/spf13/pflag",
-        "//vendor:k8s.io/apiserver/pkg/healthz",
+        "//vendor:k8s.io/apiserver/pkg/server/healthz",
     ],
 )
 

cmd/cloud-controller-manager/app/BUILD

@@ -34,7 +34,7 @@ go_library(
         "//vendor:github.com/spf13/pflag",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/util/wait",
-        "//vendor:k8s.io/apiserver/pkg/healthz",
+        "//vendor:k8s.io/apiserver/pkg/server/healthz",
     ],
 )
 

cmd/cloud-controller-manager/app/controllermanager.go

@@ -27,7 +27,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/apiserver/pkg/healthz"
+	"k8s.io/apiserver/pkg/server/healthz"
 	"k8s.io/kubernetes/cmd/cloud-controller-manager/app/options"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"

cmd/cloud-controller-manager/controller-manager.go

@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"os"
 
-	"k8s.io/apiserver/pkg/healthz"
+	"k8s.io/apiserver/pkg/server/healthz"
 	"k8s.io/kubernetes/cmd/cloud-controller-manager/app"
 	"k8s.io/kubernetes/cmd/cloud-controller-manager/app/options"
 	_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration

cmd/hyperkube/BUILD

@@ -66,7 +66,7 @@ go_library(
         "//plugin/cmd/kube-scheduler/app:go_default_library",
         "//plugin/cmd/kube-scheduler/app/options:go_default_library",
         "//vendor:github.com/spf13/pflag",
-        "//vendor:k8s.io/apiserver/pkg/healthz",
+        "//vendor:k8s.io/apiserver/pkg/server/healthz",
     ],
 )
 

cmd/hyperkube/kube-proxy.go

@@ -17,7 +17,7 @@ limitations under the License.
 package main
 
 import (
-	"k8s.io/apiserver/pkg/healthz"
+	"k8s.io/apiserver/pkg/server/healthz"
 	"k8s.io/kubernetes/cmd/kube-proxy/app"
 	"k8s.io/kubernetes/cmd/kube-proxy/app/options"
 )

cmd/kube-aggregator/pkg/apiserver/BUILD

@@ -28,7 +28,7 @@ go_test(
         "//vendor:k8s.io/apimachinery/pkg/util/diff",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",
         "//vendor:k8s.io/apiserver/pkg/authentication/user",
-        "//vendor:k8s.io/apiserver/pkg/request",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/request",
     ],
 )
 
@@ -57,13 +57,13 @@ go_library(
         "//pkg/client/listers/core/v1:go_default_library",
         "//pkg/client/restclient:go_default_library",
         "//pkg/controller:go_default_library",
-        "//pkg/genericapiserver:go_default_library",
+        "//pkg/genericapiserver/endpoints/filters:go_default_library",
-        "//pkg/genericapiserver/api/filters:go_default_library",
+        "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library",
-        "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library",
+        "//pkg/genericapiserver/registry/generic:go_default_library",
-        "//pkg/genericapiserver/api/rest:go_default_library",
+        "//pkg/genericapiserver/registry/generic/rest:go_default_library",
-        "//pkg/genericapiserver/filters:go_default_library",
+        "//pkg/genericapiserver/registry/rest:go_default_library",
-        "//pkg/registry/generic:go_default_library",
+        "//pkg/genericapiserver/server:go_default_library",
-        "//pkg/registry/generic/rest:go_default_library",
+        "//pkg/genericapiserver/server/filters:go_default_library",
         "//pkg/util/httpstream/spdy:go_default_library",
         "//pkg/util/workqueue:go_default_library",
         "//pkg/version:go_default_library",
@@ -74,7 +74,7 @@ go_library(
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/util/runtime",
         "//vendor:k8s.io/apimachinery/pkg/util/wait",
-        "//vendor:k8s.io/apiserver/pkg/request",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/request",
         "//vendor:k8s.io/client-go/transport",
     ],
 )

cmd/kube-aggregator/pkg/apiserver/apiserver.go

@@ -22,15 +22,15 @@ import (
 	"time"
 
 	"k8s.io/apimachinery/pkg/util/wait"
-	genericapirequest "k8s.io/apiserver/pkg/request"
+	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
 	kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 	kubeinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated"
 	v1listers "k8s.io/kubernetes/pkg/client/listers/core/v1"
-	"k8s.io/kubernetes/pkg/genericapiserver"
+	genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters"
-	genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/api/filters"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/rest"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
-	genericfilters "k8s.io/kubernetes/pkg/genericapiserver/filters"
+	genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server"
-	"k8s.io/kubernetes/pkg/registry/generic"
+	genericfilters "k8s.io/kubernetes/pkg/genericapiserver/server/filters"
 	"k8s.io/kubernetes/pkg/version"
 
 	"k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration"

cmd/kube-aggregator/pkg/apiserver/handler_apis.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/kubernetes/pkg/api"
 	v1listers "k8s.io/kubernetes/pkg/client/listers/core/v1"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters"
+	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
 
 	apiregistrationapi "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration"
 	apiregistrationv1alpha1api "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1"

cmd/kube-aggregator/pkg/apiserver/handler_proxy.go

@@ -22,11 +22,11 @@ import (
 	"sync"
 
 	"k8s.io/apimachinery/pkg/runtime"
-	genericapirequest "k8s.io/apiserver/pkg/request"
+	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/client-go/transport"
 	"k8s.io/kubernetes/pkg/client/restclient"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters"
+	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
-	genericrest "k8s.io/kubernetes/pkg/registry/generic/rest"
+	genericrest "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/rest"
 	"k8s.io/kubernetes/pkg/util/httpstream/spdy"
 
 	apiregistrationapi "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration"

cmd/kube-aggregator/pkg/apiserver/handler_proxy_test.go

@@ -28,7 +28,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apiserver/pkg/authentication/user"
-	genericapirequest "k8s.io/apiserver/pkg/request"
+	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
 
 	"k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration"
 )

cmd/kube-aggregator/pkg/cmd/server/BUILD

@@ -18,12 +18,12 @@ go_library(
         "//pkg/api:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/restclient:go_default_library",
-        "//pkg/genericapiserver:go_default_library",
+        "//pkg/genericapiserver/registry/generic:go_default_library",
-        "//pkg/genericapiserver/filters:go_default_library",
+        "//pkg/genericapiserver/registry/generic/registry:go_default_library",
-        "//pkg/genericapiserver/options:go_default_library",
+        "//pkg/genericapiserver/server:go_default_library",
+        "//pkg/genericapiserver/server/filters:go_default_library",
+        "//pkg/genericapiserver/server/options:go_default_library",
         "//pkg/kubectl/cmd/util:go_default_library",
-        "//pkg/registry/generic:go_default_library",
-        "//pkg/registry/generic/registry:go_default_library",
         "//pkg/storage/storagebackend:go_default_library",
         "//vendor:github.com/pborman/uuid",
         "//vendor:github.com/spf13/cobra",

cmd/kube-aggregator/pkg/cmd/server/start.go

@@ -32,12 +32,12 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 	"k8s.io/kubernetes/pkg/client/restclient"
-	"k8s.io/kubernetes/pkg/genericapiserver"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
-	"k8s.io/kubernetes/pkg/genericapiserver/filters"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry"
-	genericoptions "k8s.io/kubernetes/pkg/genericapiserver/options"
+	genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server"
+	"k8s.io/kubernetes/pkg/genericapiserver/server/filters"
+	genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
-	"k8s.io/kubernetes/pkg/registry/generic"
-	"k8s.io/kubernetes/pkg/registry/generic/registry"
 	"k8s.io/kubernetes/pkg/storage/storagebackend"
 
 	"k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1"

cmd/kube-aggregator/pkg/registry/apiservice/BUILD

@@ -16,12 +16,12 @@ go_library(
         "//cmd/kube-aggregator/pkg/apis/apiregistration/validation:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/fields:go_default_library",
-        "//pkg/registry/generic:go_default_library",
+        "//pkg/genericapiserver/registry/generic:go_default_library",
         "//pkg/storage:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/labels",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/util/validation/field",
-        "//vendor:k8s.io/apiserver/pkg/request",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/request",
         "//vendor:k8s.io/apiserver/pkg/storage/names",
     ],
 )

cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD

@@ -14,8 +14,8 @@ go_library(
     deps = [
         "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library",
         "//cmd/kube-aggregator/pkg/registry/apiservice:go_default_library",
-        "//pkg/registry/generic:go_default_library",
+        "//pkg/genericapiserver/registry/generic:go_default_library",
-        "//pkg/registry/generic/registry:go_default_library",
+        "//pkg/genericapiserver/registry/generic/registry:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
     ],
 )

cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go

@@ -20,8 +20,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration"
 	"k8s.io/kubernetes/cmd/kube-aggregator/pkg/registry/apiservice"
-	"k8s.io/kubernetes/pkg/registry/generic"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
-	genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry"
+	genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry"
 )
 
 // rest implements a RESTStorage for API services against etcd

cmd/kube-aggregator/pkg/registry/apiservice/strategy.go

@@ -22,11 +22,11 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	genericapirequest "k8s.io/apiserver/pkg/request"
+	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/storage/names"
 	kapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/fields"
-	"k8s.io/kubernetes/pkg/registry/generic"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
 	"k8s.io/kubernetes/pkg/storage"
 
 	"k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration"

cmd/kube-apiserver/app/BUILD

@@ -27,8 +27,8 @@ go_library(
         "//pkg/controller/informers:go_default_library",
         "//pkg/controller/serviceaccount:go_default_library",
         "//pkg/generated/openapi:go_default_library",
-        "//pkg/genericapiserver:go_default_library",
+        "//pkg/genericapiserver/server:go_default_library",
-        "//pkg/genericapiserver/filters:go_default_library",
+        "//pkg/genericapiserver/server/filters:go_default_library",
         "//pkg/kubeapiserver:go_default_library",
         "//pkg/kubeapiserver/admission:go_default_library",
         "//pkg/kubeapiserver/authenticator:go_default_library",

cmd/kube-apiserver/app/options/BUILD

@@ -18,7 +18,7 @@ go_library(
     deps = [
         "//pkg/api:go_default_library",
         "//pkg/api/validation:go_default_library",
-        "//pkg/genericapiserver/options:go_default_library",
+        "//pkg/genericapiserver/server/options:go_default_library",
         "//pkg/kubeapiserver/options:go_default_library",
         "//pkg/kubelet/client:go_default_library",
         "//pkg/master/ports:go_default_library",

cmd/kube-apiserver/app/options/options.go

@@ -24,7 +24,7 @@ import (
 	utilnet "k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/validation"
-	genericoptions "k8s.io/kubernetes/pkg/genericapiserver/options"
+	genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options"
 	kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
 	kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
 	"k8s.io/kubernetes/pkg/master/ports"

cmd/kube-apiserver/app/server.go

@@ -52,8 +52,8 @@ import (
 	"k8s.io/kubernetes/pkg/controller/informers"
 	serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount"
 	generatedopenapi "k8s.io/kubernetes/pkg/generated/openapi"
-	"k8s.io/kubernetes/pkg/genericapiserver"
+	genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server"
-	"k8s.io/kubernetes/pkg/genericapiserver/filters"
+	"k8s.io/kubernetes/pkg/genericapiserver/server/filters"
 	"k8s.io/kubernetes/pkg/kubeapiserver"
 	kubeadmission "k8s.io/kubernetes/pkg/kubeapiserver/admission"
 	kubeauthenticator "k8s.io/kubernetes/pkg/kubeapiserver/authenticator"

cmd/kube-controller-manager/BUILD

@@ -28,7 +28,7 @@ go_library(
         "//pkg/version/prometheus:go_default_library",
         "//pkg/version/verflag:go_default_library",
         "//vendor:github.com/spf13/pflag",
-        "//vendor:k8s.io/apiserver/pkg/healthz",
+        "//vendor:k8s.io/apiserver/pkg/server/healthz",
     ],
 )
 

cmd/kube-controller-manager/app/BUILD

@@ -100,7 +100,7 @@ go_library(
         "//vendor:k8s.io/apimachinery/pkg/runtime/serializer",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",
         "//vendor:k8s.io/apimachinery/pkg/util/wait",
-        "//vendor:k8s.io/apiserver/pkg/healthz",
+        "//vendor:k8s.io/apiserver/pkg/server/healthz",
     ],
 )
 

cmd/kube-controller-manager/app/controllermanager.go

@@ -35,7 +35,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/apiserver/pkg/healthz"
+	"k8s.io/apiserver/pkg/server/healthz"
 	"k8s.io/kubernetes/cmd/kube-controller-manager/app/options"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"

cmd/kube-controller-manager/controller-manager.go

@@ -24,7 +24,7 @@ import (
 	"fmt"
 	"os"
 
-	"k8s.io/apiserver/pkg/healthz"
+	"k8s.io/apiserver/pkg/server/healthz"
 	"k8s.io/kubernetes/cmd/kube-controller-manager/app"
 	"k8s.io/kubernetes/cmd/kube-controller-manager/app/options"
 	_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration

cmd/kube-proxy/BUILD

@@ -27,7 +27,7 @@ go_library(
         "//pkg/version/prometheus:go_default_library",
         "//pkg/version/verflag:go_default_library",
         "//vendor:github.com/spf13/pflag",
-        "//vendor:k8s.io/apiserver/pkg/healthz",
+        "//vendor:k8s.io/apiserver/pkg/server/healthz",
     ],
 )
 

cmd/kube-proxy/proxy.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"os"
 
-	"k8s.io/apiserver/pkg/healthz"
+	"k8s.io/apiserver/pkg/server/healthz"
 	"k8s.io/kubernetes/cmd/kube-proxy/app"
 	"k8s.io/kubernetes/cmd/kube-proxy/app/options"
 	_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration

cmd/kubelet/app/BUILD

@@ -115,7 +115,7 @@ go_library(
         "//vendor:k8s.io/apimachinery/pkg/util/wait",
         "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
         "//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
-        "//vendor:k8s.io/apiserver/pkg/healthz",
+        "//vendor:k8s.io/apiserver/pkg/server/healthz",
         "//vendor:k8s.io/client-go/kubernetes",
         "//vendor:k8s.io/client-go/kubernetes/typed/authentication/v1beta1",
         "//vendor:k8s.io/client-go/kubernetes/typed/authorization/v1beta1",

cmd/kubelet/app/server.go

@@ -36,7 +36,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	"k8s.io/apiserver/pkg/healthz"
+	"k8s.io/apiserver/pkg/server/healthz"
 	clientgoclientset "k8s.io/client-go/kubernetes"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

examples/apiserver/BUILD

@@ -16,12 +16,12 @@ go_library(
         "//cmd/libs/go2idl/client-gen/test_apis/testgroup/v1:go_default_library",
         "//examples/apiserver/rest:go_default_library",
         "//pkg/api:go_default_library",
-        "//pkg/genericapiserver:go_default_library",
-        "//pkg/genericapiserver/api/rest:go_default_library",
         "//pkg/genericapiserver/authorizer:go_default_library",
-        "//pkg/genericapiserver/options:go_default_library",
+        "//pkg/genericapiserver/registry/generic:go_default_library",
+        "//pkg/genericapiserver/registry/rest:go_default_library",
+        "//pkg/genericapiserver/server:go_default_library",
+        "//pkg/genericapiserver/server/options:go_default_library",
         "//pkg/kubeapiserver/options:go_default_library",
-        "//pkg/registry/generic:go_default_library",
         "//pkg/storage/storagebackend:go_default_library",
         "//vendor:github.com/golang/glog",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",

examples/apiserver/apiserver.go

@@ -24,12 +24,12 @@ import (
 	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1"
 	testgroupetcd "k8s.io/kubernetes/examples/apiserver/rest"
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/genericapiserver"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/rest"
 	"k8s.io/kubernetes/pkg/genericapiserver/authorizer"
-	genericoptions "k8s.io/kubernetes/pkg/genericapiserver/options"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
+	genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server"
+	genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options"
 	kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
-	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/storage/storagebackend"
 
 	// Install the testgroup API

examples/apiserver/rest/BUILD

@@ -15,13 +15,13 @@ go_library(
         "//cmd/libs/go2idl/client-gen/test_apis/testgroup:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/fields:go_default_library",
-        "//pkg/registry/generic:go_default_library",
+        "//pkg/genericapiserver/registry/generic:go_default_library",
-        "//pkg/registry/generic/registry:go_default_library",
+        "//pkg/genericapiserver/registry/generic/registry:go_default_library",
         "//pkg/storage:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/labels",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/util/validation/field",
-        "//vendor:k8s.io/apiserver/pkg/request",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/request",
         "//vendor:k8s.io/apiserver/pkg/storage/names",
     ],
 )

examples/apiserver/rest/reststorage.go

@@ -22,13 +22,13 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	genericapirequest "k8s.io/apiserver/pkg/request"
+	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/storage/names"
 	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/fields"
-	"k8s.io/kubernetes/pkg/registry/generic"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
-	genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry"
+	genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry"
 	"k8s.io/kubernetes/pkg/storage"
 )
 

federation/cmd/federation-apiserver/app/BUILD

@@ -36,9 +36,11 @@ go_library(
         "//pkg/cloudprovider/providers:go_default_library",
         "//pkg/controller/informers:go_default_library",
         "//pkg/generated/openapi:go_default_library",
-        "//pkg/genericapiserver:go_default_library",
+        "//pkg/genericapiserver/registry/generic:go_default_library",
-        "//pkg/genericapiserver/api/rest:go_default_library",
+        "//pkg/genericapiserver/registry/generic/registry:go_default_library",
-        "//pkg/genericapiserver/filters:go_default_library",
+        "//pkg/genericapiserver/registry/rest:go_default_library",
+        "//pkg/genericapiserver/server:go_default_library",
+        "//pkg/genericapiserver/server/filters:go_default_library",
         "//pkg/kubeapiserver:go_default_library",
         "//pkg/kubeapiserver/admission:go_default_library",
         "//pkg/registry/batch/job/storage:go_default_library",
@@ -52,8 +54,6 @@ go_library(
         "//pkg/registry/extensions/deployment/storage:go_default_library",
         "//pkg/registry/extensions/ingress/storage:go_default_library",
         "//pkg/registry/extensions/replicaset/storage:go_default_library",
-        "//pkg/registry/generic:go_default_library",
-        "//pkg/registry/generic/registry:go_default_library",
         "//pkg/routes:go_default_library",
         "//pkg/version:go_default_library",
         "//plugin/pkg/admission/admit:go_default_library",

federation/cmd/federation-apiserver/app/batch.go

@@ -21,10 +21,10 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/apis/batch"
 	_ "k8s.io/kubernetes/pkg/apis/batch/install"
-	"k8s.io/kubernetes/pkg/genericapiserver"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/rest"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
+	genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server"
 	jobstorage "k8s.io/kubernetes/pkg/registry/batch/job/storage"
-	"k8s.io/kubernetes/pkg/registry/generic"
 )
 
 func installBatchAPIs(g *genericapiserver.GenericAPIServer, optsGetter generic.RESTOptionsGetter) {

federation/cmd/federation-apiserver/app/core.go

@@ -31,14 +31,14 @@ import (
 	"k8s.io/kubernetes/federation/apis/core/v1"
 	"k8s.io/kubernetes/federation/cmd/federation-apiserver/app/options"
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/genericapiserver"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/rest"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
+	genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server"
 	configmapstore "k8s.io/kubernetes/pkg/registry/core/configmap/storage"
 	eventstore "k8s.io/kubernetes/pkg/registry/core/event/storage"
 	namespacestore "k8s.io/kubernetes/pkg/registry/core/namespace/storage"
 	secretstore "k8s.io/kubernetes/pkg/registry/core/secret/storage"
 	servicestore "k8s.io/kubernetes/pkg/registry/core/service/storage"
-	"k8s.io/kubernetes/pkg/registry/generic"
 )
 
 func installCoreAPIs(s *options.ServerRunOptions, g *genericapiserver.GenericAPIServer, optsGetter generic.RESTOptionsGetter) {

federation/cmd/federation-apiserver/app/extensions.go

@@ -21,13 +21,13 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/apis/extensions"
 	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
-	"k8s.io/kubernetes/pkg/genericapiserver"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/rest"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
+	genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server"
 	daemonsetstore "k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage"
 	deploymentstore "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage"
 	ingressstore "k8s.io/kubernetes/pkg/registry/extensions/ingress/storage"
 	replicasetstore "k8s.io/kubernetes/pkg/registry/extensions/replicaset/storage"
-	"k8s.io/kubernetes/pkg/registry/generic"
 )
 
 func installExtensionsAPIs(g *genericapiserver.GenericAPIServer, optsGetter generic.RESTOptionsGetter) {

federation/cmd/federation-apiserver/app/federation.go

@@ -21,9 +21,9 @@ import (
 
 	"k8s.io/kubernetes/federation/apis/federation"
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/genericapiserver"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/rest"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
-	"k8s.io/kubernetes/pkg/registry/generic"
+	genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server"
 
 	_ "k8s.io/kubernetes/federation/apis/federation/install"
 	clusteretcd "k8s.io/kubernetes/federation/registry/cluster/etcd"

federation/cmd/federation-apiserver/app/options/BUILD

@@ -15,7 +15,7 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/genericapiserver/options:go_default_library",
+        "//pkg/genericapiserver/server/options:go_default_library",
         "//pkg/kubeapiserver/options:go_default_library",
         "//vendor:github.com/spf13/pflag",
     ],

federation/cmd/federation-apiserver/app/options/options.go

@@ -20,7 +20,7 @@ package options
 import (
 	"time"
 
-	genericoptions "k8s.io/kubernetes/pkg/genericapiserver/options"
+	genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options"
 	kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
 
 	"github.com/spf13/pflag"

federation/cmd/federation-apiserver/app/server.go

@@ -39,13 +39,13 @@ import (
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/controller/informers"
 	"k8s.io/kubernetes/pkg/generated/openapi"
-	"k8s.io/kubernetes/pkg/genericapiserver"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
-	"k8s.io/kubernetes/pkg/genericapiserver/filters"
+	genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry"
+	genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server"
+	"k8s.io/kubernetes/pkg/genericapiserver/server/filters"
 	"k8s.io/kubernetes/pkg/kubeapiserver"
 	kubeapiserveradmission "k8s.io/kubernetes/pkg/kubeapiserver/admission"
 	"k8s.io/kubernetes/pkg/registry/cachesize"
-	"k8s.io/kubernetes/pkg/registry/generic"
-	genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry"
 	"k8s.io/kubernetes/pkg/routes"
 	"k8s.io/kubernetes/pkg/version"
 )

federation/cmd/federation-controller-manager/BUILD

@@ -26,7 +26,7 @@ go_library(
         "//pkg/util/workqueue/prometheus:go_default_library",
         "//pkg/version/verflag:go_default_library",
         "//vendor:github.com/spf13/pflag",
-        "//vendor:k8s.io/apiserver/pkg/healthz",
+        "//vendor:k8s.io/apiserver/pkg/server/healthz",
     ],
 )
 

federation/cmd/federation-controller-manager/app/BUILD

@@ -45,7 +45,7 @@ go_library(
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/util/wait",
-        "//vendor:k8s.io/apiserver/pkg/healthz",
+        "//vendor:k8s.io/apiserver/pkg/server/healthz",
     ],
 )
 

federation/cmd/federation-controller-manager/app/controllermanager.go

@@ -28,7 +28,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/apiserver/pkg/healthz"
+	"k8s.io/apiserver/pkg/server/healthz"
 	federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
 	"k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options"
 	"k8s.io/kubernetes/federation/pkg/dnsprovider"

federation/cmd/federation-controller-manager/controller-manager.go

@@ -21,7 +21,7 @@ import (
 	"os"
 
 	"github.com/spf13/pflag"
-	"k8s.io/apiserver/pkg/healthz"
+	"k8s.io/apiserver/pkg/server/healthz"
 	"k8s.io/kubernetes/federation/cmd/federation-controller-manager/app"
 	"k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options"
 	"k8s.io/kubernetes/pkg/util/flag"

federation/registry/cluster/BUILD

@@ -20,15 +20,15 @@ go_library(
         "//federation/apis/federation/validation:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/fields:go_default_library",
-        "//pkg/genericapiserver/api/rest:go_default_library",
+        "//pkg/genericapiserver/registry/generic:go_default_library",
-        "//pkg/registry/generic:go_default_library",
+        "//pkg/genericapiserver/registry/rest:go_default_library",
         "//pkg/storage:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/labels",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/util/validation/field",
         "//vendor:k8s.io/apimachinery/pkg/watch",
-        "//vendor:k8s.io/apiserver/pkg/request",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/request",
         "//vendor:k8s.io/apiserver/pkg/storage/names",
     ],
 )
@@ -45,7 +45,7 @@ go_test(
         "//pkg/fields:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/labels",
-        "//vendor:k8s.io/apiserver/pkg/request",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/request",
     ],
 )
 

federation/registry/cluster/etcd/BUILD

@@ -15,11 +15,11 @@ go_library(
     deps = [
         "//federation/apis/federation:go_default_library",
         "//federation/registry/cluster:go_default_library",
-        "//pkg/genericapiserver/api/rest:go_default_library",
+        "//pkg/genericapiserver/registry/generic:go_default_library",
-        "//pkg/registry/generic:go_default_library",
+        "//pkg/genericapiserver/registry/generic/registry:go_default_library",
-        "//pkg/registry/generic/registry:go_default_library",
+        "//pkg/genericapiserver/registry/rest:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
-        "//vendor:k8s.io/apiserver/pkg/request",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/request",
     ],
 )
 
@@ -32,7 +32,7 @@ go_test(
         "//federation/apis/federation:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/fields:go_default_library",
-        "//pkg/registry/generic:go_default_library",
+        "//pkg/genericapiserver/registry/generic:go_default_library",
         "//pkg/registry/registrytest:go_default_library",
         "//pkg/storage/etcd/testing:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",

federation/registry/cluster/etcd/etcd.go

@@ -18,12 +18,12 @@ package etcd
 
 import (
 	"k8s.io/apimachinery/pkg/runtime"
-	genericapirequest "k8s.io/apiserver/pkg/request"
+	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/kubernetes/federation/apis/federation"
 	"k8s.io/kubernetes/federation/registry/cluster"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/rest"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
-	"k8s.io/kubernetes/pkg/registry/generic"
+	genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry"
-	genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
 )
 
 type REST struct {

federation/registry/cluster/etcd/etcd_test.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/kubernetes/federation/apis/federation"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/fields"
-	"k8s.io/kubernetes/pkg/registry/generic"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
 	"k8s.io/kubernetes/pkg/registry/registrytest"
 	etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing"
 )

federation/registry/cluster/registry.go

@@ -19,10 +19,10 @@ package cluster
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/watch"
-	genericapirequest "k8s.io/apiserver/pkg/request"
+	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/kubernetes/federation/apis/federation"
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/rest"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
 )
 
 // Registry is an interface implemented by things that know how to store Cluster objects.

federation/registry/cluster/strategy.go

@@ -22,13 +22,13 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	genericapirequest "k8s.io/apiserver/pkg/request"
+	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/storage/names"
 	"k8s.io/kubernetes/federation/apis/federation"
 	"k8s.io/kubernetes/federation/apis/federation/validation"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/fields"
-	"k8s.io/kubernetes/pkg/registry/generic"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
 	apistorage "k8s.io/kubernetes/pkg/storage"
 )
 

federation/registry/cluster/strategy_test.go

@@ -23,7 +23,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	genericapirequest "k8s.io/apiserver/pkg/request"
+	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/kubernetes/federation/apis/federation"
 	"k8s.io/kubernetes/pkg/api"
 	apitesting "k8s.io/kubernetes/pkg/api/testing"

hack/.linted_packages

@@ -180,13 +180,13 @@ pkg/controller/volume/statusupdater
 pkg/conversion
 pkg/conversion/queryparams
 pkg/credentialprovider/aws
-pkg/genericapiserver/api/audit
+pkg/genericapiserver/endpoints/audit
-pkg/genericapiserver/api/handlers/responsewriters
+pkg/genericapiserver/endpoints/handlers/responsewriters
-pkg/genericapiserver/api/openapi
+pkg/genericapiserver/endpoints/openapi
-pkg/genericapiserver/api/request
+pkg/genericapiserver/endpoints/request
-pkg/genericapiserver/filters
+pkg/genericapiserver/server/filters
-pkg/genericapiserver/mux
+pkg/genericapiserver/server/mux
-pkg/genericapiserver/routes
+pkg/genericapiserver/server/routes
 pkg/hyperkube
 pkg/kubelet/api
 pkg/kubelet/container

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/routes/data/${pkg}/datafile.go"
+  local output_file="pkg/genericapiserver/server/routes/data/${pkg}/datafile.go"
 
   go-bindata -nocompress -o "${output_file}" -prefix ${PWD} -pkg "${pkg}" "${src}"
 

pkg/BUILD

@@ -26,6 +26,7 @@ filegroup(
         "//pkg/apis/componentconfig:all-srcs",
         "//pkg/apis/extensions:all-srcs",
         "//pkg/apis/imagepolicy:all-srcs",
+        "//pkg/apis/meta/v1:all-srcs",
         "//pkg/apis/policy:all-srcs",
         "//pkg/apis/rbac:all-srcs",
         "//pkg/apis/storage:all-srcs",

pkg/apis/meta/v1/BUILD

@@ -0,0 +1,32 @@
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["time.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/genericapiserver/server/openapi/common:go_default_library",
+        "//vendor:github.com/go-openapi/spec",
+        "//vendor:github.com/google/gofuzz",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+)

pkg/apis/meta/v1/time.go

@@ -0,0 +1,180 @@
+/*
+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 v1
+
+import (
+	"encoding/json"
+	"time"
+
+	"k8s.io/kubernetes/pkg/genericapiserver/server/openapi/common"
+
+	"github.com/go-openapi/spec"
+	"github.com/google/gofuzz"
+)
+
+// Time is a wrapper around time.Time which supports correct
+// marshaling to YAML and JSON.  Wrappers are provided for many
+// of the factory methods that the time package offers.
+//
+// +protobuf.options.marshal=false
+// +protobuf.as=Timestamp
+// +protobuf.options.(gogoproto.goproto_stringer)=false
+type Time struct {
+	time.Time `protobuf:"-"`
+}
+
+// DeepCopy returns a deep-copy of the Time value.  The underlying time.Time
+// type is effectively immutable in the time API, so it is safe to
+// copy-by-assign, despite the presence of (unexported) Pointer fields.
+func (t Time) DeepCopy() Time {
+	return t
+}
+
+// String returns the representation of the time.
+func (t Time) String() string {
+	return t.Time.String()
+}
+
+// NewTime returns a wrapped instance of the provided time
+func NewTime(time time.Time) Time {
+	return Time{time}
+}
+
+// Date returns the Time corresponding to the supplied parameters
+// by wrapping time.Date.
+func Date(year int, month time.Month, day, hour, min, sec, nsec int, loc *time.Location) Time {
+	return Time{time.Date(year, month, day, hour, min, sec, nsec, loc)}
+}
+
+// Now returns the current local time.
+func Now() Time {
+	return Time{time.Now()}
+}
+
+// IsZero returns true if the value is nil or time is zero.
+func (t *Time) IsZero() bool {
+	if t == nil {
+		return true
+	}
+	return t.Time.IsZero()
+}
+
+// Before reports whether the time instant t is before u.
+func (t Time) Before(u Time) bool {
+	return t.Time.Before(u.Time)
+}
+
+// Equal reports whether the time instant t is equal to u.
+func (t Time) Equal(u Time) bool {
+	return t.Time.Equal(u.Time)
+}
+
+// Unix returns the local time corresponding to the given Unix time
+// by wrapping time.Unix.
+func Unix(sec int64, nsec int64) Time {
+	return Time{time.Unix(sec, nsec)}
+}
+
+// Rfc3339Copy returns a copy of the Time at second-level precision.
+func (t Time) Rfc3339Copy() Time {
+	copied, _ := time.Parse(time.RFC3339, t.Format(time.RFC3339))
+	return Time{copied}
+}
+
+// UnmarshalJSON implements the json.Unmarshaller interface.
+func (t *Time) UnmarshalJSON(b []byte) error {
+	if len(b) == 4 && string(b) == "null" {
+		t.Time = time.Time{}
+		return nil
+	}
+
+	var str string
+	json.Unmarshal(b, &str)
+
+	pt, err := time.Parse(time.RFC3339, str)
+	if err != nil {
+		return err
+	}
+
+	t.Time = pt.Local()
+	return nil
+}
+
+// UnmarshalQueryParameter converts from a URL query parameter value to an object
+func (t *Time) UnmarshalQueryParameter(str string) error {
+	if len(str) == 0 {
+		t.Time = time.Time{}
+		return nil
+	}
+	// Tolerate requests from older clients that used JSON serialization to build query params
+	if len(str) == 4 && str == "null" {
+		t.Time = time.Time{}
+		return nil
+	}
+
+	pt, err := time.Parse(time.RFC3339, str)
+	if err != nil {
+		return err
+	}
+
+	t.Time = pt.Local()
+	return nil
+}
+
+// MarshalJSON implements the json.Marshaler interface.
+func (t Time) MarshalJSON() ([]byte, error) {
+	if t.IsZero() {
+		// Encode unset/nil objects as JSON's "null".
+		return []byte("null"), nil
+	}
+
+	return json.Marshal(t.UTC().Format(time.RFC3339))
+}
+
+func (_ Time) OpenAPIDefinition() common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type:   []string{"string"},
+				Format: "date-time",
+			},
+		},
+	}
+}
+
+// MarshalQueryParameter converts to a URL query parameter value
+func (t Time) MarshalQueryParameter() (string, error) {
+	if t.IsZero() {
+		// Encode unset/nil objects as an empty string
+		return "", nil
+	}
+
+	return t.UTC().Format(time.RFC3339), nil
+}
+
+// Fuzz satisfies fuzz.Interface.
+func (t *Time) Fuzz(c fuzz.Continue) {
+	if t == nil {
+		return
+	}
+	// Allow for about 1000 years of randomness.  Leave off nanoseconds
+	// because JSON doesn't represent them so they can't round-trip
+	// properly.
+	t.Time = time.Unix(c.Rand.Int63n(1000*365*24*60*60), 0)
+}
+
+var _ fuzz.Interface = &Time{}

pkg/controller/serviceaccount/BUILD

@@ -25,11 +25,11 @@ go_library(
         "//pkg/client/retry:go_default_library",
         "//pkg/controller/informers:go_default_library",
         "//pkg/fields:go_default_library",
+        "//pkg/genericapiserver/registry/generic:go_default_library",
         "//pkg/registry/core/secret:go_default_library",
         "//pkg/registry/core/secret/storage:go_default_library",
         "//pkg/registry/core/serviceaccount:go_default_library",
         "//pkg/registry/core/serviceaccount/storage:go_default_library",
-        "//pkg/registry/generic:go_default_library",
         "//pkg/serviceaccount:go_default_library",
         "//pkg/storage/storagebackend:go_default_library",
         "//pkg/util/metrics:go_default_library",
@@ -45,7 +45,7 @@ go_library(
         "//vendor:k8s.io/apimachinery/pkg/util/sets",
         "//vendor:k8s.io/apimachinery/pkg/util/wait",
         "//vendor:k8s.io/apimachinery/pkg/watch",
-        "//vendor:k8s.io/apiserver/pkg/request",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/request",
     ],
 )
 

pkg/controller/serviceaccount/tokengetter.go

@@ -18,14 +18,14 @@ package serviceaccount
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	genericapirequest "k8s.io/apiserver/pkg/request"
+	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
 	"k8s.io/kubernetes/pkg/registry/core/secret"
 	secretstore "k8s.io/kubernetes/pkg/registry/core/secret/storage"
 	serviceaccountregistry "k8s.io/kubernetes/pkg/registry/core/serviceaccount"
 	serviceaccountstore "k8s.io/kubernetes/pkg/registry/core/serviceaccount/storage"
-	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/serviceaccount"
 	"k8s.io/kubernetes/pkg/storage/storagebackend"
 )

pkg/genericapiserver/BUILD

@@ -5,109 +5,12 @@ licenses(["notice"])
 load(
     "@io_bazel_rules_go//go:def.bzl",
     "go_library",
-    "go_test",
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "genericapiserver_test.go",
-        "resource_config_test.go",
-        "serve_test.go",
-        "server_run_options_test.go",
-        "storage_factory_test.go",
-    ],
-    library = ":go_default_library",
-    tags = ["automanaged"],
-    deps = [
-        "//pkg/api:go_default_library",
-        "//pkg/api/testapi:go_default_library",
-        "//pkg/api/v1:go_default_library",
-        "//pkg/apis/autoscaling:go_default_library",
-        "//pkg/apis/extensions:go_default_library",
-        "//pkg/client/clientset_generated/clientset:go_default_library",
-        "//pkg/generated/openapi:go_default_library",
-        "//pkg/genericapiserver/api/rest:go_default_library",
-        "//pkg/genericapiserver/options:go_default_library",
-        "//pkg/storage/etcd/testing:go_default_library",
-        "//pkg/storage/storagebackend:go_default_library",
-        "//pkg/util/cert:go_default_library",
-        "//pkg/util/config:go_default_library",
-        "//vendor:github.com/go-openapi/spec",
-        "//vendor:github.com/stretchr/testify/assert",
-        "//vendor:k8s.io/apimachinery/pkg/api/meta",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery",
-        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
-        "//vendor:k8s.io/apimachinery/pkg/runtime",
-        "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
-        "//vendor:k8s.io/apimachinery/pkg/util/net",
-        "//vendor:k8s.io/apimachinery/pkg/util/sets",
-        "//vendor:k8s.io/apimachinery/pkg/version",
-        "//vendor:k8s.io/apiserver/pkg/authentication/user",
-        "//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
-        "//vendor:k8s.io/apiserver/pkg/request",
-    ],
 )
 
 go_library(
     name = "go_default_library",
-    srcs = [
+    srcs = ["doc.go"],
-        "config.go",
-        "config_selfclient.go",
-        "discovery.go",
-        "doc.go",
-        "genericapiserver.go",
-        "healthz.go",
-        "hooks.go",
-        "resource_config.go",
-        "resource_encoding_config.go",
-        "serve.go",
-        "storage_factory.go",
-    ],
     tags = ["automanaged"],
-    deps = [
-        "//pkg/api:go_default_library",
-        "//pkg/client/restclient:go_default_library",
-        "//pkg/genericapiserver/api:go_default_library",
-        "//pkg/genericapiserver/api/filters:go_default_library",
-        "//pkg/genericapiserver/api/openapi:go_default_library",
-        "//pkg/genericapiserver/api/rest:go_default_library",
-        "//pkg/genericapiserver/authenticator:go_default_library",
-        "//pkg/genericapiserver/authorizer:go_default_library",
-        "//pkg/genericapiserver/filters:go_default_library",
-        "//pkg/genericapiserver/mux:go_default_library",
-        "//pkg/genericapiserver/options:go_default_library",
-        "//pkg/genericapiserver/routes:go_default_library",
-        "//pkg/storage/storagebackend:go_default_library",
-        "//pkg/util/cert:go_default_library",
-        "//vendor:github.com/coreos/go-systemd/daemon",
-        "//vendor:github.com/emicklei/go-restful",
-        "//vendor:github.com/emicklei/go-restful/swagger",
-        "//vendor:github.com/go-openapi/spec",
-        "//vendor:github.com/golang/glog",
-        "//vendor:github.com/pborman/uuid",
-        "//vendor:github.com/pkg/errors",
-        "//vendor:gopkg.in/natefinch/lumberjack.v2",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery",
-        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
-        "//vendor:k8s.io/apimachinery/pkg/openapi",
-        "//vendor:k8s.io/apimachinery/pkg/runtime",
-        "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
-        "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-        "//vendor:k8s.io/apimachinery/pkg/util/net",
-        "//vendor:k8s.io/apimachinery/pkg/util/runtime",
-        "//vendor:k8s.io/apimachinery/pkg/util/sets",
-        "//vendor:k8s.io/apimachinery/pkg/util/validation",
-        "//vendor:k8s.io/apimachinery/pkg/version",
-        "//vendor:k8s.io/apiserver/pkg/admission",
-        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
-        "//vendor:k8s.io/apiserver/pkg/authentication/request/union",
-        "//vendor:k8s.io/apiserver/pkg/authentication/user",
-        "//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
-        "//vendor:k8s.io/apiserver/pkg/authorization/union",
-        "//vendor:k8s.io/apiserver/pkg/healthz",
-        "//vendor:k8s.io/apiserver/pkg/request",
-    ],
 )
 
 filegroup(
@@ -121,14 +24,11 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/genericapiserver/api:all-srcs",
         "//pkg/genericapiserver/authenticator:all-srcs",
         "//pkg/genericapiserver/authorizer:all-srcs",
-        "//pkg/genericapiserver/filters:all-srcs",
+        "//pkg/genericapiserver/endpoints:all-srcs",
-        "//pkg/genericapiserver/mux:all-srcs",
+        "//pkg/genericapiserver/registry:all-srcs",
-        "//pkg/genericapiserver/openapi:all-srcs",
+        "//pkg/genericapiserver/server:all-srcs",
-        "//pkg/genericapiserver/options:all-srcs",
-        "//pkg/genericapiserver/routes:all-srcs",
     ],
     tags = ["automanaged"],
 )

pkg/genericapiserver/doc.go

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package genericapiserver contains code to setup a generic kubernetes-like API server.
-// This does not contain any kubernetes API specific code.
+// This does not contain any Kubernetes specific API types.
 // Note that this is a work in progress. We are pulling out generic code (specifically from
 // pkg/master) here.
 // We plan to move this package into a separate repo on github once it is done.

pkg/genericapiserver/endpoints/BUILD

@@ -8,37 +8,6 @@ load(
     "go_test",
 )
 
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "apiserver.go",
-        "discovery.go",
-        "doc.go",
-        "groupversion.go",
-        "installer.go",
-    ],
-    tags = ["automanaged"],
-    deps = [
-        "//pkg/apis/extensions:go_default_library",
-        "//pkg/genericapiserver/api/handlers:go_default_library",
-        "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library",
-        "//pkg/genericapiserver/api/rest:go_default_library",
-        "//vendor:github.com/emicklei/go-restful",
-        "//vendor:k8s.io/apimachinery/pkg/api/errors",
-        "//vendor:k8s.io/apimachinery/pkg/api/meta",
-        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
-        "//vendor:k8s.io/apimachinery/pkg/conversion",
-        "//vendor:k8s.io/apimachinery/pkg/runtime",
-        "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
-        "//vendor:k8s.io/apimachinery/pkg/types",
-        "//vendor:k8s.io/apimachinery/pkg/util/errors",
-        "//vendor:k8s.io/apiserver/pkg/admission",
-        "//vendor:k8s.io/apiserver/pkg/handlers/negotiation",
-        "//vendor:k8s.io/apiserver/pkg/metrics",
-        "//vendor:k8s.io/apiserver/pkg/request",
-    ],
-)
-
 go_test(
     name = "go_default_test",
     srcs = [
@@ -54,11 +23,11 @@ go_test(
         "//pkg/api/testing:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/fields:go_default_library",
-        "//pkg/genericapiserver/api/filters:go_default_library",
+        "//pkg/genericapiserver/endpoints/filters:go_default_library",
-        "//pkg/genericapiserver/api/handlers:go_default_library",
+        "//pkg/genericapiserver/endpoints/handlers:go_default_library",
-        "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library",
+        "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library",
-        "//pkg/genericapiserver/api/rest:go_default_library",
+        "//pkg/genericapiserver/endpoints/testing:go_default_library",
-        "//pkg/genericapiserver/api/testing:go_default_library",
+        "//pkg/genericapiserver/registry/rest:go_default_library",
         "//plugin/pkg/admission/admit:go_default_library",
         "//plugin/pkg/admission/deny:go_default_library",
         "//vendor:github.com/emicklei/go-restful",
@@ -76,7 +45,38 @@ go_test(
         "//vendor:k8s.io/apimachinery/pkg/util/wait",
         "//vendor:k8s.io/apimachinery/pkg/watch",
         "//vendor:k8s.io/apiserver/pkg/admission",
-        "//vendor:k8s.io/apiserver/pkg/request",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/request",
+    ],
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "apiserver.go",
+        "discovery.go",
+        "doc.go",
+        "groupversion.go",
+        "installer.go",
+    ],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/apis/extensions:go_default_library",
+        "//pkg/genericapiserver/endpoints/handlers:go_default_library",
+        "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library",
+        "//pkg/genericapiserver/registry/rest:go_default_library",
+        "//vendor:github.com/emicklei/go-restful",
+        "//vendor:k8s.io/apimachinery/pkg/api/errors",
+        "//vendor:k8s.io/apimachinery/pkg/api/meta",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
+        "//vendor:k8s.io/apimachinery/pkg/conversion",
+        "//vendor:k8s.io/apimachinery/pkg/runtime",
+        "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
+        "//vendor:k8s.io/apimachinery/pkg/types",
+        "//vendor:k8s.io/apimachinery/pkg/util/errors",
+        "//vendor:k8s.io/apiserver/pkg/admission",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/negotiation",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/metrics",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/request",
     ],
 )
 
@@ -91,11 +91,10 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/genericapiserver/api/filters:all-srcs",
+        "//pkg/genericapiserver/endpoints/filters:all-srcs",
-        "//pkg/genericapiserver/api/handlers:all-srcs",
+        "//pkg/genericapiserver/endpoints/handlers:all-srcs",
-        "//pkg/genericapiserver/api/openapi:all-srcs",
+        "//pkg/genericapiserver/endpoints/openapi:all-srcs",
-        "//pkg/genericapiserver/api/rest:all-srcs",
+        "//pkg/genericapiserver/endpoints/testing:all-srcs",
-        "//pkg/genericapiserver/api/testing:all-srcs",
     ],
     tags = ["automanaged"],
 )

pkg/genericapiserver/endpoints/apiserver.go

@@ -17,7 +17,7 @@ limitations under the License.
 package endpoints
 
 import (
-	"k8s.io/apiserver/pkg/metrics"
+	"k8s.io/apiserver/pkg/endpoints/metrics"
 )
 
 func init() {

pkg/genericapiserver/endpoints/apiserver_test.go

@@ -44,15 +44,15 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/apiserver/pkg/admission"
-	"k8s.io/apiserver/pkg/request"
+	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/kubernetes/pkg/api"
 	apitesting "k8s.io/kubernetes/pkg/api/testing"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/fields"
-	genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/api/filters"
+	genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters"
+	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/rest"
+	genericapitesting "k8s.io/kubernetes/pkg/genericapiserver/endpoints/testing"
-	genericapitesting "k8s.io/kubernetes/pkg/genericapiserver/api/testing"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
 	"k8s.io/kubernetes/plugin/pkg/admission/admit"
 	"k8s.io/kubernetes/plugin/pkg/admission/deny"
 
@@ -3082,7 +3082,7 @@ func TestWriteJSONDecodeError(t *testing.T) {
 	if status.Reason != metav1.StatusReasonUnknown {
 		t.Errorf("unexpected reason %#v", status)
 	}
-	if !strings.Contains(status.Message, "no kind is registered for the type api.UnregisteredAPIObject") {
+	if !strings.Contains(status.Message, "no kind is registered for the type endpoints.UnregisteredAPIObject") {
 		t.Errorf("unexpected message %#v", status)
 	}
 }

pkg/genericapiserver/endpoints/discovery.go

@@ -27,9 +27,9 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apiserver/pkg/handlers/negotiation"
+	"k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/handlers"
+	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters"
+	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
 )
 
 // AddApiWebService adds a service to return the supported api versions at the legacy /api.

pkg/genericapiserver/endpoints/doc.go

@@ -16,4 +16,3 @@ limitations under the License.
 
 // Package endpoints contains the generic code that provides a RESTful Kubernetes-style API service.
 package endpoints // import "k8s.io/kubernetes/pkg/genericapiserver/endpoints"
-

pkg/genericapiserver/endpoints/filters/BUILD

@@ -22,12 +22,12 @@ go_test(
     deps = [
         "//pkg/apis/authentication:go_default_library",
         "//pkg/apis/batch:go_default_library",
-        "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library",
+        "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",
         "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
         "//vendor:k8s.io/apiserver/pkg/authentication/user",
         "//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
-        "//vendor:k8s.io/apiserver/pkg/request",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/request",
     ],
 )
 
@@ -45,7 +45,7 @@ go_library(
     deps = [
         "//pkg/api:go_default_library",
         "//pkg/apis/authentication:go_default_library",
-        "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library",
+        "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library",
         "//vendor:github.com/golang/glog",
         "//vendor:github.com/pborman/uuid",
         "//vendor:github.com/prometheus/client_golang/prometheus",
@@ -54,8 +54,8 @@ go_library(
         "//vendor:k8s.io/apiserver/pkg/authentication/serviceaccount",
         "//vendor:k8s.io/apiserver/pkg/authentication/user",
         "//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
-        "//vendor:k8s.io/apiserver/pkg/httplog",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/request",
-        "//vendor:k8s.io/apiserver/pkg/request",
+        "//vendor:k8s.io/apiserver/pkg/server/httplog",
     ],
 )
 

pkg/genericapiserver/endpoints/filters/audit.go

@@ -30,9 +30,9 @@ import (
 	"github.com/pborman/uuid"
 
 	utilnet "k8s.io/apimachinery/pkg/util/net"
-	"k8s.io/apiserver/pkg/request"
+	"k8s.io/apiserver/pkg/endpoints/request"
 	authenticationapi "k8s.io/kubernetes/pkg/apis/authentication"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters"
+	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
 )
 
 var _ http.ResponseWriter = &auditResponseWriter{}

pkg/genericapiserver/endpoints/filters/audit_test.go

@@ -29,7 +29,7 @@ import (
 	"testing"
 
 	"k8s.io/apiserver/pkg/authentication/user"
-	"k8s.io/apiserver/pkg/request"
+	"k8s.io/apiserver/pkg/endpoints/request"
 )
 
 type simpleResponseWriter struct {

pkg/genericapiserver/endpoints/filters/authentication.go

@@ -24,7 +24,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 
 	"k8s.io/apiserver/pkg/authentication/authenticator"
-	genericapirequest "k8s.io/apiserver/pkg/request"
+	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
 )
 
 var (

pkg/genericapiserver/endpoints/filters/authentication_test.go

@@ -24,7 +24,7 @@ import (
 
 	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
-	genericapirequest "k8s.io/apiserver/pkg/request"
+	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
 )
 
 func TestAuthenticateRequest(t *testing.T) {

pkg/genericapiserver/endpoints/filters/authorization.go

@@ -23,8 +23,8 @@ import (
 	"github.com/golang/glog"
 
 	"k8s.io/apiserver/pkg/authorization/authorizer"
-	"k8s.io/apiserver/pkg/request"
+	"k8s.io/apiserver/pkg/endpoints/request"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters"
+	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
 )
 
 // WithAuthorizationCheck passes all authorized requests on to handler, and returns a forbidden error otherwise.

pkg/genericapiserver/endpoints/filters/authorization_test.go

@@ -24,9 +24,9 @@ import (
 	"testing"
 
 	"k8s.io/apiserver/pkg/authorization/authorizer"
-	"k8s.io/apiserver/pkg/request"
+	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/kubernetes/pkg/apis/batch"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters"
+	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
 )
 
 func TestGetAuthorizerAttributes(t *testing.T) {

pkg/genericapiserver/endpoints/filters/doc.go

@@ -15,5 +15,7 @@ limitations under the License.
 */
 
 // Package filters contains all the http handler chain filters which
-// _are_ api related.
+// _are_ api related, i.e. which are prerequisite for the API services
-package filters // import "k8s.io/kubernetes/pkg/genericapiserver/api/filters"
+// to work (in contrast to the filters in the server package which are
+// not part of the API contract).
+package filters // import "k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters"

pkg/genericapiserver/endpoints/filters/impersonation.go

@@ -27,11 +27,11 @@ import (
 	"k8s.io/apiserver/pkg/authentication/serviceaccount"
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
-	"k8s.io/apiserver/pkg/httplog"
+	"k8s.io/apiserver/pkg/endpoints/request"
-	"k8s.io/apiserver/pkg/request"
+	"k8s.io/apiserver/pkg/server/httplog"
 	"k8s.io/kubernetes/pkg/api"
 	authenticationapi "k8s.io/kubernetes/pkg/apis/authentication"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters"
+	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
 )
 
 // WithImpersonation is a filter that will inspect and check requests that attempt to change the user.Info for their requests

pkg/genericapiserver/endpoints/filters/impersonation_test.go

@@ -26,7 +26,7 @@ import (
 
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
-	"k8s.io/apiserver/pkg/request"
+	"k8s.io/apiserver/pkg/endpoints/request"
 	authenticationapi "k8s.io/kubernetes/pkg/apis/authentication"
 )
 

pkg/genericapiserver/endpoints/filters/requestinfo.go

@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"k8s.io/apiserver/pkg/request"
+	"k8s.io/apiserver/pkg/endpoints/request"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters"
+	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
 )
 
 // WithRequestInfo attaches a RequestInfo to the context.

pkg/genericapiserver/endpoints/filters/requestinfo_test.go

@@ -18,7 +18,7 @@ package filters
 
 import (
 	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/apiserver/pkg/request"
+	"k8s.io/apiserver/pkg/endpoints/request"
 )
 
 func newTestRequestInfoResolver() *request.RequestInfoFactory {

pkg/genericapiserver/endpoints/groupversion.go

@@ -30,9 +30,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apiserver/pkg/admission"
-	"k8s.io/apiserver/pkg/request"
+	"k8s.io/apiserver/pkg/endpoints/request"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/handlers"
+	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/rest"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
 )
 
 // APIGroupVersion is a helper for exposing rest.Storage objects as http.Handlers via go-restful

pkg/genericapiserver/endpoints/handlers/BUILD

@@ -17,7 +17,7 @@ go_test(
         "//pkg/api:go_default_library",
         "//pkg/api/testapi:go_default_library",
         "//pkg/api/v1:go_default_library",
-        "//pkg/genericapiserver/api/rest:go_default_library",
+        "//pkg/genericapiserver/registry/rest:go_default_library",
         "//pkg/util/strategicpatch:go_default_library",
         "//vendor:github.com/emicklei/go-restful",
         "//vendor:github.com/evanphx/json-patch",
@@ -27,7 +27,7 @@ go_test(
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/types",
         "//vendor:k8s.io/apimachinery/pkg/util/diff",
-        "//vendor:k8s.io/apiserver/pkg/request",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/request",
     ],
 )
 
@@ -45,8 +45,8 @@ go_library(
     deps = [
         "//pkg/api:go_default_library",
         "//pkg/fields:go_default_library",
-        "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library",
+        "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library",
-        "//pkg/genericapiserver/api/rest:go_default_library",
+        "//pkg/genericapiserver/registry/rest:go_default_library",
         "//pkg/util:go_default_library",
         "//pkg/util/httpstream:go_default_library",
         "//pkg/util/proxy:go_default_library",
@@ -66,10 +66,10 @@ go_library(
         "//vendor:k8s.io/apimachinery/pkg/util/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
         "//vendor:k8s.io/apiserver/pkg/admission",
-        "//vendor:k8s.io/apiserver/pkg/handlers/negotiation",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/negotiation",
-        "//vendor:k8s.io/apiserver/pkg/httplog",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/metrics",
-        "//vendor:k8s.io/apiserver/pkg/metrics",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/request",
-        "//vendor:k8s.io/apiserver/pkg/request",
+        "//vendor:k8s.io/apiserver/pkg/server/httplog",
         "//vendor:k8s.io/apiserver/pkg/util/wsstream",
     ],
 )
@@ -85,7 +85,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/genericapiserver/api/handlers/responsewriters:all-srcs",
+        "//pkg/genericapiserver/endpoints/handlers/responsewriters:all-srcs",
     ],
     tags = ["automanaged"],
 )

pkg/genericapiserver/endpoints/handlers/discovery.go

@@ -22,7 +22,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters"
+	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
 
 	"github.com/emicklei/go-restful"
 )

pkg/genericapiserver/endpoints/handlers/doc.go

@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package handlers contains HTTP handlers to implement the apiserver APIs.
-package handlers // import "k8s.io/kubernetes/pkg/genericapiserver/api/handlers"
+package handlers // import "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers"

pkg/genericapiserver/endpoints/handlers/proxy.go

@@ -31,12 +31,12 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/net"
-	"k8s.io/apiserver/pkg/httplog"
+	"k8s.io/apiserver/pkg/endpoints/metrics"
-	"k8s.io/apiserver/pkg/metrics"
+	"k8s.io/apiserver/pkg/endpoints/request"
-	"k8s.io/apiserver/pkg/request"
+	"k8s.io/apiserver/pkg/server/httplog"
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters"
+	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/rest"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
 	"k8s.io/kubernetes/pkg/util/httpstream"
 	proxyutil "k8s.io/kubernetes/pkg/util/proxy"
 

pkg/genericapiserver/endpoints/handlers/responsewriters/BUILD

@@ -31,14 +31,14 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/genericapiserver/api/rest:go_default_library",
+        "//pkg/genericapiserver/registry/rest:go_default_library",
         "//pkg/storage:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/util/runtime",
         "//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
-        "//vendor:k8s.io/apiserver/pkg/handlers/negotiation",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/negotiation",
         "//vendor:k8s.io/apiserver/pkg/util/flushwriter",
         "//vendor:k8s.io/apiserver/pkg/util/wsstream",
     ],

pkg/genericapiserver/endpoints/handlers/responsewriters/doc.go

@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package responsewriters containers helpers to write responses in HTTP handlers.
-package responsewriters // import "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters"
+package responsewriters // import "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"

pkg/genericapiserver/endpoints/handlers/responsewriters/writers.go

@@ -26,10 +26,10 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-	"k8s.io/apiserver/pkg/handlers/negotiation"
+	"k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
 	"k8s.io/apiserver/pkg/util/flushwriter"
 	"k8s.io/apiserver/pkg/util/wsstream"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/rest"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
 )
 
 // WriteObject renders a returned runtime.Object to the response as a stream or an encoded object. If the object

pkg/genericapiserver/endpoints/handlers/rest.go

@@ -35,12 +35,12 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apiserver/pkg/admission"
-	"k8s.io/apiserver/pkg/handlers/negotiation"
+	"k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
-	"k8s.io/apiserver/pkg/request"
+	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/fields"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters"
+	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/rest"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
 	"k8s.io/kubernetes/pkg/util"
 	"k8s.io/kubernetes/pkg/util/strategicpatch"
 

pkg/genericapiserver/endpoints/handlers/rest_test.go

@@ -32,11 +32,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/diff"
-	"k8s.io/apiserver/pkg/request"
+	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
 	"k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/rest"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
 	"k8s.io/kubernetes/pkg/util/strategicpatch"
 )
 

pkg/genericapiserver/endpoints/handlers/watch.go

@@ -29,8 +29,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/apiserver/pkg/handlers/negotiation"
+	"k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
-	"k8s.io/apiserver/pkg/httplog"
+	"k8s.io/apiserver/pkg/server/httplog"
 	"k8s.io/apiserver/pkg/util/wsstream"
 
 	"github.com/emicklei/go-restful"

pkg/genericapiserver/endpoints/installer.go

@@ -35,12 +35,12 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apiserver/pkg/handlers/negotiation"
+	"k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
-	"k8s.io/apiserver/pkg/metrics"
+	"k8s.io/apiserver/pkg/endpoints/metrics"
-	"k8s.io/apiserver/pkg/request"
+	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/handlers"
+	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/rest"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
 
 	"github.com/emicklei/go-restful"
 )

pkg/genericapiserver/endpoints/proxy_test.go

@@ -36,7 +36,7 @@ import (
 
 	"golang.org/x/net/websocket"
 	utilnet "k8s.io/apimachinery/pkg/util/net"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/rest"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
 )
 
 func TestProxyRequestContentLengthAndTransferEncoding(t *testing.T) {

pkg/genericapiserver/endpoints/watch_test.go

@@ -39,9 +39,9 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/fields"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/handlers"
+	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/rest"
+	apitesting "k8s.io/kubernetes/pkg/genericapiserver/endpoints/testing"
-	apitesting "k8s.io/kubernetes/pkg/genericapiserver/api/testing"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
 )
 
 // watchJSON defines the expected JSON wire equivalent of watch.Event

pkg/genericapiserver/registry/BUILD

@@ -0,0 +1,31 @@
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["doc.go"],
+    tags = ["automanaged"],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [
+        ":package-srcs",
+        "//pkg/genericapiserver/registry/generic:all-srcs",
+        "//pkg/genericapiserver/registry/rest:all-srcs",
+    ],
+    tags = ["automanaged"],
+)

pkg/genericapiserver/registry/generic/BUILD

@@ -39,8 +39,8 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/registry/generic/registry:all-srcs",
+        "//pkg/genericapiserver/registry/generic/registry:all-srcs",
-        "//pkg/registry/generic/rest:all-srcs",
+        "//pkg/genericapiserver/registry/generic/rest:all-srcs",
     ],
     tags = ["automanaged"],
 )

pkg/genericapiserver/registry/generic/doc.go

@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package generic provides a generic object store interface and a
 // generic label/field matching type.
-package generic // import "k8s.io/kubernetes/pkg/registry/generic"
+package generic // import "k8s.io/kubernetes/pkg/genericapiserver/registry/generic"

pkg/genericapiserver/registry/generic/registry/BUILD

@@ -22,9 +22,9 @@ go_library(
         "//pkg/api/errors/storage:go_default_library",
         "//pkg/api/validation/path:go_default_library",
         "//pkg/fields:go_default_library",
-        "//pkg/genericapiserver/api/rest:go_default_library",
+        "//pkg/genericapiserver/registry/generic:go_default_library",
+        "//pkg/genericapiserver/registry/rest:go_default_library",
         "//pkg/registry/cachesize:go_default_library",
-        "//pkg/registry/generic:go_default_library",
         "//pkg/storage:go_default_library",
         "//pkg/storage/etcd:go_default_library",
         "//pkg/storage/storagebackend:go_default_library",
@@ -40,7 +40,7 @@ go_library(
         "//vendor:k8s.io/apimachinery/pkg/util/runtime",
         "//vendor:k8s.io/apimachinery/pkg/util/validation/field",
         "//vendor:k8s.io/apimachinery/pkg/watch",
-        "//vendor:k8s.io/apiserver/pkg/request",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/request",
     ],
 )
 
@@ -56,9 +56,9 @@ go_test(
         "//pkg/api:go_default_library",
         "//pkg/api/testapi:go_default_library",
         "//pkg/fields:go_default_library",
-        "//pkg/genericapiserver/api/rest:go_default_library",
+        "//pkg/genericapiserver/registry/generic:go_default_library",
+        "//pkg/genericapiserver/registry/rest:go_default_library",
         "//pkg/registry/core/pod:go_default_library",
-        "//pkg/registry/generic:go_default_library",
         "//pkg/storage:go_default_library",
         "//pkg/storage/etcd:go_default_library",
         "//pkg/storage/etcd/testing:go_default_library",
@@ -73,7 +73,7 @@ go_test(
         "//vendor:k8s.io/apimachinery/pkg/util/validation/field",
         "//vendor:k8s.io/apimachinery/pkg/util/wait",
         "//vendor:k8s.io/apimachinery/pkg/watch",
-        "//vendor:k8s.io/apiserver/pkg/request",
+        "//vendor:k8s.io/apiserver/pkg/endpoints/request",
         "//vendor:k8s.io/apiserver/pkg/storage/names",
     ],
 )

pkg/genericapiserver/registry/generic/registry/decorated_watcher.go

@@ -23,7 +23,6 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/rest"
 )
 
 type decoratedWatcher struct {

pkg/genericapiserver/registry/generic/registry/doc.go

@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package etcd has a generic implementation of a registry that
 // stores things in etcd.
-package registry // import "k8s.io/kubernetes/pkg/registry/generic/registry"
+package registry // import "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry"

pkg/genericapiserver/registry/generic/registry/storage_factory.go

@@ -18,7 +18,7 @@ package registry
 
 import (
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/kubernetes/pkg/registry/generic"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
 	"k8s.io/kubernetes/pkg/storage"
 	etcdstorage "k8s.io/kubernetes/pkg/storage/etcd"
 	"k8s.io/kubernetes/pkg/storage/storagebackend"

pkg/genericapiserver/registry/generic/registry/store.go

@@ -32,14 +32,14 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/apimachinery/pkg/watch"
-	genericapirequest "k8s.io/apiserver/pkg/request"
+	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/kubernetes/pkg/api"
 	storeerr "k8s.io/kubernetes/pkg/api/errors/storage"
 	"k8s.io/kubernetes/pkg/api/validation/path"
 	"k8s.io/kubernetes/pkg/fields"
-	"k8s.io/kubernetes/pkg/genericapiserver/api/rest"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
+	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
 	"k8s.io/kubernetes/pkg/registry/cachesize"
-	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/storage"
 
 	"github.com/golang/glog"