diff --git a/federation/cmd/federation-apiserver/app/extensions.go b/federation/cmd/federation-apiserver/app/extensions.go index 68ad20a5c67..dbbc0ebba7b 100644 --- a/federation/cmd/federation-apiserver/app/extensions.go +++ b/federation/cmd/federation-apiserver/app/extensions.go @@ -25,8 +25,8 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" _ "k8s.io/kubernetes/pkg/apis/extensions/install" "k8s.io/kubernetes/pkg/genericapiserver" - ingressetcd "k8s.io/kubernetes/pkg/registry/ingress/etcd" - replicasetetcd "k8s.io/kubernetes/pkg/registry/replicaset/etcd" + ingressetcd "k8s.io/kubernetes/pkg/registry/extensions/ingress/etcd" + replicasetetcd "k8s.io/kubernetes/pkg/registry/extensions/replicaset/etcd" ) func installExtensionsAPIs(s *options.ServerRunOptions, g *genericapiserver.GenericAPIServer, f genericapiserver.StorageFactory) { diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index f8eac0a8012..69ecff26a11 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/pkg/kubectl/cmd/util/factory.go @@ -61,7 +61,7 @@ import ( "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/resource" "k8s.io/kubernetes/pkg/labels" - "k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata" + "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/serializer/json" utilflag "k8s.io/kubernetes/pkg/util/flag" diff --git a/pkg/master/master.go b/pkg/master/master.go index 7521cc6a54f..0585b8aa952 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -61,6 +61,8 @@ import ( "k8s.io/kubernetes/pkg/registry/endpoint" endpointsetcd "k8s.io/kubernetes/pkg/registry/endpoint/etcd" eventetcd "k8s.io/kubernetes/pkg/registry/event/etcd" + "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" + thirdpartyresourcedataetcd "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata/etcd" "k8s.io/kubernetes/pkg/registry/generic" limitrangeetcd "k8s.io/kubernetes/pkg/registry/limitrange/etcd" "k8s.io/kubernetes/pkg/registry/namespace" @@ -82,8 +84,6 @@ import ( ipallocator "k8s.io/kubernetes/pkg/registry/service/ipallocator" "k8s.io/kubernetes/pkg/registry/service/portallocator" serviceaccountetcd "k8s.io/kubernetes/pkg/registry/serviceaccount/etcd" - "k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata" - thirdpartyresourcedataetcd "k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata/etcd" "k8s.io/kubernetes/pkg/routes" "k8s.io/kubernetes/pkg/runtime" etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util" diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index a3163ea7eff..357f632642b 100644 --- a/pkg/master/master_test.go +++ b/pkg/master/master_test.go @@ -51,11 +51,11 @@ import ( "k8s.io/kubernetes/pkg/genericapiserver" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/endpoint" + "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/namespace" "k8s.io/kubernetes/pkg/registry/registrytest" ipallocator "k8s.io/kubernetes/pkg/registry/service/ipallocator" - "k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/storage" "k8s.io/kubernetes/pkg/storage/etcd/etcdtest" diff --git a/pkg/master/storage_extensions.go b/pkg/master/storage_extensions.go index ddba6cda84d..bf1c4fbd7da 100644 --- a/pkg/master/storage_extensions.go +++ b/pkg/master/storage_extensions.go @@ -28,14 +28,14 @@ import ( "k8s.io/kubernetes/pkg/genericapiserver" horizontalpodautoscaleretcd "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/etcd" jobetcd "k8s.io/kubernetes/pkg/registry/batch/job/etcd" - daemonetcd "k8s.io/kubernetes/pkg/registry/daemonset/etcd" - deploymentetcd "k8s.io/kubernetes/pkg/registry/deployment/etcd" - expcontrolleretcd "k8s.io/kubernetes/pkg/registry/experimental/controller/etcd" - ingressetcd "k8s.io/kubernetes/pkg/registry/ingress/etcd" - networkpolicyetcd "k8s.io/kubernetes/pkg/registry/networkpolicy/etcd" - pspetcd "k8s.io/kubernetes/pkg/registry/podsecuritypolicy/etcd" - replicasetetcd "k8s.io/kubernetes/pkg/registry/replicaset/etcd" - thirdpartyresourceetcd "k8s.io/kubernetes/pkg/registry/thirdpartyresource/etcd" + expcontrolleretcd "k8s.io/kubernetes/pkg/registry/extensions/controller/etcd" + daemonetcd "k8s.io/kubernetes/pkg/registry/extensions/daemonset/etcd" + deploymentetcd "k8s.io/kubernetes/pkg/registry/extensions/deployment/etcd" + ingressetcd "k8s.io/kubernetes/pkg/registry/extensions/ingress/etcd" + networkpolicyetcd "k8s.io/kubernetes/pkg/registry/extensions/networkpolicy/etcd" + pspetcd "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy/etcd" + replicasetetcd "k8s.io/kubernetes/pkg/registry/extensions/replicaset/etcd" + thirdpartyresourceetcd "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresource/etcd" "k8s.io/kubernetes/pkg/util/wait" ) diff --git a/pkg/master/thirdparty_controller.go b/pkg/master/thirdparty_controller.go index defd84ab3c6..b6069b83e01 100644 --- a/pkg/master/thirdparty_controller.go +++ b/pkg/master/thirdparty_controller.go @@ -24,8 +24,8 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" expapi "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apiserver" - thirdpartyresourceetcd "k8s.io/kubernetes/pkg/registry/thirdpartyresource/etcd" - "k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata" + thirdpartyresourceetcd "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresource/etcd" + "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/sets" ) diff --git a/pkg/master/thirdparty_controller_test.go b/pkg/master/thirdparty_controller_test.go index 77126ea0acf..b9fa661a3e8 100644 --- a/pkg/master/thirdparty_controller_test.go +++ b/pkg/master/thirdparty_controller_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/api" expapi "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata" + "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" "k8s.io/kubernetes/pkg/util/sets" ) diff --git a/pkg/registry/experimental/controller/etcd/etcd.go b/pkg/registry/extensions/controller/etcd/etcd.go similarity index 100% rename from pkg/registry/experimental/controller/etcd/etcd.go rename to pkg/registry/extensions/controller/etcd/etcd.go diff --git a/pkg/registry/experimental/controller/etcd/etcd_test.go b/pkg/registry/extensions/controller/etcd/etcd_test.go similarity index 100% rename from pkg/registry/experimental/controller/etcd/etcd_test.go rename to pkg/registry/extensions/controller/etcd/etcd_test.go diff --git a/pkg/registry/daemonset/doc.go b/pkg/registry/extensions/daemonset/doc.go similarity index 89% rename from pkg/registry/daemonset/doc.go rename to pkg/registry/extensions/daemonset/doc.go index fbf26239974..58b76e19c62 100644 --- a/pkg/registry/daemonset/doc.go +++ b/pkg/registry/extensions/daemonset/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package daemonset provides Registry interface and its RESTStorage // implementation for storing DaemonSet api objects. -package daemonset // import "k8s.io/kubernetes/pkg/registry/daemonset" +package daemonset // import "k8s.io/kubernetes/pkg/registry/extensions/daemonset" diff --git a/pkg/registry/daemonset/etcd/etcd.go b/pkg/registry/extensions/daemonset/etcd/etcd.go similarity index 98% rename from pkg/registry/daemonset/etcd/etcd.go rename to pkg/registry/extensions/daemonset/etcd/etcd.go index d72e100b830..a461c045787 100644 --- a/pkg/registry/daemonset/etcd/etcd.go +++ b/pkg/registry/extensions/daemonset/etcd/etcd.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/registry/cachesize" - "k8s.io/kubernetes/pkg/registry/daemonset" + "k8s.io/kubernetes/pkg/registry/extensions/daemonset" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/registry/daemonset/etcd/etcd_test.go b/pkg/registry/extensions/daemonset/etcd/etcd_test.go similarity index 100% rename from pkg/registry/daemonset/etcd/etcd_test.go rename to pkg/registry/extensions/daemonset/etcd/etcd_test.go diff --git a/pkg/registry/daemonset/strategy.go b/pkg/registry/extensions/daemonset/strategy.go similarity index 100% rename from pkg/registry/daemonset/strategy.go rename to pkg/registry/extensions/daemonset/strategy.go diff --git a/pkg/registry/daemonset/strategy_test.go b/pkg/registry/extensions/daemonset/strategy_test.go similarity index 100% rename from pkg/registry/daemonset/strategy_test.go rename to pkg/registry/extensions/daemonset/strategy_test.go diff --git a/pkg/registry/deployment/doc.go b/pkg/registry/extensions/deployment/doc.go similarity index 87% rename from pkg/registry/deployment/doc.go rename to pkg/registry/extensions/deployment/doc.go index 16a56ab47b7..b02b5d53d61 100644 --- a/pkg/registry/deployment/doc.go +++ b/pkg/registry/extensions/deployment/doc.go @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. */ -package deployment // import "k8s.io/kubernetes/pkg/registry/deployment" +package deployment // import "k8s.io/kubernetes/pkg/registry/extensions/deployment" diff --git a/pkg/registry/deployment/etcd/etcd.go b/pkg/registry/extensions/deployment/etcd/etcd.go similarity index 99% rename from pkg/registry/deployment/etcd/etcd.go rename to pkg/registry/extensions/deployment/etcd/etcd.go index 2b46a602eaa..52d3caf8722 100644 --- a/pkg/registry/deployment/etcd/etcd.go +++ b/pkg/registry/extensions/deployment/etcd/etcd.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/registry/cachesize" - "k8s.io/kubernetes/pkg/registry/deployment" + "k8s.io/kubernetes/pkg/registry/extensions/deployment" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/registry/deployment/etcd/etcd_test.go b/pkg/registry/extensions/deployment/etcd/etcd_test.go similarity index 100% rename from pkg/registry/deployment/etcd/etcd_test.go rename to pkg/registry/extensions/deployment/etcd/etcd_test.go diff --git a/pkg/registry/deployment/registry.go b/pkg/registry/extensions/deployment/registry.go similarity index 100% rename from pkg/registry/deployment/registry.go rename to pkg/registry/extensions/deployment/registry.go diff --git a/pkg/registry/deployment/strategy.go b/pkg/registry/extensions/deployment/strategy.go similarity index 100% rename from pkg/registry/deployment/strategy.go rename to pkg/registry/extensions/deployment/strategy.go diff --git a/pkg/registry/deployment/strategy_test.go b/pkg/registry/extensions/deployment/strategy_test.go similarity index 100% rename from pkg/registry/deployment/strategy_test.go rename to pkg/registry/extensions/deployment/strategy_test.go diff --git a/pkg/registry/ingress/doc.go b/pkg/registry/extensions/ingress/doc.go similarity index 87% rename from pkg/registry/ingress/doc.go rename to pkg/registry/extensions/ingress/doc.go index d08333e2b8e..b8c38ed3854 100644 --- a/pkg/registry/ingress/doc.go +++ b/pkg/registry/extensions/ingress/doc.go @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ingress // import "k8s.io/kubernetes/pkg/registry/ingress" +package ingress // import "k8s.io/kubernetes/pkg/registry/extensions/ingress" diff --git a/pkg/registry/ingress/etcd/etcd.go b/pkg/registry/extensions/ingress/etcd/etcd.go similarity index 98% rename from pkg/registry/ingress/etcd/etcd.go rename to pkg/registry/extensions/ingress/etcd/etcd.go index e258a51bdc5..726c87d80cd 100644 --- a/pkg/registry/ingress/etcd/etcd.go +++ b/pkg/registry/extensions/ingress/etcd/etcd.go @@ -21,9 +21,9 @@ import ( "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/registry/cachesize" + ingress "k8s.io/kubernetes/pkg/registry/extensions/ingress" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" - ingress "k8s.io/kubernetes/pkg/registry/ingress" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/ingress/etcd/etcd_test.go b/pkg/registry/extensions/ingress/etcd/etcd_test.go similarity index 100% rename from pkg/registry/ingress/etcd/etcd_test.go rename to pkg/registry/extensions/ingress/etcd/etcd_test.go diff --git a/pkg/registry/ingress/strategy.go b/pkg/registry/extensions/ingress/strategy.go similarity index 100% rename from pkg/registry/ingress/strategy.go rename to pkg/registry/extensions/ingress/strategy.go diff --git a/pkg/registry/ingress/strategy_test.go b/pkg/registry/extensions/ingress/strategy_test.go similarity index 100% rename from pkg/registry/ingress/strategy_test.go rename to pkg/registry/extensions/ingress/strategy_test.go diff --git a/pkg/registry/networkpolicy/doc.go b/pkg/registry/extensions/networkpolicy/doc.go similarity index 96% rename from pkg/registry/networkpolicy/doc.go rename to pkg/registry/extensions/networkpolicy/doc.go index f675b88d92a..fb5ea65fd03 100644 --- a/pkg/registry/networkpolicy/doc.go +++ b/pkg/registry/extensions/networkpolicy/doc.go @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. */ -package networkpolicy // import "k8s.io/kubernetes/pkg/registry/networkpolicy" +package networkpolicy // import "k8s.io/kubernetes/pkg/registry/extensions/networkpolicy" diff --git a/pkg/registry/networkpolicy/etcd/etcd.go b/pkg/registry/extensions/networkpolicy/etcd/etcd.go similarity index 98% rename from pkg/registry/networkpolicy/etcd/etcd.go rename to pkg/registry/extensions/networkpolicy/etcd/etcd.go index 496a298dad8..a91b1fffe37 100644 --- a/pkg/registry/networkpolicy/etcd/etcd.go +++ b/pkg/registry/extensions/networkpolicy/etcd/etcd.go @@ -20,9 +20,9 @@ import ( "k8s.io/kubernetes/pkg/api" extensionsapi "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/registry/cachesize" + "k8s.io/kubernetes/pkg/registry/extensions/networkpolicy" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" - "k8s.io/kubernetes/pkg/registry/networkpolicy" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/networkpolicy/etcd/etcd_test.go b/pkg/registry/extensions/networkpolicy/etcd/etcd_test.go similarity index 100% rename from pkg/registry/networkpolicy/etcd/etcd_test.go rename to pkg/registry/extensions/networkpolicy/etcd/etcd_test.go diff --git a/pkg/registry/networkpolicy/strategy.go b/pkg/registry/extensions/networkpolicy/strategy.go similarity index 100% rename from pkg/registry/networkpolicy/strategy.go rename to pkg/registry/extensions/networkpolicy/strategy.go diff --git a/pkg/registry/networkpolicy/strategy_test.go b/pkg/registry/extensions/networkpolicy/strategy_test.go similarity index 100% rename from pkg/registry/networkpolicy/strategy_test.go rename to pkg/registry/extensions/networkpolicy/strategy_test.go diff --git a/pkg/registry/podsecuritypolicy/doc.go b/pkg/registry/extensions/podsecuritypolicy/doc.go similarity index 95% rename from pkg/registry/podsecuritypolicy/doc.go rename to pkg/registry/extensions/podsecuritypolicy/doc.go index 09cc2eeae89..0768815dfaa 100644 --- a/pkg/registry/podsecuritypolicy/doc.go +++ b/pkg/registry/extensions/podsecuritypolicy/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package podsecuritypolicy provides Registry interface and its REST // implementation for storing PodSecurityPolicy api objects. -package podsecuritypolicy // import "k8s.io/kubernetes/pkg/registry/podsecuritypolicy" +package podsecuritypolicy // import "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy" diff --git a/pkg/registry/podsecuritypolicy/etcd/etcd.go b/pkg/registry/extensions/podsecuritypolicy/etcd/etcd.go similarity index 97% rename from pkg/registry/podsecuritypolicy/etcd/etcd.go rename to pkg/registry/extensions/podsecuritypolicy/etcd/etcd.go index 49d8b09504a..7ab6cb4d905 100644 --- a/pkg/registry/podsecuritypolicy/etcd/etcd.go +++ b/pkg/registry/extensions/podsecuritypolicy/etcd/etcd.go @@ -20,9 +20,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/registry/cachesize" + "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" - "k8s.io/kubernetes/pkg/registry/podsecuritypolicy" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/podsecuritypolicy/etcd/etcd_test.go b/pkg/registry/extensions/podsecuritypolicy/etcd/etcd_test.go similarity index 100% rename from pkg/registry/podsecuritypolicy/etcd/etcd_test.go rename to pkg/registry/extensions/podsecuritypolicy/etcd/etcd_test.go diff --git a/pkg/registry/podsecuritypolicy/strategy.go b/pkg/registry/extensions/podsecuritypolicy/strategy.go similarity index 100% rename from pkg/registry/podsecuritypolicy/strategy.go rename to pkg/registry/extensions/podsecuritypolicy/strategy.go diff --git a/pkg/registry/replicaset/doc.go b/pkg/registry/extensions/replicaset/doc.go similarity index 89% rename from pkg/registry/replicaset/doc.go rename to pkg/registry/extensions/replicaset/doc.go index 10d157805ad..55238408404 100644 --- a/pkg/registry/replicaset/doc.go +++ b/pkg/registry/extensions/replicaset/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package replicaset provides Registry interface and it's RESTStorage // implementation for storing ReplicaSet api objects. -package replicaset // import "k8s.io/kubernetes/pkg/registry/replicaset" +package replicaset // import "k8s.io/kubernetes/pkg/registry/extensions/replicaset" diff --git a/pkg/registry/replicaset/etcd/etcd.go b/pkg/registry/extensions/replicaset/etcd/etcd.go similarity index 99% rename from pkg/registry/replicaset/etcd/etcd.go rename to pkg/registry/extensions/replicaset/etcd/etcd.go index b6e5c4a6f23..bb4f3b445f5 100644 --- a/pkg/registry/replicaset/etcd/etcd.go +++ b/pkg/registry/extensions/replicaset/etcd/etcd.go @@ -27,9 +27,9 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/registry/cachesize" + "k8s.io/kubernetes/pkg/registry/extensions/replicaset" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" - "k8s.io/kubernetes/pkg/registry/replicaset" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/replicaset/etcd/etcd_test.go b/pkg/registry/extensions/replicaset/etcd/etcd_test.go similarity index 100% rename from pkg/registry/replicaset/etcd/etcd_test.go rename to pkg/registry/extensions/replicaset/etcd/etcd_test.go diff --git a/pkg/registry/replicaset/registry.go b/pkg/registry/extensions/replicaset/registry.go similarity index 100% rename from pkg/registry/replicaset/registry.go rename to pkg/registry/extensions/replicaset/registry.go diff --git a/pkg/registry/replicaset/strategy.go b/pkg/registry/extensions/replicaset/strategy.go similarity index 100% rename from pkg/registry/replicaset/strategy.go rename to pkg/registry/extensions/replicaset/strategy.go diff --git a/pkg/registry/replicaset/strategy_test.go b/pkg/registry/extensions/replicaset/strategy_test.go similarity index 100% rename from pkg/registry/replicaset/strategy_test.go rename to pkg/registry/extensions/replicaset/strategy_test.go diff --git a/pkg/registry/thirdpartyresource/doc.go b/pkg/registry/extensions/thirdpartyresource/doc.go similarity index 95% rename from pkg/registry/thirdpartyresource/doc.go rename to pkg/registry/extensions/thirdpartyresource/doc.go index 618bb795022..5cfaf25637b 100644 --- a/pkg/registry/thirdpartyresource/doc.go +++ b/pkg/registry/extensions/thirdpartyresource/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package thirdpartyresource provides Registry interface and its REST // implementation for storing ThirdPartyResource api objects. -package thirdpartyresource // import "k8s.io/kubernetes/pkg/registry/thirdpartyresource" +package thirdpartyresource // import "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresource" diff --git a/pkg/registry/thirdpartyresource/etcd/etcd.go b/pkg/registry/extensions/thirdpartyresource/etcd/etcd.go similarity index 97% rename from pkg/registry/thirdpartyresource/etcd/etcd.go rename to pkg/registry/extensions/thirdpartyresource/etcd/etcd.go index 21fae8bb6b1..9dc019d0d52 100644 --- a/pkg/registry/thirdpartyresource/etcd/etcd.go +++ b/pkg/registry/extensions/thirdpartyresource/etcd/etcd.go @@ -19,9 +19,9 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" + "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresource" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" - "k8s.io/kubernetes/pkg/registry/thirdpartyresource" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/registry/thirdpartyresource/etcd/etcd_test.go b/pkg/registry/extensions/thirdpartyresource/etcd/etcd_test.go similarity index 100% rename from pkg/registry/thirdpartyresource/etcd/etcd_test.go rename to pkg/registry/extensions/thirdpartyresource/etcd/etcd_test.go diff --git a/pkg/registry/thirdpartyresource/strategy.go b/pkg/registry/extensions/thirdpartyresource/strategy.go similarity index 100% rename from pkg/registry/thirdpartyresource/strategy.go rename to pkg/registry/extensions/thirdpartyresource/strategy.go diff --git a/pkg/registry/thirdpartyresource/strategy_test.go b/pkg/registry/extensions/thirdpartyresource/strategy_test.go similarity index 100% rename from pkg/registry/thirdpartyresource/strategy_test.go rename to pkg/registry/extensions/thirdpartyresource/strategy_test.go diff --git a/pkg/registry/thirdpartyresourcedata/codec.go b/pkg/registry/extensions/thirdpartyresourcedata/codec.go similarity index 100% rename from pkg/registry/thirdpartyresourcedata/codec.go rename to pkg/registry/extensions/thirdpartyresourcedata/codec.go diff --git a/pkg/registry/thirdpartyresourcedata/codec_test.go b/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go similarity index 100% rename from pkg/registry/thirdpartyresourcedata/codec_test.go rename to pkg/registry/extensions/thirdpartyresourcedata/codec_test.go diff --git a/pkg/registry/thirdpartyresourcedata/doc.go b/pkg/registry/extensions/thirdpartyresourcedata/doc.go similarity index 94% rename from pkg/registry/thirdpartyresourcedata/doc.go rename to pkg/registry/extensions/thirdpartyresourcedata/doc.go index 22ce5edd5fd..c5555ce4fed 100644 --- a/pkg/registry/thirdpartyresourcedata/doc.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package thirdpartyresourcedata provides Registry interface and its REST // implementation for storing ThirdPartyResourceData api objects. -package thirdpartyresourcedata // import "k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata" +package thirdpartyresourcedata // import "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" diff --git a/pkg/registry/thirdpartyresourcedata/etcd/etcd.go b/pkg/registry/extensions/thirdpartyresourcedata/etcd/etcd.go similarity index 97% rename from pkg/registry/thirdpartyresourcedata/etcd/etcd.go rename to pkg/registry/extensions/thirdpartyresourcedata/etcd/etcd.go index 21a803a0f28..609299eb961 100644 --- a/pkg/registry/thirdpartyresourcedata/etcd/etcd.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/etcd/etcd.go @@ -21,9 +21,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" + "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" - "k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/registry/thirdpartyresourcedata/etcd/etcd_test.go b/pkg/registry/extensions/thirdpartyresourcedata/etcd/etcd_test.go similarity index 100% rename from pkg/registry/thirdpartyresourcedata/etcd/etcd_test.go rename to pkg/registry/extensions/thirdpartyresourcedata/etcd/etcd_test.go diff --git a/pkg/registry/thirdpartyresourcedata/registry.go b/pkg/registry/extensions/thirdpartyresourcedata/registry.go similarity index 100% rename from pkg/registry/thirdpartyresourcedata/registry.go rename to pkg/registry/extensions/thirdpartyresourcedata/registry.go diff --git a/pkg/registry/thirdpartyresourcedata/strategy.go b/pkg/registry/extensions/thirdpartyresourcedata/strategy.go similarity index 100% rename from pkg/registry/thirdpartyresourcedata/strategy.go rename to pkg/registry/extensions/thirdpartyresourcedata/strategy.go diff --git a/pkg/registry/thirdpartyresourcedata/strategy_test.go b/pkg/registry/extensions/thirdpartyresourcedata/strategy_test.go similarity index 100% rename from pkg/registry/thirdpartyresourcedata/strategy_test.go rename to pkg/registry/extensions/thirdpartyresourcedata/strategy_test.go diff --git a/pkg/registry/thirdpartyresourcedata/util.go b/pkg/registry/extensions/thirdpartyresourcedata/util.go similarity index 100% rename from pkg/registry/thirdpartyresourcedata/util.go rename to pkg/registry/extensions/thirdpartyresourcedata/util.go diff --git a/pkg/registry/thirdpartyresourcedata/util_test.go b/pkg/registry/extensions/thirdpartyresourcedata/util_test.go similarity index 100% rename from pkg/registry/thirdpartyresourcedata/util_test.go rename to pkg/registry/extensions/thirdpartyresourcedata/util_test.go