diff --git a/pkg/genericapiserver/api/rest/types.go b/pkg/genericapiserver/api/rest/types.go deleted file mode 100644 index 935fbd4725a..00000000000 --- a/pkg/genericapiserver/api/rest/types.go +++ /dev/null @@ -1,42 +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 rest - -import ( - "k8s.io/apimachinery/pkg/runtime" -) - -// ObjectFunc is a function to act on a given object. An error may be returned -// if the hook cannot be completed. An ObjectFunc may transform the provided -// object. -type ObjectFunc func(obj runtime.Object) error - -// AllFuncs returns an ObjectFunc that attempts to run all of the provided functions -// in order, returning early if there are any errors. -func AllFuncs(fns ...ObjectFunc) ObjectFunc { - return func(obj runtime.Object) error { - for _, fn := range fns { - if fn == nil { - continue - } - if err := fn(obj); err != nil { - return err - } - } - return nil - } -} diff --git a/pkg/genericapiserver/api/BUILD b/pkg/genericapiserver/endpoints/BUILD similarity index 100% rename from pkg/genericapiserver/api/BUILD rename to pkg/genericapiserver/endpoints/BUILD diff --git a/pkg/genericapiserver/api/OWNERS b/pkg/genericapiserver/endpoints/OWNERS similarity index 100% rename from pkg/genericapiserver/api/OWNERS rename to pkg/genericapiserver/endpoints/OWNERS diff --git a/pkg/genericapiserver/api/apiserver.go b/pkg/genericapiserver/endpoints/apiserver.go similarity index 97% rename from pkg/genericapiserver/api/apiserver.go rename to pkg/genericapiserver/endpoints/apiserver.go index ff6d8316ee1..1970f2c0aa3 100644 --- a/pkg/genericapiserver/api/apiserver.go +++ b/pkg/genericapiserver/endpoints/apiserver.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package api +package endpoints import ( "k8s.io/apiserver/pkg/metrics" diff --git a/pkg/genericapiserver/api/apiserver_test.go b/pkg/genericapiserver/endpoints/apiserver_test.go similarity index 99% rename from pkg/genericapiserver/api/apiserver_test.go rename to pkg/genericapiserver/endpoints/apiserver_test.go index 8f8bef9a01e..eff5c5756db 100644 --- a/pkg/genericapiserver/api/apiserver_test.go +++ b/pkg/genericapiserver/endpoints/apiserver_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package api +package endpoints import ( "bytes" diff --git a/pkg/genericapiserver/api/discovery.go b/pkg/genericapiserver/endpoints/discovery.go similarity index 99% rename from pkg/genericapiserver/api/discovery.go rename to pkg/genericapiserver/endpoints/discovery.go index fed59636c6b..d5408a74ca5 100644 --- a/pkg/genericapiserver/api/discovery.go +++ b/pkg/genericapiserver/endpoints/discovery.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package api +package endpoints import ( "bytes" diff --git a/pkg/genericapiserver/endpoints/doc.go b/pkg/genericapiserver/endpoints/doc.go new file mode 100644 index 00000000000..406620e5f9b --- /dev/null +++ b/pkg/genericapiserver/endpoints/doc.go @@ -0,0 +1,19 @@ +/* +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 endpoints contains the generic code that provides a RESTful Kubernetes-style API service. +package endpoints // import "k8s.io/kubernetes/pkg/genericapiserver/endpoints" + diff --git a/pkg/genericapiserver/api/filters/BUILD b/pkg/genericapiserver/endpoints/filters/BUILD similarity index 100% rename from pkg/genericapiserver/api/filters/BUILD rename to pkg/genericapiserver/endpoints/filters/BUILD diff --git a/pkg/genericapiserver/api/filters/OWNERS b/pkg/genericapiserver/endpoints/filters/OWNERS similarity index 100% rename from pkg/genericapiserver/api/filters/OWNERS rename to pkg/genericapiserver/endpoints/filters/OWNERS diff --git a/pkg/genericapiserver/api/filters/audit.go b/pkg/genericapiserver/endpoints/filters/audit.go similarity index 100% rename from pkg/genericapiserver/api/filters/audit.go rename to pkg/genericapiserver/endpoints/filters/audit.go diff --git a/pkg/genericapiserver/api/filters/audit_test.go b/pkg/genericapiserver/endpoints/filters/audit_test.go similarity index 100% rename from pkg/genericapiserver/api/filters/audit_test.go rename to pkg/genericapiserver/endpoints/filters/audit_test.go diff --git a/pkg/genericapiserver/api/filters/authorization.go b/pkg/genericapiserver/endpoints/filters/authorization.go similarity index 100% rename from pkg/genericapiserver/api/filters/authorization.go rename to pkg/genericapiserver/endpoints/filters/authorization.go diff --git a/pkg/genericapiserver/api/filters/authorization_test.go b/pkg/genericapiserver/endpoints/filters/authorization_test.go similarity index 100% rename from pkg/genericapiserver/api/filters/authorization_test.go rename to pkg/genericapiserver/endpoints/filters/authorization_test.go diff --git a/pkg/genericapiserver/api/filters/doc.go b/pkg/genericapiserver/endpoints/filters/doc.go similarity index 100% rename from pkg/genericapiserver/api/filters/doc.go rename to pkg/genericapiserver/endpoints/filters/doc.go diff --git a/pkg/genericapiserver/api/filters/impersonation.go b/pkg/genericapiserver/endpoints/filters/impersonation.go similarity index 100% rename from pkg/genericapiserver/api/filters/impersonation.go rename to pkg/genericapiserver/endpoints/filters/impersonation.go diff --git a/pkg/genericapiserver/api/filters/impersonation_test.go b/pkg/genericapiserver/endpoints/filters/impersonation_test.go similarity index 100% rename from pkg/genericapiserver/api/filters/impersonation_test.go rename to pkg/genericapiserver/endpoints/filters/impersonation_test.go diff --git a/pkg/genericapiserver/api/filters/requestinfo.go b/pkg/genericapiserver/endpoints/filters/requestinfo.go similarity index 100% rename from pkg/genericapiserver/api/filters/requestinfo.go rename to pkg/genericapiserver/endpoints/filters/requestinfo.go diff --git a/pkg/genericapiserver/api/filters/requestinfo_test.go b/pkg/genericapiserver/endpoints/filters/requestinfo_test.go similarity index 100% rename from pkg/genericapiserver/api/filters/requestinfo_test.go rename to pkg/genericapiserver/endpoints/filters/requestinfo_test.go diff --git a/pkg/genericapiserver/api/groupversion.go b/pkg/genericapiserver/endpoints/groupversion.go similarity index 99% rename from pkg/genericapiserver/api/groupversion.go rename to pkg/genericapiserver/endpoints/groupversion.go index 36d4921dfa6..182563f5087 100644 --- a/pkg/genericapiserver/api/groupversion.go +++ b/pkg/genericapiserver/endpoints/groupversion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package api +package endpoints import ( "fmt" diff --git a/pkg/genericapiserver/api/handlers/BUILD b/pkg/genericapiserver/endpoints/handlers/BUILD similarity index 100% rename from pkg/genericapiserver/api/handlers/BUILD rename to pkg/genericapiserver/endpoints/handlers/BUILD diff --git a/pkg/genericapiserver/api/handlers/discovery.go b/pkg/genericapiserver/endpoints/handlers/discovery.go similarity index 100% rename from pkg/genericapiserver/api/handlers/discovery.go rename to pkg/genericapiserver/endpoints/handlers/discovery.go diff --git a/pkg/genericapiserver/api/handlers/doc.go b/pkg/genericapiserver/endpoints/handlers/doc.go similarity index 100% rename from pkg/genericapiserver/api/handlers/doc.go rename to pkg/genericapiserver/endpoints/handlers/doc.go diff --git a/pkg/genericapiserver/api/handlers/patch.go b/pkg/genericapiserver/endpoints/handlers/patch.go similarity index 100% rename from pkg/genericapiserver/api/handlers/patch.go rename to pkg/genericapiserver/endpoints/handlers/patch.go diff --git a/pkg/genericapiserver/api/handlers/proxy.go b/pkg/genericapiserver/endpoints/handlers/proxy.go similarity index 100% rename from pkg/genericapiserver/api/handlers/proxy.go rename to pkg/genericapiserver/endpoints/handlers/proxy.go diff --git a/pkg/genericapiserver/api/handlers/responsewriters/BUILD b/pkg/genericapiserver/endpoints/handlers/responsewriters/BUILD similarity index 100% rename from pkg/genericapiserver/api/handlers/responsewriters/BUILD rename to pkg/genericapiserver/endpoints/handlers/responsewriters/BUILD diff --git a/pkg/genericapiserver/api/handlers/responsewriters/doc.go b/pkg/genericapiserver/endpoints/handlers/responsewriters/doc.go similarity index 100% rename from pkg/genericapiserver/api/handlers/responsewriters/doc.go rename to pkg/genericapiserver/endpoints/handlers/responsewriters/doc.go diff --git a/pkg/genericapiserver/api/handlers/responsewriters/errors.go b/pkg/genericapiserver/endpoints/handlers/responsewriters/errors.go similarity index 100% rename from pkg/genericapiserver/api/handlers/responsewriters/errors.go rename to pkg/genericapiserver/endpoints/handlers/responsewriters/errors.go diff --git a/pkg/genericapiserver/api/handlers/responsewriters/status.go b/pkg/genericapiserver/endpoints/handlers/responsewriters/status.go similarity index 100% rename from pkg/genericapiserver/api/handlers/responsewriters/status.go rename to pkg/genericapiserver/endpoints/handlers/responsewriters/status.go diff --git a/pkg/genericapiserver/api/handlers/responsewriters/status_test.go b/pkg/genericapiserver/endpoints/handlers/responsewriters/status_test.go similarity index 100% rename from pkg/genericapiserver/api/handlers/responsewriters/status_test.go rename to pkg/genericapiserver/endpoints/handlers/responsewriters/status_test.go diff --git a/pkg/genericapiserver/api/handlers/responsewriters/writers.go b/pkg/genericapiserver/endpoints/handlers/responsewriters/writers.go similarity index 100% rename from pkg/genericapiserver/api/handlers/responsewriters/writers.go rename to pkg/genericapiserver/endpoints/handlers/responsewriters/writers.go diff --git a/pkg/genericapiserver/api/handlers/rest.go b/pkg/genericapiserver/endpoints/handlers/rest.go similarity index 100% rename from pkg/genericapiserver/api/handlers/rest.go rename to pkg/genericapiserver/endpoints/handlers/rest.go diff --git a/pkg/genericapiserver/api/handlers/rest_test.go b/pkg/genericapiserver/endpoints/handlers/rest_test.go similarity index 100% rename from pkg/genericapiserver/api/handlers/rest_test.go rename to pkg/genericapiserver/endpoints/handlers/rest_test.go diff --git a/pkg/genericapiserver/api/handlers/watch.go b/pkg/genericapiserver/endpoints/handlers/watch.go similarity index 100% rename from pkg/genericapiserver/api/handlers/watch.go rename to pkg/genericapiserver/endpoints/handlers/watch.go diff --git a/pkg/genericapiserver/api/installer.go b/pkg/genericapiserver/endpoints/installer.go similarity index 99% rename from pkg/genericapiserver/api/installer.go rename to pkg/genericapiserver/endpoints/installer.go index 37f0330b413..c0f94581d76 100644 --- a/pkg/genericapiserver/api/installer.go +++ b/pkg/genericapiserver/endpoints/installer.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package api +package endpoints import ( "bytes" diff --git a/pkg/genericapiserver/api/installer_test.go b/pkg/genericapiserver/endpoints/installer_test.go similarity index 99% rename from pkg/genericapiserver/api/installer_test.go rename to pkg/genericapiserver/endpoints/installer_test.go index 0e032c9973c..74db70e6cbe 100644 --- a/pkg/genericapiserver/api/installer_test.go +++ b/pkg/genericapiserver/endpoints/installer_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package api +package endpoints import ( "bytes" diff --git a/pkg/genericapiserver/api/openapi/BUILD b/pkg/genericapiserver/endpoints/openapi/BUILD similarity index 100% rename from pkg/genericapiserver/api/openapi/BUILD rename to pkg/genericapiserver/endpoints/openapi/BUILD diff --git a/pkg/genericapiserver/api/openapi/OWNERS b/pkg/genericapiserver/endpoints/openapi/OWNERS similarity index 100% rename from pkg/genericapiserver/api/openapi/OWNERS rename to pkg/genericapiserver/endpoints/openapi/OWNERS diff --git a/pkg/genericapiserver/api/openapi/openapi.go b/pkg/genericapiserver/endpoints/openapi/openapi.go similarity index 100% rename from pkg/genericapiserver/api/openapi/openapi.go rename to pkg/genericapiserver/endpoints/openapi/openapi.go diff --git a/pkg/genericapiserver/api/proxy_test.go b/pkg/genericapiserver/endpoints/proxy_test.go similarity index 99% rename from pkg/genericapiserver/api/proxy_test.go rename to pkg/genericapiserver/endpoints/proxy_test.go index dd9b87323c9..448e697d0d5 100644 --- a/pkg/genericapiserver/api/proxy_test.go +++ b/pkg/genericapiserver/endpoints/proxy_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package api +package endpoints import ( "bytes" diff --git a/pkg/genericapiserver/api/testing/BUILD b/pkg/genericapiserver/endpoints/testing/BUILD similarity index 100% rename from pkg/genericapiserver/api/testing/BUILD rename to pkg/genericapiserver/endpoints/testing/BUILD diff --git a/pkg/genericapiserver/api/testing/OWNERS b/pkg/genericapiserver/endpoints/testing/OWNERS similarity index 100% rename from pkg/genericapiserver/api/testing/OWNERS rename to pkg/genericapiserver/endpoints/testing/OWNERS diff --git a/pkg/genericapiserver/api/testing/types.generated.go b/pkg/genericapiserver/endpoints/testing/types.generated.go similarity index 100% rename from pkg/genericapiserver/api/testing/types.generated.go rename to pkg/genericapiserver/endpoints/testing/types.generated.go diff --git a/pkg/genericapiserver/api/testing/types.go b/pkg/genericapiserver/endpoints/testing/types.go similarity index 100% rename from pkg/genericapiserver/api/testing/types.go rename to pkg/genericapiserver/endpoints/testing/types.go diff --git a/pkg/genericapiserver/api/watch_test.go b/pkg/genericapiserver/endpoints/watch_test.go similarity index 99% rename from pkg/genericapiserver/api/watch_test.go rename to pkg/genericapiserver/endpoints/watch_test.go index 159beb2c206..42726c5f020 100644 --- a/pkg/genericapiserver/api/watch_test.go +++ b/pkg/genericapiserver/endpoints/watch_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package api +package endpoints import ( "encoding/json" diff --git a/pkg/genericapiserver/api/doc.go b/pkg/genericapiserver/registry/doc.go similarity index 77% rename from pkg/genericapiserver/api/doc.go rename to pkg/genericapiserver/registry/doc.go index 62be85500cd..1714984bc42 100644 --- a/pkg/genericapiserver/api/doc.go +++ b/pkg/genericapiserver/registry/doc.go @@ -14,5 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package api contains the code that provides a rest.ful api service. -package api // import "k8s.io/kubernetes/pkg/genericapiserver/api" +// Package registry contains the generic implementation of the storage and system logic. +package registry // import "k8s.io/kubernetes/pkg/genericapiserver/registry" diff --git a/pkg/registry/generic/BUILD b/pkg/genericapiserver/registry/generic/BUILD similarity index 100% rename from pkg/registry/generic/BUILD rename to pkg/genericapiserver/registry/generic/BUILD diff --git a/pkg/registry/generic/OWNERS b/pkg/genericapiserver/registry/generic/OWNERS similarity index 100% rename from pkg/registry/generic/OWNERS rename to pkg/genericapiserver/registry/generic/OWNERS diff --git a/pkg/registry/generic/doc.go b/pkg/genericapiserver/registry/generic/doc.go similarity index 100% rename from pkg/registry/generic/doc.go rename to pkg/genericapiserver/registry/generic/doc.go diff --git a/pkg/registry/generic/matcher.go b/pkg/genericapiserver/registry/generic/matcher.go similarity index 100% rename from pkg/registry/generic/matcher.go rename to pkg/genericapiserver/registry/generic/matcher.go diff --git a/pkg/registry/generic/options.go b/pkg/genericapiserver/registry/generic/options.go similarity index 100% rename from pkg/registry/generic/options.go rename to pkg/genericapiserver/registry/generic/options.go diff --git a/pkg/registry/generic/registry/BUILD b/pkg/genericapiserver/registry/generic/registry/BUILD similarity index 100% rename from pkg/registry/generic/registry/BUILD rename to pkg/genericapiserver/registry/generic/registry/BUILD diff --git a/pkg/registry/generic/registry/decorated_watcher.go b/pkg/genericapiserver/registry/generic/registry/decorated_watcher.go similarity index 94% rename from pkg/registry/generic/registry/decorated_watcher.go rename to pkg/genericapiserver/registry/generic/registry/decorated_watcher.go index ba4a64847da..d36b8dfb810 100644 --- a/pkg/registry/generic/registry/decorated_watcher.go +++ b/pkg/genericapiserver/registry/generic/registry/decorated_watcher.go @@ -28,12 +28,12 @@ import ( type decoratedWatcher struct { w watch.Interface - decorator rest.ObjectFunc + decorator ObjectFunc cancel context.CancelFunc resultCh chan watch.Event } -func newDecoratedWatcher(w watch.Interface, decorator rest.ObjectFunc) *decoratedWatcher { +func newDecoratedWatcher(w watch.Interface, decorator ObjectFunc) *decoratedWatcher { ctx, cancel := context.WithCancel(context.Background()) d := &decoratedWatcher{ w: w, diff --git a/pkg/registry/generic/registry/decorated_watcher_test.go b/pkg/genericapiserver/registry/generic/registry/decorated_watcher_test.go similarity index 100% rename from pkg/registry/generic/registry/decorated_watcher_test.go rename to pkg/genericapiserver/registry/generic/registry/decorated_watcher_test.go diff --git a/pkg/registry/generic/registry/doc.go b/pkg/genericapiserver/registry/generic/registry/doc.go similarity index 100% rename from pkg/registry/generic/registry/doc.go rename to pkg/genericapiserver/registry/generic/registry/doc.go diff --git a/pkg/registry/generic/registry/storage_factory.go b/pkg/genericapiserver/registry/generic/registry/storage_factory.go similarity index 100% rename from pkg/registry/generic/registry/storage_factory.go rename to pkg/genericapiserver/registry/generic/registry/storage_factory.go diff --git a/pkg/registry/generic/registry/store.go b/pkg/genericapiserver/registry/generic/registry/store.go similarity index 99% rename from pkg/registry/generic/registry/store.go rename to pkg/genericapiserver/registry/generic/registry/store.go index 37d608a6673..c9ddf55f1d0 100644 --- a/pkg/registry/generic/registry/store.go +++ b/pkg/genericapiserver/registry/generic/registry/store.go @@ -45,6 +45,11 @@ import ( "github.com/golang/glog" ) +// ObjectFunc is a function to act on a given object. An error may be returned +// if the hook cannot be completed. An ObjectFunc may transform the provided +// object. +type ObjectFunc func(obj runtime.Object) error + // Store implements pkg/api/rest.StandardStorage. // It's intended to be embeddable, so that you can implement any // non-generic functions if needed. @@ -105,19 +110,19 @@ type Store struct { // Decorator is intended for integrations that are above storage and // should only be used for specific cases where storage of the value is // not appropriate, since they cannot be watched. - Decorator rest.ObjectFunc + Decorator ObjectFunc // Allows extended behavior during creation, required CreateStrategy rest.RESTCreateStrategy // On create of an object, attempt to run a further operation. - AfterCreate rest.ObjectFunc + AfterCreate ObjectFunc // Allows extended behavior during updates, required UpdateStrategy rest.RESTUpdateStrategy // On update of an object, attempt to run a further operation. - AfterUpdate rest.ObjectFunc + AfterUpdate ObjectFunc // Allows extended behavior during updates, optional DeleteStrategy rest.RESTDeleteStrategy // On deletion of an object, attempt to run a further operation. - AfterDelete rest.ObjectFunc + AfterDelete ObjectFunc // If true, return the object that was deleted. Otherwise, return a generic // success status response. ReturnDeletedObject bool diff --git a/pkg/registry/generic/registry/store_test.go b/pkg/genericapiserver/registry/generic/registry/store_test.go similarity index 100% rename from pkg/registry/generic/registry/store_test.go rename to pkg/genericapiserver/registry/generic/registry/store_test.go diff --git a/pkg/registry/generic/rest/BUILD b/pkg/genericapiserver/registry/generic/rest/BUILD similarity index 100% rename from pkg/registry/generic/rest/BUILD rename to pkg/genericapiserver/registry/generic/rest/BUILD diff --git a/pkg/registry/generic/rest/doc.go b/pkg/genericapiserver/registry/generic/rest/doc.go similarity index 100% rename from pkg/registry/generic/rest/doc.go rename to pkg/genericapiserver/registry/generic/rest/doc.go diff --git a/pkg/registry/generic/rest/proxy.go b/pkg/genericapiserver/registry/generic/rest/proxy.go similarity index 100% rename from pkg/registry/generic/rest/proxy.go rename to pkg/genericapiserver/registry/generic/rest/proxy.go diff --git a/pkg/registry/generic/rest/proxy_test.go b/pkg/genericapiserver/registry/generic/rest/proxy_test.go similarity index 100% rename from pkg/registry/generic/rest/proxy_test.go rename to pkg/genericapiserver/registry/generic/rest/proxy_test.go diff --git a/pkg/registry/generic/rest/response_checker.go b/pkg/genericapiserver/registry/generic/rest/response_checker.go similarity index 100% rename from pkg/registry/generic/rest/response_checker.go rename to pkg/genericapiserver/registry/generic/rest/response_checker.go diff --git a/pkg/registry/generic/rest/response_checker_test.go b/pkg/genericapiserver/registry/generic/rest/response_checker_test.go similarity index 100% rename from pkg/registry/generic/rest/response_checker_test.go rename to pkg/genericapiserver/registry/generic/rest/response_checker_test.go diff --git a/pkg/registry/generic/rest/streamer.go b/pkg/genericapiserver/registry/generic/rest/streamer.go similarity index 100% rename from pkg/registry/generic/rest/streamer.go rename to pkg/genericapiserver/registry/generic/rest/streamer.go diff --git a/pkg/registry/generic/rest/streamer_test.go b/pkg/genericapiserver/registry/generic/rest/streamer_test.go similarity index 100% rename from pkg/registry/generic/rest/streamer_test.go rename to pkg/genericapiserver/registry/generic/rest/streamer_test.go diff --git a/pkg/registry/generic/storage_decorator.go b/pkg/genericapiserver/registry/generic/storage_decorator.go similarity index 100% rename from pkg/registry/generic/storage_decorator.go rename to pkg/genericapiserver/registry/generic/storage_decorator.go diff --git a/pkg/genericapiserver/api/rest/BUILD b/pkg/genericapiserver/registry/rest/BUILD similarity index 100% rename from pkg/genericapiserver/api/rest/BUILD rename to pkg/genericapiserver/registry/rest/BUILD diff --git a/pkg/genericapiserver/api/rest/OWNERS b/pkg/genericapiserver/registry/rest/OWNERS similarity index 100% rename from pkg/genericapiserver/api/rest/OWNERS rename to pkg/genericapiserver/registry/rest/OWNERS diff --git a/pkg/genericapiserver/api/rest/create.go b/pkg/genericapiserver/registry/rest/create.go similarity index 100% rename from pkg/genericapiserver/api/rest/create.go rename to pkg/genericapiserver/registry/rest/create.go diff --git a/pkg/genericapiserver/api/rest/delete.go b/pkg/genericapiserver/registry/rest/delete.go similarity index 100% rename from pkg/genericapiserver/api/rest/delete.go rename to pkg/genericapiserver/registry/rest/delete.go diff --git a/pkg/genericapiserver/api/rest/doc.go b/pkg/genericapiserver/registry/rest/doc.go similarity index 97% rename from pkg/genericapiserver/api/rest/doc.go rename to pkg/genericapiserver/registry/rest/doc.go index ac4e1b736c8..379b9e6b5ea 100644 --- a/pkg/genericapiserver/api/rest/doc.go +++ b/pkg/genericapiserver/registry/rest/doc.go @@ -14,5 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package rest defines common logic around changes to Kubernetes resources. +// Package rest defines common logic around changes to Kubernetes-style resources. package rest // import "k8s.io/kubernetes/pkg/genericapiserver/api/rest" diff --git a/pkg/genericapiserver/api/rest/export.go b/pkg/genericapiserver/registry/rest/export.go similarity index 100% rename from pkg/genericapiserver/api/rest/export.go rename to pkg/genericapiserver/registry/rest/export.go diff --git a/pkg/genericapiserver/api/rest/meta.go b/pkg/genericapiserver/registry/rest/meta.go similarity index 100% rename from pkg/genericapiserver/api/rest/meta.go rename to pkg/genericapiserver/registry/rest/meta.go diff --git a/pkg/genericapiserver/api/rest/meta_test.go b/pkg/genericapiserver/registry/rest/meta_test.go similarity index 100% rename from pkg/genericapiserver/api/rest/meta_test.go rename to pkg/genericapiserver/registry/rest/meta_test.go diff --git a/pkg/genericapiserver/api/rest/rest.go b/pkg/genericapiserver/registry/rest/rest.go similarity index 99% rename from pkg/genericapiserver/api/rest/rest.go rename to pkg/genericapiserver/registry/rest/rest.go index 8b7cfb3f04d..ab47884f34a 100644 --- a/pkg/genericapiserver/api/rest/rest.go +++ b/pkg/genericapiserver/registry/rest/rest.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package rest +package registry import ( "io" diff --git a/pkg/genericapiserver/api/rest/resttest/BUILD b/pkg/genericapiserver/registry/rest/resttest/BUILD similarity index 100% rename from pkg/genericapiserver/api/rest/resttest/BUILD rename to pkg/genericapiserver/registry/rest/resttest/BUILD diff --git a/pkg/genericapiserver/api/rest/resttest/resttest.go b/pkg/genericapiserver/registry/rest/resttest/resttest.go similarity index 100% rename from pkg/genericapiserver/api/rest/resttest/resttest.go rename to pkg/genericapiserver/registry/rest/resttest/resttest.go diff --git a/pkg/genericapiserver/api/rest/update.go b/pkg/genericapiserver/registry/rest/update.go similarity index 100% rename from pkg/genericapiserver/api/rest/update.go rename to pkg/genericapiserver/registry/rest/update.go diff --git a/pkg/genericapiserver/OWNERS b/pkg/genericapiserver/server/OWNERS similarity index 100% rename from pkg/genericapiserver/OWNERS rename to pkg/genericapiserver/server/OWNERS diff --git a/pkg/genericapiserver/config.go b/pkg/genericapiserver/server/config.go similarity index 100% rename from pkg/genericapiserver/config.go rename to pkg/genericapiserver/server/config.go diff --git a/pkg/genericapiserver/config_selfclient.go b/pkg/genericapiserver/server/config_selfclient.go similarity index 100% rename from pkg/genericapiserver/config_selfclient.go rename to pkg/genericapiserver/server/config_selfclient.go diff --git a/pkg/genericapiserver/discovery.go b/pkg/genericapiserver/server/discovery.go similarity index 100% rename from pkg/genericapiserver/discovery.go rename to pkg/genericapiserver/server/discovery.go diff --git a/pkg/genericapiserver/server/doc.go b/pkg/genericapiserver/server/doc.go new file mode 100644 index 00000000000..9aee5ea3edb --- /dev/null +++ b/pkg/genericapiserver/server/doc.go @@ -0,0 +1,23 @@ +/* +Copyright 2015 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 genericapiserver contains code to setup a generic kubernetes-like API server. +// This does not contain any kubernetes API specific code. +// 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. +// For more details: https://github.com/kubernetes/kubernetes/issues/2742 +package genericapiserver // import "k8s.io/kubernetes/pkg/genericapiserver" diff --git a/pkg/genericapiserver/filters/BUILD b/pkg/genericapiserver/server/filters/BUILD similarity index 100% rename from pkg/genericapiserver/filters/BUILD rename to pkg/genericapiserver/server/filters/BUILD diff --git a/pkg/genericapiserver/filters/OWNERS b/pkg/genericapiserver/server/filters/OWNERS similarity index 100% rename from pkg/genericapiserver/filters/OWNERS rename to pkg/genericapiserver/server/filters/OWNERS diff --git a/pkg/genericapiserver/filters/cors.go b/pkg/genericapiserver/server/filters/cors.go similarity index 100% rename from pkg/genericapiserver/filters/cors.go rename to pkg/genericapiserver/server/filters/cors.go diff --git a/pkg/genericapiserver/filters/cors_test.go b/pkg/genericapiserver/server/filters/cors_test.go similarity index 100% rename from pkg/genericapiserver/filters/cors_test.go rename to pkg/genericapiserver/server/filters/cors_test.go diff --git a/pkg/genericapiserver/filters/doc.go b/pkg/genericapiserver/server/filters/doc.go similarity index 100% rename from pkg/genericapiserver/filters/doc.go rename to pkg/genericapiserver/server/filters/doc.go diff --git a/pkg/genericapiserver/filters/longrunning.go b/pkg/genericapiserver/server/filters/longrunning.go similarity index 100% rename from pkg/genericapiserver/filters/longrunning.go rename to pkg/genericapiserver/server/filters/longrunning.go diff --git a/pkg/genericapiserver/filters/maxinflight.go b/pkg/genericapiserver/server/filters/maxinflight.go similarity index 100% rename from pkg/genericapiserver/filters/maxinflight.go rename to pkg/genericapiserver/server/filters/maxinflight.go diff --git a/pkg/genericapiserver/filters/maxinflight_test.go b/pkg/genericapiserver/server/filters/maxinflight_test.go similarity index 100% rename from pkg/genericapiserver/filters/maxinflight_test.go rename to pkg/genericapiserver/server/filters/maxinflight_test.go diff --git a/pkg/genericapiserver/filters/panics.go b/pkg/genericapiserver/server/filters/panics.go similarity index 100% rename from pkg/genericapiserver/filters/panics.go rename to pkg/genericapiserver/server/filters/panics.go diff --git a/pkg/genericapiserver/filters/timeout.go b/pkg/genericapiserver/server/filters/timeout.go similarity index 100% rename from pkg/genericapiserver/filters/timeout.go rename to pkg/genericapiserver/server/filters/timeout.go diff --git a/pkg/genericapiserver/filters/timeout_test.go b/pkg/genericapiserver/server/filters/timeout_test.go similarity index 100% rename from pkg/genericapiserver/filters/timeout_test.go rename to pkg/genericapiserver/server/filters/timeout_test.go diff --git a/pkg/genericapiserver/genericapiserver.go b/pkg/genericapiserver/server/genericapiserver.go similarity index 100% rename from pkg/genericapiserver/genericapiserver.go rename to pkg/genericapiserver/server/genericapiserver.go diff --git a/pkg/genericapiserver/genericapiserver_test.go b/pkg/genericapiserver/server/genericapiserver_test.go similarity index 100% rename from pkg/genericapiserver/genericapiserver_test.go rename to pkg/genericapiserver/server/genericapiserver_test.go diff --git a/pkg/genericapiserver/healthz.go b/pkg/genericapiserver/server/healthz.go similarity index 100% rename from pkg/genericapiserver/healthz.go rename to pkg/genericapiserver/server/healthz.go diff --git a/pkg/genericapiserver/hooks.go b/pkg/genericapiserver/server/hooks.go similarity index 100% rename from pkg/genericapiserver/hooks.go rename to pkg/genericapiserver/server/hooks.go diff --git a/pkg/genericapiserver/mux/BUILD b/pkg/genericapiserver/server/mux/BUILD similarity index 100% rename from pkg/genericapiserver/mux/BUILD rename to pkg/genericapiserver/server/mux/BUILD diff --git a/pkg/genericapiserver/mux/OWNERS b/pkg/genericapiserver/server/mux/OWNERS similarity index 100% rename from pkg/genericapiserver/mux/OWNERS rename to pkg/genericapiserver/server/mux/OWNERS diff --git a/pkg/genericapiserver/mux/container.go b/pkg/genericapiserver/server/mux/container.go similarity index 100% rename from pkg/genericapiserver/mux/container.go rename to pkg/genericapiserver/server/mux/container.go diff --git a/pkg/genericapiserver/mux/container_test.go b/pkg/genericapiserver/server/mux/container_test.go similarity index 100% rename from pkg/genericapiserver/mux/container_test.go rename to pkg/genericapiserver/server/mux/container_test.go diff --git a/pkg/genericapiserver/mux/doc.go b/pkg/genericapiserver/server/mux/doc.go similarity index 100% rename from pkg/genericapiserver/mux/doc.go rename to pkg/genericapiserver/server/mux/doc.go diff --git a/pkg/genericapiserver/mux/pathrecorder.go b/pkg/genericapiserver/server/mux/pathrecorder.go similarity index 100% rename from pkg/genericapiserver/mux/pathrecorder.go rename to pkg/genericapiserver/server/mux/pathrecorder.go diff --git a/pkg/genericapiserver/openapi/BUILD b/pkg/genericapiserver/server/openapi/BUILD similarity index 100% rename from pkg/genericapiserver/openapi/BUILD rename to pkg/genericapiserver/server/openapi/BUILD diff --git a/pkg/genericapiserver/openapi/OWNERS b/pkg/genericapiserver/server/openapi/OWNERS similarity index 100% rename from pkg/genericapiserver/openapi/OWNERS rename to pkg/genericapiserver/server/openapi/OWNERS diff --git a/pkg/genericapiserver/server/openapi/common/.readonly b/pkg/genericapiserver/server/openapi/common/.readonly new file mode 100644 index 00000000000..e69de29bb2d diff --git a/pkg/genericapiserver/server/openapi/common/BUILD b/pkg/genericapiserver/server/openapi/common/BUILD new file mode 100644 index 00000000000..3b0dffdd546 --- /dev/null +++ b/pkg/genericapiserver/server/openapi/common/BUILD @@ -0,0 +1,34 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_library", +) + +go_library( + name = "go_default_library", + srcs = [ + "common.go", + "doc.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/emicklei/go-restful", + "//vendor:github.com/go-openapi/spec", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], +) diff --git a/pkg/genericapiserver/server/openapi/common/common.go b/pkg/genericapiserver/server/openapi/common/common.go new file mode 100644 index 00000000000..d2a80f2e90f --- /dev/null +++ b/pkg/genericapiserver/server/openapi/common/common.go @@ -0,0 +1,143 @@ +/* +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 common + +import ( + "github.com/emicklei/go-restful" + "github.com/go-openapi/spec" +) + +// OpenAPIDefinition describes single type. Normally these definitions are auto-generated using gen-openapi. +type OpenAPIDefinition struct { + Schema spec.Schema + Dependencies []string +} + +// OpenAPIDefinitions is collection of all definitions. +type OpenAPIDefinitions map[string]OpenAPIDefinition + +// OpenAPIDefinitionGetter gets openAPI definitions for a given type. If a type implements this interface, +// the definition returned by it will be used, otherwise the auto-generated definitions will be used. See +// GetOpenAPITypeFormat for more information about trade-offs of using this interface or GetOpenAPITypeFormat method when +// possible. +type OpenAPIDefinitionGetter interface { + OpenAPIDefinition() *OpenAPIDefinition +} + +// Config is set of configuration for openAPI spec generation. +type Config struct { + // List of supported protocols such as https, http, etc. + ProtocolList []string + + // Info is general information about the API. + Info *spec.Info + + // DefaultResponse will be used if an operation does not have any responses listed. It + // will show up as ... "responses" : {"default" : $DefaultResponse} in the spec. + DefaultResponse *spec.Response + + // CommonResponses will be added as a response to all operation specs. This is a good place to add common + // responses such as authorization failed. + CommonResponses map[int]spec.Response + + // List of webservice's path prefixes to ignore + IgnorePrefixes []string + + // OpenAPIDefinitions should provide definition for all models used by routes. Failure to provide this map + // or any of the models will result in spec generation failure. + Definitions *OpenAPIDefinitions + + // GetOperationIDAndTags returns operation id and tags for a restful route. It is an optional function to customize operation IDs. + GetOperationIDAndTags func(servePath string, r *restful.Route) (string, []string, error) + + // SecurityDefinitions is list of all security definitions for OpenAPI service. If this is not nil, the user of config + // is responsible to provide DefaultSecurity and (maybe) add unauthorized response to CommonResponses. + SecurityDefinitions *spec.SecurityDefinitions + + // DefaultSecurity for all operations. This will pass as spec.SwaggerProps.Security to OpenAPI. + // For most cases, this will be list of acceptable definitions in SecurityDefinitions. + DefaultSecurity []map[string][]string +} + +// This function is a reference for converting go (or any custom type) to a simple open API type,format pair. There are +// two ways to customize spec for a type. If you add it here, a type will be converted to a simple type and the type +// comment (the comment that is added before type definition) will be lost. The spec will still have the property +// comment. The second way is to implement OpenAPIDefinitionGetter interface. That function can customize the spec (so +// the spec does not need to be simple type,format) or can even return a simple type,format (e.g. IntOrString). For simple +// type formats, the benefit of adding OpenAPIDefinitionGetter interface is to keep both type and property documentation. +// Example: +// type Sample struct { +// ... +// // port of the server +// port IntOrString +// ... +// } +// // IntOrString documentation... +// type IntOrString { ... } +// +// Adding IntOrString to this function: +// "port" : { +// format: "string", +// type: "int-or-string", +// Description: "port of the server" +// } +// +// Implement OpenAPIDefinitionGetter for IntOrString: +// +// "port" : { +// $Ref: "#/definitions/IntOrString" +// Description: "port of the server" +// } +// ... +// definitions: +// { +// "IntOrString": { +// format: "string", +// type: "int-or-string", +// Description: "IntOrString documentation..." // new +// } +// } +// +func GetOpenAPITypeFormat(typeName string) (string, string) { + schemaTypeFormatMap := map[string][]string{ + "uint": {"integer", "int32"}, + "uint8": {"integer", "byte"}, + "uint16": {"integer", "int32"}, + "uint32": {"integer", "int64"}, + "uint64": {"integer", "int64"}, + "int": {"integer", "int32"}, + "int8": {"integer", "byte"}, + "int16": {"integer", "int32"}, + "int32": {"integer", "int32"}, + "int64": {"integer", "int64"}, + "byte": {"integer", "byte"}, + "float64": {"number", "double"}, + "float32": {"number", "float"}, + "bool": {"boolean", ""}, + "time.Time": {"string", "date-time"}, + "string": {"string", ""}, + "integer": {"integer", ""}, + "number": {"number", ""}, + "boolean": {"boolean", ""}, + "[]byte": {"string", "byte"}, // base64 encoded characters + } + mapped, ok := schemaTypeFormatMap[typeName] + if !ok { + return "", "" + } + return mapped[0], mapped[1] +} diff --git a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/openapi/doc.go b/pkg/genericapiserver/server/openapi/common/doc.go similarity index 83% rename from staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/openapi/doc.go rename to pkg/genericapiserver/server/openapi/common/doc.go index 5ed572cc136..0308d58b4db 100644 --- a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/openapi/doc.go +++ b/pkg/genericapiserver/server/openapi/common/doc.go @@ -14,5 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// package openapi holds shared codes and types between open API code generator and spec generator. -package openapi +// package common holds shared codes and types between open API code generator and spec generator. +package common diff --git a/pkg/genericapiserver/openapi/doc.go b/pkg/genericapiserver/server/openapi/doc.go similarity index 100% rename from pkg/genericapiserver/openapi/doc.go rename to pkg/genericapiserver/server/openapi/doc.go diff --git a/pkg/genericapiserver/openapi/openapi.go b/pkg/genericapiserver/server/openapi/openapi.go similarity index 100% rename from pkg/genericapiserver/openapi/openapi.go rename to pkg/genericapiserver/server/openapi/openapi.go diff --git a/pkg/genericapiserver/openapi/openapi_test.go b/pkg/genericapiserver/server/openapi/openapi_test.go similarity index 100% rename from pkg/genericapiserver/openapi/openapi_test.go rename to pkg/genericapiserver/server/openapi/openapi_test.go diff --git a/pkg/genericapiserver/openapi/util.go b/pkg/genericapiserver/server/openapi/util.go similarity index 100% rename from pkg/genericapiserver/openapi/util.go rename to pkg/genericapiserver/server/openapi/util.go diff --git a/pkg/genericapiserver/options/BUILD b/pkg/genericapiserver/server/options/BUILD similarity index 100% rename from pkg/genericapiserver/options/BUILD rename to pkg/genericapiserver/server/options/BUILD diff --git a/pkg/genericapiserver/options/OWNERS b/pkg/genericapiserver/server/options/OWNERS similarity index 100% rename from pkg/genericapiserver/options/OWNERS rename to pkg/genericapiserver/server/options/OWNERS diff --git a/pkg/genericapiserver/options/authentication.go b/pkg/genericapiserver/server/options/authentication.go similarity index 100% rename from pkg/genericapiserver/options/authentication.go rename to pkg/genericapiserver/server/options/authentication.go diff --git a/pkg/genericapiserver/options/authorization.go b/pkg/genericapiserver/server/options/authorization.go similarity index 100% rename from pkg/genericapiserver/options/authorization.go rename to pkg/genericapiserver/server/options/authorization.go diff --git a/pkg/genericapiserver/options/doc.go b/pkg/genericapiserver/server/options/doc.go similarity index 100% rename from pkg/genericapiserver/options/doc.go rename to pkg/genericapiserver/server/options/doc.go diff --git a/pkg/genericapiserver/options/etcd.go b/pkg/genericapiserver/server/options/etcd.go similarity index 100% rename from pkg/genericapiserver/options/etcd.go rename to pkg/genericapiserver/server/options/etcd.go diff --git a/pkg/genericapiserver/options/server_run_options.go b/pkg/genericapiserver/server/options/server_run_options.go similarity index 100% rename from pkg/genericapiserver/options/server_run_options.go rename to pkg/genericapiserver/server/options/server_run_options.go diff --git a/pkg/genericapiserver/options/serving.go b/pkg/genericapiserver/server/options/serving.go similarity index 100% rename from pkg/genericapiserver/options/serving.go rename to pkg/genericapiserver/server/options/serving.go diff --git a/pkg/genericapiserver/resource_config.go b/pkg/genericapiserver/server/resource_config.go similarity index 100% rename from pkg/genericapiserver/resource_config.go rename to pkg/genericapiserver/server/resource_config.go diff --git a/pkg/genericapiserver/resource_config_test.go b/pkg/genericapiserver/server/resource_config_test.go similarity index 100% rename from pkg/genericapiserver/resource_config_test.go rename to pkg/genericapiserver/server/resource_config_test.go diff --git a/pkg/genericapiserver/resource_encoding_config.go b/pkg/genericapiserver/server/resource_encoding_config.go similarity index 100% rename from pkg/genericapiserver/resource_encoding_config.go rename to pkg/genericapiserver/server/resource_encoding_config.go diff --git a/pkg/genericapiserver/routes/BUILD b/pkg/genericapiserver/server/routes/BUILD similarity index 100% rename from pkg/genericapiserver/routes/BUILD rename to pkg/genericapiserver/server/routes/BUILD diff --git a/pkg/genericapiserver/routes/OWNERS b/pkg/genericapiserver/server/routes/OWNERS similarity index 100% rename from pkg/genericapiserver/routes/OWNERS rename to pkg/genericapiserver/server/routes/OWNERS diff --git a/pkg/genericapiserver/routes/data/README.md b/pkg/genericapiserver/server/routes/data/README.md similarity index 100% rename from pkg/genericapiserver/routes/data/README.md rename to pkg/genericapiserver/server/routes/data/README.md diff --git a/pkg/genericapiserver/routes/data/swagger/BUILD b/pkg/genericapiserver/server/routes/data/swagger/BUILD similarity index 100% rename from pkg/genericapiserver/routes/data/swagger/BUILD rename to pkg/genericapiserver/server/routes/data/swagger/BUILD diff --git a/pkg/genericapiserver/routes/data/swagger/datafile.go b/pkg/genericapiserver/server/routes/data/swagger/datafile.go similarity index 100% rename from pkg/genericapiserver/routes/data/swagger/datafile.go rename to pkg/genericapiserver/server/routes/data/swagger/datafile.go diff --git a/pkg/genericapiserver/routes/doc.go b/pkg/genericapiserver/server/routes/doc.go similarity index 100% rename from pkg/genericapiserver/routes/doc.go rename to pkg/genericapiserver/server/routes/doc.go diff --git a/pkg/genericapiserver/routes/index.go b/pkg/genericapiserver/server/routes/index.go similarity index 100% rename from pkg/genericapiserver/routes/index.go rename to pkg/genericapiserver/server/routes/index.go diff --git a/pkg/genericapiserver/routes/metrics.go b/pkg/genericapiserver/server/routes/metrics.go similarity index 100% rename from pkg/genericapiserver/routes/metrics.go rename to pkg/genericapiserver/server/routes/metrics.go diff --git a/pkg/genericapiserver/routes/openapi.go b/pkg/genericapiserver/server/routes/openapi.go similarity index 100% rename from pkg/genericapiserver/routes/openapi.go rename to pkg/genericapiserver/server/routes/openapi.go diff --git a/pkg/genericapiserver/routes/profiling.go b/pkg/genericapiserver/server/routes/profiling.go similarity index 100% rename from pkg/genericapiserver/routes/profiling.go rename to pkg/genericapiserver/server/routes/profiling.go diff --git a/pkg/genericapiserver/routes/swagger.go b/pkg/genericapiserver/server/routes/swagger.go similarity index 100% rename from pkg/genericapiserver/routes/swagger.go rename to pkg/genericapiserver/server/routes/swagger.go diff --git a/pkg/genericapiserver/routes/swaggerui.go b/pkg/genericapiserver/server/routes/swaggerui.go similarity index 100% rename from pkg/genericapiserver/routes/swaggerui.go rename to pkg/genericapiserver/server/routes/swaggerui.go diff --git a/pkg/genericapiserver/routes/version.go b/pkg/genericapiserver/server/routes/version.go similarity index 100% rename from pkg/genericapiserver/routes/version.go rename to pkg/genericapiserver/server/routes/version.go diff --git a/pkg/genericapiserver/serve.go b/pkg/genericapiserver/server/serve.go similarity index 100% rename from pkg/genericapiserver/serve.go rename to pkg/genericapiserver/server/serve.go diff --git a/pkg/genericapiserver/serve_test.go b/pkg/genericapiserver/server/serve_test.go similarity index 100% rename from pkg/genericapiserver/serve_test.go rename to pkg/genericapiserver/server/serve_test.go diff --git a/pkg/genericapiserver/server_run_options_test.go b/pkg/genericapiserver/server/server_run_options_test.go similarity index 100% rename from pkg/genericapiserver/server_run_options_test.go rename to pkg/genericapiserver/server/server_run_options_test.go diff --git a/pkg/genericapiserver/storage_factory.go b/pkg/genericapiserver/server/storage_factory.go similarity index 100% rename from pkg/genericapiserver/storage_factory.go rename to pkg/genericapiserver/server/storage_factory.go diff --git a/pkg/genericapiserver/storage_factory_test.go b/pkg/genericapiserver/server/storage_factory_test.go similarity index 100% rename from pkg/genericapiserver/storage_factory_test.go rename to pkg/genericapiserver/server/storage_factory_test.go diff --git a/pkg/genericapiserver/validation/OWNERS b/pkg/genericapiserver/validation/OWNERS deleted file mode 100755 index 380f0188091..00000000000 --- a/pkg/genericapiserver/validation/OWNERS +++ /dev/null @@ -1,3 +0,0 @@ -reviewers: -- dims -- ping035627 diff --git a/staging/src/k8s.io/apiserver/pkg/handlers/negotiation/doc.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/doc.go similarity index 89% rename from staging/src/k8s.io/apiserver/pkg/handlers/negotiation/doc.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/doc.go index b03b273ad0c..784d544c04d 100644 --- a/staging/src/k8s.io/apiserver/pkg/handlers/negotiation/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // Package negotation contains media type negotiation logic. -package negotiation // import "k8s.io/apiserver/pkg/handlers/negotiation" +package negotiation // import "k8s.io/apiserver/pkg/api/handlers/negotiation" diff --git a/staging/src/k8s.io/apiserver/pkg/handlers/negotiation/errors.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/errors.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/handlers/negotiation/errors.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/errors.go diff --git a/staging/src/k8s.io/apiserver/pkg/handlers/negotiation/negotiate.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/negotiate.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/handlers/negotiation/negotiate.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/negotiate.go diff --git a/staging/src/k8s.io/apiserver/pkg/handlers/negotiation/negotiate_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/negotiate_test.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/handlers/negotiation/negotiate_test.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/negotiate_test.go diff --git a/staging/src/k8s.io/apiserver/pkg/metrics/OWNERS b/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/OWNERS similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/metrics/OWNERS rename to staging/src/k8s.io/apiserver/pkg/endpoints/metrics/OWNERS diff --git a/staging/src/k8s.io/apiserver/pkg/metrics/metrics.go b/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/metrics/metrics.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go diff --git a/staging/src/k8s.io/apiserver/pkg/request/OWNERS b/staging/src/k8s.io/apiserver/pkg/endpoints/request/OWNERS similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/request/OWNERS rename to staging/src/k8s.io/apiserver/pkg/endpoints/request/OWNERS diff --git a/staging/src/k8s.io/apiserver/pkg/request/context.go b/staging/src/k8s.io/apiserver/pkg/endpoints/request/context.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/request/context.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/request/context.go diff --git a/staging/src/k8s.io/apiserver/pkg/request/context_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/request/context_test.go similarity index 98% rename from staging/src/k8s.io/apiserver/pkg/request/context_test.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/request/context_test.go index 3f8f62e8f12..a6d25bc5f8a 100644 --- a/staging/src/k8s.io/apiserver/pkg/request/context_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/request/context_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apiserver/pkg/authentication/user" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/api/request" "k8s.io/kubernetes/pkg/api" ) diff --git a/staging/src/k8s.io/apiserver/pkg/request/doc.go b/staging/src/k8s.io/apiserver/pkg/endpoints/request/doc.go similarity index 92% rename from staging/src/k8s.io/apiserver/pkg/request/doc.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/request/doc.go index 20436ebb259..2576c52c968 100644 --- a/staging/src/k8s.io/apiserver/pkg/request/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/request/doc.go @@ -17,4 +17,4 @@ limitations under the License. // Package request contains everything around extracting info from // a http request object. // TODO: this package is temporary. Handlers must move into pkg/apiserver/handlers to avoid dependency cycle -package request // import "k8s.io/apiserver/pkg/request" +package request // import "k8s.io/apiserver/pkg/api/request" diff --git a/staging/src/k8s.io/apiserver/pkg/request/requestcontext.go b/staging/src/k8s.io/apiserver/pkg/endpoints/request/requestcontext.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/request/requestcontext.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/request/requestcontext.go diff --git a/staging/src/k8s.io/apiserver/pkg/request/requestinfo.go b/staging/src/k8s.io/apiserver/pkg/endpoints/request/requestinfo.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/request/requestinfo.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/request/requestinfo.go diff --git a/staging/src/k8s.io/apiserver/pkg/request/requestinfo_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/request/requestinfo_test.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/request/requestinfo_test.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/request/requestinfo_test.go diff --git a/staging/src/k8s.io/apiserver/pkg/server/doc.go b/staging/src/k8s.io/apiserver/pkg/server/doc.go new file mode 100644 index 00000000000..b61ec1f5bba --- /dev/null +++ b/staging/src/k8s.io/apiserver/pkg/server/doc.go @@ -0,0 +1,18 @@ +/* +Copyright 2015 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 server contains the plumbing to create kubernetes-like API server command. +package server // import "k8s.io/kubernetes/pkg/genericapiserver/server" diff --git a/staging/src/k8s.io/apiserver/pkg/healthz/doc.go b/staging/src/k8s.io/apiserver/pkg/server/healthz/doc.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/healthz/doc.go rename to staging/src/k8s.io/apiserver/pkg/server/healthz/doc.go diff --git a/staging/src/k8s.io/apiserver/pkg/healthz/healthz.go b/staging/src/k8s.io/apiserver/pkg/server/healthz/healthz.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/healthz/healthz.go rename to staging/src/k8s.io/apiserver/pkg/server/healthz/healthz.go diff --git a/staging/src/k8s.io/apiserver/pkg/healthz/healthz_test.go b/staging/src/k8s.io/apiserver/pkg/server/healthz/healthz_test.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/healthz/healthz_test.go rename to staging/src/k8s.io/apiserver/pkg/server/healthz/healthz_test.go diff --git a/staging/src/k8s.io/apiserver/pkg/httplog/doc.go b/staging/src/k8s.io/apiserver/pkg/server/httplog/doc.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/httplog/doc.go rename to staging/src/k8s.io/apiserver/pkg/server/httplog/doc.go diff --git a/staging/src/k8s.io/apiserver/pkg/httplog/log.go b/staging/src/k8s.io/apiserver/pkg/server/httplog/log.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/httplog/log.go rename to staging/src/k8s.io/apiserver/pkg/server/httplog/log.go diff --git a/staging/src/k8s.io/apiserver/pkg/httplog/log_test.go b/staging/src/k8s.io/apiserver/pkg/server/httplog/log_test.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/httplog/log_test.go rename to staging/src/k8s.io/apiserver/pkg/server/httplog/log_test.go diff --git a/staging/src/k8s.io/apiserver/pkg/webhook/webhook.go b/staging/src/k8s.io/apiserver/pkg/util/webhook/webhook.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/webhook/webhook.go rename to staging/src/k8s.io/apiserver/pkg/util/webhook/webhook.go