github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-27 20:42:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33169 from deads2k/api-12-move-groups

Browse Source 
Automatic merge from submit-queue

move registry packages for all API groups

This continues the pattern of `registry/<group>/resource` for our backing storage.  This entire pull is nothing but moves.  I'll reswizzle the actual storage next, but these are cargo-culted everywhere, so I want to lay this down early.

@sttts @ncdc
This commit is contained in:
Kubernetes Submit Queue 2016-09-22 00:51:59 -07:00 committed by GitHub
commit e115a4282d
213 changed files with 167 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/examples_test.go
View File

@ -35,7 +35,7 @@ import (
"k8s.io/kubernetes/pkg/apis/extensions"
expvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation"
"k8s.io/kubernetes/pkg/capabilities"
"k8s.io/kubernetes/pkg/registry/job"
"k8s.io/kubernetes/pkg/registry/batch/job"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/types"
"k8s.io/kubernetes/pkg/util/validation/field"

8
federation/cmd/federation-apiserver/app/core.go
View File

@ -34,10 +34,10 @@ import (
"k8s.io/kubernetes/pkg/api/rest"
"k8s.io/kubernetes/pkg/apimachinery/registered"
"k8s.io/kubernetes/pkg/genericapiserver"
eventetcd "k8s.io/kubernetes/pkg/registry/event/etcd"
namespaceetcd "k8s.io/kubernetes/pkg/registry/namespace/etcd"
secretetcd "k8s.io/kubernetes/pkg/registry/secret/etcd"
serviceetcd "k8s.io/kubernetes/pkg/registry/service/etcd"
eventetcd "k8s.io/kubernetes/pkg/registry/core/event/etcd"
namespaceetcd "k8s.io/kubernetes/pkg/registry/core/namespace/etcd"
secretetcd "k8s.io/kubernetes/pkg/registry/core/secret/etcd"
serviceetcd "k8s.io/kubernetes/pkg/registry/core/service/etcd"
)
func installCoreAPIs(s *options.ServerRunOptions, g *genericapiserver.GenericAPIServer, f genericapiserver.StorageFactory) {

4
federation/cmd/federation-apiserver/app/extensions.go
View File

@ -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) {

11
hack/.linted_packages
View File

@ -129,7 +129,18 @@ pkg/registry/authorization/util
pkg/registry/clusterrole/etcd
pkg/registry/clusterrolebinding/etcd
pkg/registry/configmap/etcd
pkg/registry/core/configmap/etcd
pkg/registry/core/endpoint
pkg/registry/core/node/rest
pkg/registry/core/pod/etcd
pkg/registry/core/rangeallocation
pkg/registry/core/service/ipallocator/controller
pkg/registry/core/service/ipallocator/etcd
pkg/registry/core/serviceaccount
pkg/registry/endpoint
pkg/registry/extensions/podsecuritypolicy/etcd
pkg/registry/extensions/thirdpartyresource
pkg/registry/extensions/thirdpartyresource/etcd
pkg/registry/node/rest
pkg/registry/pod/etcd
pkg/registry/podsecuritypolicy/etcd

8
pkg/controller/serviceaccount/tokengetter.go
View File

@ -19,11 +19,11 @@ package serviceaccount
import (
"k8s.io/kubernetes/pkg/api"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
"k8s.io/kubernetes/pkg/registry/core/secret"
secretetcd "k8s.io/kubernetes/pkg/registry/core/secret/etcd"
serviceaccountregistry "k8s.io/kubernetes/pkg/registry/core/serviceaccount"
serviceaccountetcd "k8s.io/kubernetes/pkg/registry/core/serviceaccount/etcd"
"k8s.io/kubernetes/pkg/registry/generic"
"k8s.io/kubernetes/pkg/registry/secret"
secretetcd "k8s.io/kubernetes/pkg/registry/secret/etcd"
serviceaccountregistry "k8s.io/kubernetes/pkg/registry/serviceaccount"
serviceaccountetcd "k8s.io/kubernetes/pkg/registry/serviceaccount/etcd"
"k8s.io/kubernetes/pkg/serviceaccount"
"k8s.io/kubernetes/pkg/storage/storagebackend"
)

2
pkg/controller/serviceaccount/tokens_controller.go
View File

@ -28,7 +28,7 @@ import (
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/registry/secret"
"k8s.io/kubernetes/pkg/registry/core/secret"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/serviceaccount"
"k8s.io/kubernetes/pkg/types"

2
pkg/genericapiserver/config.go
View File

@ -45,9 +45,9 @@ import (
"k8s.io/kubernetes/pkg/genericapiserver/options"
"k8s.io/kubernetes/pkg/genericapiserver/routes"
genericvalidation "k8s.io/kubernetes/pkg/genericapiserver/validation"
ipallocator "k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
"k8s.io/kubernetes/pkg/registry/generic"
"k8s.io/kubernetes/pkg/registry/generic/registry"
ipallocator "k8s.io/kubernetes/pkg/registry/service/ipallocator"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
utilnet "k8s.io/kubernetes/pkg/util/net"

2
pkg/genericapiserver/genericapiserver_test.go
View File

@ -38,7 +38,7 @@ import (
"k8s.io/kubernetes/pkg/apiserver"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/kubernetes/pkg/auth/user"
ipallocator "k8s.io/kubernetes/pkg/registry/service/ipallocator"
ipallocator "k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing"
utilnet "k8s.io/kubernetes/pkg/util/net"

2
pkg/kubectl/cmd/util/factory.go
View File

@ -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"

12
pkg/master/controller.go
View File

@ -26,12 +26,12 @@ import (
"k8s.io/kubernetes/pkg/api/endpoints"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/rest"
"k8s.io/kubernetes/pkg/registry/endpoint"
"k8s.io/kubernetes/pkg/registry/namespace"
"k8s.io/kubernetes/pkg/registry/rangeallocation"
"k8s.io/kubernetes/pkg/registry/service"
servicecontroller "k8s.io/kubernetes/pkg/registry/service/ipallocator/controller"
portallocatorcontroller "k8s.io/kubernetes/pkg/registry/service/portallocator/controller"
"k8s.io/kubernetes/pkg/registry/core/endpoint"
"k8s.io/kubernetes/pkg/registry/core/namespace"
"k8s.io/kubernetes/pkg/registry/core/rangeallocation"
"k8s.io/kubernetes/pkg/registry/core/service"
servicecontroller "k8s.io/kubernetes/pkg/registry/core/service/ipallocator/controller"
portallocatorcontroller "k8s.io/kubernetes/pkg/registry/core/service/portallocator/controller"
"k8s.io/kubernetes/pkg/util/async"
"k8s.io/kubernetes/pkg/util/intstr"
utilnet "k8s.io/kubernetes/pkg/util/net"

52
pkg/master/master.go
View File

@ -55,35 +55,35 @@ import (
"k8s.io/kubernetes/pkg/healthz"
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
"k8s.io/kubernetes/pkg/master/ports"
"k8s.io/kubernetes/pkg/registry/componentstatus"
configmapetcd "k8s.io/kubernetes/pkg/registry/configmap/etcd"
controlleretcd "k8s.io/kubernetes/pkg/registry/controller/etcd"
"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/core/componentstatus"
configmapetcd "k8s.io/kubernetes/pkg/registry/core/configmap/etcd"
"k8s.io/kubernetes/pkg/registry/core/endpoint"
endpointsetcd "k8s.io/kubernetes/pkg/registry/core/endpoint/etcd"
eventetcd "k8s.io/kubernetes/pkg/registry/core/event/etcd"
limitrangeetcd "k8s.io/kubernetes/pkg/registry/core/limitrange/etcd"
"k8s.io/kubernetes/pkg/registry/core/namespace"
namespaceetcd "k8s.io/kubernetes/pkg/registry/core/namespace/etcd"
"k8s.io/kubernetes/pkg/registry/core/node"
nodeetcd "k8s.io/kubernetes/pkg/registry/core/node/etcd"
pvetcd "k8s.io/kubernetes/pkg/registry/core/persistentvolume/etcd"
pvcetcd "k8s.io/kubernetes/pkg/registry/core/persistentvolumeclaim/etcd"
podetcd "k8s.io/kubernetes/pkg/registry/core/pod/etcd"
podtemplateetcd "k8s.io/kubernetes/pkg/registry/core/podtemplate/etcd"
"k8s.io/kubernetes/pkg/registry/core/rangeallocation"
resourcequotaetcd "k8s.io/kubernetes/pkg/registry/core/resourcequota/etcd"
secretetcd "k8s.io/kubernetes/pkg/registry/core/secret/etcd"
"k8s.io/kubernetes/pkg/registry/core/service"
"k8s.io/kubernetes/pkg/registry/core/service/allocator"
etcdallocator "k8s.io/kubernetes/pkg/registry/core/service/allocator/etcd"
serviceetcd "k8s.io/kubernetes/pkg/registry/core/service/etcd"
ipallocator "k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
"k8s.io/kubernetes/pkg/registry/core/service/portallocator"
serviceaccountetcd "k8s.io/kubernetes/pkg/registry/core/serviceaccount/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"
namespaceetcd "k8s.io/kubernetes/pkg/registry/namespace/etcd"
"k8s.io/kubernetes/pkg/registry/node"
nodeetcd "k8s.io/kubernetes/pkg/registry/node/etcd"
pvetcd "k8s.io/kubernetes/pkg/registry/persistentvolume/etcd"
pvcetcd "k8s.io/kubernetes/pkg/registry/persistentvolumeclaim/etcd"
podetcd "k8s.io/kubernetes/pkg/registry/pod/etcd"
podtemplateetcd "k8s.io/kubernetes/pkg/registry/podtemplate/etcd"
"k8s.io/kubernetes/pkg/registry/rangeallocation"
rbacstorage "k8s.io/kubernetes/pkg/registry/rbac/storage"
resourcequotaetcd "k8s.io/kubernetes/pkg/registry/resourcequota/etcd"
secretetcd "k8s.io/kubernetes/pkg/registry/secret/etcd"
"k8s.io/kubernetes/pkg/registry/service"
"k8s.io/kubernetes/pkg/registry/service/allocator"
etcdallocator "k8s.io/kubernetes/pkg/registry/service/allocator/etcd"
serviceetcd "k8s.io/kubernetes/pkg/registry/service/etcd"
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"

8
pkg/master/master_test.go
View File

@ -50,12 +50,12 @@ import (
"k8s.io/kubernetes/pkg/apiserver"
"k8s.io/kubernetes/pkg/genericapiserver"
"k8s.io/kubernetes/pkg/kubelet/client"
"k8s.io/kubernetes/pkg/registry/endpoint"
"k8s.io/kubernetes/pkg/registry/core/endpoint"
"k8s.io/kubernetes/pkg/registry/core/namespace"
ipallocator "k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
"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"

2
pkg/master/storage_apps.go
View File

@ -21,7 +21,7 @@ import (
"k8s.io/kubernetes/pkg/apis/apps"
appsapiv1alpha1 "k8s.io/kubernetes/pkg/apis/apps/v1alpha1"
"k8s.io/kubernetes/pkg/genericapiserver"
petsetetcd "k8s.io/kubernetes/pkg/registry/petset/etcd"
petsetetcd "k8s.io/kubernetes/pkg/registry/apps/petset/etcd"
)
type AppsRESTStorageProvider struct{}

2
pkg/master/storage_authentication.go
View File

@ -22,7 +22,7 @@ import (
authenticationv1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1"
"k8s.io/kubernetes/pkg/auth/authenticator"
"k8s.io/kubernetes/pkg/genericapiserver"
"k8s.io/kubernetes/pkg/registry/tokenreview"
"k8s.io/kubernetes/pkg/registry/authentication/tokenreview"
)
type AuthenticationRESTStorageProvider struct {

2
pkg/master/storage_autoscaling.go
View File

@ -21,7 +21,7 @@ import (
"k8s.io/kubernetes/pkg/apis/autoscaling"
autoscalingapiv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1"
"k8s.io/kubernetes/pkg/genericapiserver"
horizontalpodautoscaleretcd "k8s.io/kubernetes/pkg/registry/horizontalpodautoscaler/etcd"
horizontalpodautoscaleretcd "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/etcd"
)
type AutoscalingRESTStorageProvider struct{}

4
pkg/master/storage_batch.go
View File

@ -22,8 +22,8 @@ import (
batchapiv1 "k8s.io/kubernetes/pkg/apis/batch/v1"
batchapiv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
"k8s.io/kubernetes/pkg/genericapiserver"
jobetcd "k8s.io/kubernetes/pkg/registry/job/etcd"
scheduledjobetcd "k8s.io/kubernetes/pkg/registry/scheduledjob/etcd"
jobetcd "k8s.io/kubernetes/pkg/registry/batch/job/etcd"
scheduledjobetcd "k8s.io/kubernetes/pkg/registry/batch/scheduledjob/etcd"
)
type BatchRESTStorageProvider struct{}

2
pkg/master/storage_certificates.go
View File

@ -21,7 +21,7 @@ import (
"k8s.io/kubernetes/pkg/apis/certificates"
certificatesapiv1alpha1 "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1"
"k8s.io/kubernetes/pkg/genericapiserver"
certificateetcd "k8s.io/kubernetes/pkg/registry/certificates/etcd"
certificateetcd "k8s.io/kubernetes/pkg/registry/certificates/certificates/etcd"
)
type CertificatesRESTStorageProvider struct{}

20
pkg/master/storage_extensions.go
View File

@ -26,16 +26,16 @@ import (
"k8s.io/kubernetes/pkg/apis/extensions"
extensionsapiv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
"k8s.io/kubernetes/pkg/genericapiserver"
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"
horizontalpodautoscaleretcd "k8s.io/kubernetes/pkg/registry/horizontalpodautoscaler/etcd"
ingressetcd "k8s.io/kubernetes/pkg/registry/ingress/etcd"
jobetcd "k8s.io/kubernetes/pkg/registry/job/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"
horizontalpodautoscaleretcd "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/etcd"
jobetcd "k8s.io/kubernetes/pkg/registry/batch/job/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"
)

2
pkg/master/storage_policy.go
View File

@ -21,7 +21,7 @@ import (
"k8s.io/kubernetes/pkg/apis/policy"
policyapiv1alpha1 "k8s.io/kubernetes/pkg/apis/policy/v1alpha1"
"k8s.io/kubernetes/pkg/genericapiserver"
poddisruptionbudgetetcd "k8s.io/kubernetes/pkg/registry/poddisruptionbudget/etcd"
poddisruptionbudgetetcd "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget/etcd"
)
type PolicyRESTStorageProvider struct{}

2
pkg/master/storage_storage.go
View File

@ -21,7 +21,7 @@ import (
storageapi "k8s.io/kubernetes/pkg/apis/storage"
storageapiv1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
"k8s.io/kubernetes/pkg/genericapiserver"
storageclassetcd "k8s.io/kubernetes/pkg/registry/storageclass/etcd"
storageclassetcd "k8s.io/kubernetes/pkg/registry/storage/storageclass/etcd"
)
type StorageRESTStorageProvider struct {

4
pkg/master/thirdparty_controller.go
View File

@ -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"
)

2
pkg/master/thirdparty_controller_test.go
View File

@ -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"
)

2
pkg/registry/petset/doc.go → pkg/registry/apps/petset/doc.go
View File

@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package petset // import "k8s.io/kubernetes/pkg/registry/petset"
package petset // import "k8s.io/kubernetes/pkg/registry/apps/petset"

2
pkg/registry/petset/etcd/etcd.go → pkg/registry/apps/petset/etcd/etcd.go
View File

@ -20,10 +20,10 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/rest"
appsapi "k8s.io/kubernetes/pkg/apis/apps"
"k8s.io/kubernetes/pkg/registry/apps/petset"
"k8s.io/kubernetes/pkg/registry/cachesize"
"k8s.io/kubernetes/pkg/registry/generic"
"k8s.io/kubernetes/pkg/registry/generic/registry"
"k8s.io/kubernetes/pkg/registry/petset"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/storage"
)

0
pkg/registry/petset/etcd/etcd_test.go → pkg/registry/apps/petset/etcd/etcd_test.go
View File

0
pkg/registry/petset/strategy.go → pkg/registry/apps/petset/strategy.go
View File

0
pkg/registry/petset/strategy_test.go → pkg/registry/apps/petset/strategy_test.go
View File

0
pkg/registry/tokenreview/storage.go → pkg/registry/authentication/tokenreview/storage.go
View File

2
pkg/registry/horizontalpodautoscaler/doc.go → pkg/registry/autoscaling/horizontalpodautoscaler/doc.go
View File

@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package horizontalpodautoscaler // import "k8s.io/kubernetes/pkg/registry/horizontalpodautoscaler"
package horizontalpodautoscaler // import "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler"

2
pkg/registry/horizontalpodautoscaler/etcd/etcd.go → pkg/registry/autoscaling/horizontalpodautoscaler/etcd/etcd.go
View File

@ -20,10 +20,10 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/rest"
"k8s.io/kubernetes/pkg/apis/autoscaling"
"k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler"
"k8s.io/kubernetes/pkg/registry/cachesize"
"k8s.io/kubernetes/pkg/registry/generic"
"k8s.io/kubernetes/pkg/registry/generic/registry"
"k8s.io/kubernetes/pkg/registry/horizontalpodautoscaler"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/storage"
)

0
pkg/registry/horizontalpodautoscaler/etcd/etcd_test.go → pkg/registry/autoscaling/horizontalpodautoscaler/etcd/etcd_test.go
View File

0
pkg/registry/horizontalpodautoscaler/strategy.go → pkg/registry/autoscaling/horizontalpodautoscaler/strategy.go
View File

0
pkg/registry/horizontalpodautoscaler/strategy_test.go → pkg/registry/autoscaling/horizontalpodautoscaler/strategy_test.go
View File

2
pkg/registry/job/doc.go → pkg/registry/batch/job/doc.go
View File

@ -16,4 +16,4 @@ limitations under the License.
// Package job provides Registry interface and it's RESTStorage
// implementation for storing Job api objects.
package job // import "k8s.io/kubernetes/pkg/registry/job"
package job // import "k8s.io/kubernetes/pkg/registry/batch/job"

2
pkg/registry/job/etcd/etcd.go → pkg/registry/batch/job/etcd/etcd.go
View File

@ -20,10 +20,10 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/rest"
"k8s.io/kubernetes/pkg/apis/batch"
"k8s.io/kubernetes/pkg/registry/batch/job"
"k8s.io/kubernetes/pkg/registry/cachesize"
"k8s.io/kubernetes/pkg/registry/generic"
"k8s.io/kubernetes/pkg/registry/generic/registry"
"k8s.io/kubernetes/pkg/registry/job"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/storage"
)

0
pkg/registry/job/etcd/etcd_test.go → pkg/registry/batch/job/etcd/etcd_test.go
View File

0
pkg/registry/job/strategy.go → pkg/registry/batch/job/strategy.go
View File

0
pkg/registry/job/strategy_test.go → pkg/registry/batch/job/strategy_test.go
View File

2
pkg/registry/scheduledjob/doc.go → pkg/registry/batch/scheduledjob/doc.go
View File

@ -16,4 +16,4 @@ limitations under the License.
// Package scheduledjob provides Registry interface and it's RESTStorage
// implementation for storing ScheduledJob api objects.
package scheduledjob // import "k8s.io/kubernetes/pkg/registry/scheduledjob"
package scheduledjob // import "k8s.io/kubernetes/pkg/registry/batch/scheduledjob"

2
pkg/registry/scheduledjob/etcd/etcd.go → pkg/registry/batch/scheduledjob/etcd/etcd.go
View File

@ -20,10 +20,10 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/rest"
"k8s.io/kubernetes/pkg/apis/batch"
"k8s.io/kubernetes/pkg/registry/batch/scheduledjob"
"k8s.io/kubernetes/pkg/registry/cachesize"
"k8s.io/kubernetes/pkg/registry/generic"
"k8s.io/kubernetes/pkg/registry/generic/registry"
"k8s.io/kubernetes/pkg/registry/scheduledjob"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/storage"
)

0
pkg/registry/scheduledjob/etcd/etcd_test.go → pkg/registry/batch/scheduledjob/etcd/etcd_test.go
View File

0
pkg/registry/scheduledjob/strategy.go → pkg/registry/batch/scheduledjob/strategy.go
View File

0
pkg/registry/scheduledjob/strategy_test.go → pkg/registry/batch/scheduledjob/strategy_test.go
View File

2
pkg/registry/certificates/doc.go → pkg/registry/certificates/certificates/doc.go
View File

@ -16,4 +16,4 @@ limitations under the License.
// Package certificates provides Registry interface and its RESTStorage
// implementation for storing CertificateSigningRequest objects.
package certificates // import "k8s.io/kubernetes/pkg/registry/certificates"
package certificates // import "k8s.io/kubernetes/pkg/registry/certificates/certificates"

2
pkg/registry/certificates/etcd/etcd.go → pkg/registry/certificates/certificates/etcd/etcd.go
View File

@ -23,7 +23,7 @@ import (
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/registry/cachesize"
csrregistry "k8s.io/kubernetes/pkg/registry/certificates"
csrregistry "k8s.io/kubernetes/pkg/registry/certificates/certificates"
"k8s.io/kubernetes/pkg/registry/generic"
"k8s.io/kubernetes/pkg/registry/generic/registry"
"k8s.io/kubernetes/pkg/runtime"

0
pkg/registry/certificates/registry.go → pkg/registry/certificates/certificates/registry.go
View File

0
pkg/registry/certificates/strategy.go → pkg/registry/certificates/certificates/strategy.go
View File

0
pkg/registry/certificates/strategy_test.go → pkg/registry/certificates/certificates/strategy_test.go
View File

2
pkg/registry/componentstatus/doc.go → pkg/registry/core/componentstatus/doc.go
View File

@ -16,4 +16,4 @@ limitations under the License.
// Package componentstatus provides interfaces and implementation for retrieving cluster
// component status.
package componentstatus // import "k8s.io/kubernetes/pkg/registry/componentstatus"
package componentstatus // import "k8s.io/kubernetes/pkg/registry/core/componentstatus"

0
pkg/registry/componentstatus/rest.go → pkg/registry/core/componentstatus/rest.go
View File

0
pkg/registry/componentstatus/rest_test.go → pkg/registry/core/componentstatus/rest_test.go
View File

2
pkg/registry/configmap/doc.go → pkg/registry/core/configmap/doc.go
View File

@ -17,4 +17,4 @@ limitations under the License.
// Package configmap provides Registry interface
// and its REST implementation for storing
// ConfigMap API objects.
package configmap // import "k8s.io/kubernetes/pkg/registry/configmap"
package configmap // import "k8s.io/kubernetes/pkg/registry/core/configmap"

2
pkg/registry/configmap/etcd/etcd.go → pkg/registry/core/configmap/etcd/etcd.go
View File

@ -19,7 +19,7 @@ package etcd
import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/registry/cachesize"
"k8s.io/kubernetes/pkg/registry/configmap"
"k8s.io/kubernetes/pkg/registry/core/configmap"
"k8s.io/kubernetes/pkg/registry/generic"
"k8s.io/kubernetes/pkg/registry/generic/registry"
"k8s.io/kubernetes/pkg/runtime"

0
pkg/registry/configmap/etcd/etcd_test.go → pkg/registry/core/configmap/etcd/etcd_test.go
View File

0
pkg/registry/configmap/registry.go → pkg/registry/core/configmap/registry.go
View File

0
pkg/registry/configmap/strategy.go → pkg/registry/core/configmap/strategy.go
View File

0
pkg/registry/configmap/strategy_test.go → pkg/registry/core/configmap/strategy_test.go
View File

2
pkg/registry/endpoint/doc.go → pkg/registry/core/endpoint/doc.go
View File

@ -16,4 +16,4 @@ limitations under the License.
// Package endpoint provides Registry interface and it's RESTStorage
// implementation for storing Endpoint api objects.
package endpoint // import "k8s.io/kubernetes/pkg/registry/endpoint"
package endpoint // import "k8s.io/kubernetes/pkg/registry/core/endpoint"

2
pkg/registry/endpoint/etcd/etcd.go → pkg/registry/core/endpoint/etcd/etcd.go
View File

@ -19,7 +19,7 @@ package etcd
import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/registry/cachesize"
"k8s.io/kubernetes/pkg/registry/endpoint"
"k8s.io/kubernetes/pkg/registry/core/endpoint"
"k8s.io/kubernetes/pkg/registry/generic"
"k8s.io/kubernetes/pkg/registry/generic/registry"
"k8s.io/kubernetes/pkg/runtime"

0
pkg/registry/endpoint/etcd/etcd_test.go → pkg/registry/core/endpoint/etcd/etcd_test.go
View File

0
pkg/registry/endpoint/registry.go → pkg/registry/core/endpoint/registry.go
View File

0
pkg/registry/endpoint/strategy.go → pkg/registry/core/endpoint/strategy.go
View File

0
pkg/registry/endpoint/strategy_test.go → pkg/registry/core/endpoint/strategy_test.go
View File

2
pkg/registry/event/doc.go → pkg/registry/core/event/doc.go
View File

@ -16,4 +16,4 @@ limitations under the License.
// Package event provides Registry interface and it's REST
// implementation for storing Event api objects.
package event // import "k8s.io/kubernetes/pkg/registry/event"
package event // import "k8s.io/kubernetes/pkg/registry/core/event"

2
pkg/registry/event/etcd/etcd.go → pkg/registry/core/event/etcd/etcd.go
View File

@ -18,7 +18,7 @@ package etcd
import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/registry/event"
"k8s.io/kubernetes/pkg/registry/core/event"
"k8s.io/kubernetes/pkg/registry/generic"
"k8s.io/kubernetes/pkg/registry/generic/registry"
"k8s.io/kubernetes/pkg/runtime"

0
pkg/registry/event/etcd/etcd_test.go → pkg/registry/core/event/etcd/etcd_test.go
View File

0
pkg/registry/event/strategy.go → pkg/registry/core/event/strategy.go
View File

0
pkg/registry/event/strategy_test.go → pkg/registry/core/event/strategy_test.go
View File

2
pkg/registry/limitrange/doc.go → pkg/registry/core/limitrange/doc.go
View File

@ -16,4 +16,4 @@ limitations under the License.
// Package limitrange provides Registry interface and it's REST
// implementation for storing LimitRange api objects.
package limitrange // import "k8s.io/kubernetes/pkg/registry/limitrange"
package limitrange // import "k8s.io/kubernetes/pkg/registry/core/limitrange"

2
pkg/registry/limitrange/etcd/etcd.go → pkg/registry/core/limitrange/etcd/etcd.go
View File

@ -19,9 +19,9 @@ package etcd
import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/registry/cachesize"
"k8s.io/kubernetes/pkg/registry/core/limitrange"
"k8s.io/kubernetes/pkg/registry/generic"
"k8s.io/kubernetes/pkg/registry/generic/registry"
"k8s.io/kubernetes/pkg/registry/limitrange"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/storage"
)

0
pkg/registry/limitrange/etcd/etcd_test.go → pkg/registry/core/limitrange/etcd/etcd_test.go
View File

0
pkg/registry/limitrange/strategy.go → pkg/registry/core/limitrange/strategy.go
View File

0
pkg/registry/limitrange/strategy_test.go → pkg/registry/core/limitrange/strategy_test.go
View File

2
pkg/registry/namespace/doc.go → pkg/registry/core/namespace/doc.go
View File

@ -16,4 +16,4 @@ limitations under the License.
// Package namespace provides Registry interface and it's REST
// implementation for storing Namespace api objects.
package namespace // import "k8s.io/kubernetes/pkg/registry/namespace"
package namespace // import "k8s.io/kubernetes/pkg/registry/core/namespace"

2
pkg/registry/namespace/etcd/etcd.go → pkg/registry/core/namespace/etcd/etcd.go
View File

@ -25,9 +25,9 @@ import (
"k8s.io/kubernetes/pkg/api/rest"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/registry/cachesize"
"k8s.io/kubernetes/pkg/registry/core/namespace"
"k8s.io/kubernetes/pkg/registry/generic"
"k8s.io/kubernetes/pkg/registry/generic/registry"
"k8s.io/kubernetes/pkg/registry/namespace"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/storage"
)

0
pkg/registry/namespace/etcd/etcd_test.go → pkg/registry/core/namespace/etcd/etcd_test.go
View File

0
pkg/registry/namespace/registry.go → pkg/registry/core/namespace/registry.go
View File

0
pkg/registry/namespace/strategy.go → pkg/registry/core/namespace/strategy.go
View File

0
pkg/registry/namespace/strategy_test.go → pkg/registry/core/namespace/strategy_test.go
View File

2
pkg/registry/node/doc.go → pkg/registry/core/node/doc.go
View File

@ -15,4 +15,4 @@ limitations under the License.
*/
// Package node provides Registry interface and implementation for storing Nodes.
package node // import "k8s.io/kubernetes/pkg/registry/node"
package node // import "k8s.io/kubernetes/pkg/registry/core/node"

4
pkg/registry/node/etcd/etcd.go → pkg/registry/core/node/etcd/etcd.go
View File

@ -25,10 +25,10 @@ import (
"k8s.io/kubernetes/pkg/api/rest"
"k8s.io/kubernetes/pkg/kubelet/client"
"k8s.io/kubernetes/pkg/registry/cachesize"
"k8s.io/kubernetes/pkg/registry/core/node"
noderest "k8s.io/kubernetes/pkg/registry/core/node/rest"
"k8s.io/kubernetes/pkg/registry/generic"
"k8s.io/kubernetes/pkg/registry/generic/registry"
"k8s.io/kubernetes/pkg/registry/node"
noderest "k8s.io/kubernetes/pkg/registry/node/rest"
"k8s.io/kubernetes/pkg/runtime"
)

0
pkg/registry/node/etcd/etcd_test.go → pkg/registry/core/node/etcd/etcd_test.go
View File

0
pkg/registry/node/registry.go → pkg/registry/core/node/registry.go
View File

2
pkg/registry/node/rest/proxy.go → pkg/registry/core/node/rest/proxy.go
View File

@ -26,9 +26,9 @@ import (
"k8s.io/kubernetes/pkg/api/rest"
"k8s.io/kubernetes/pkg/capabilities"
"k8s.io/kubernetes/pkg/kubelet/client"
"k8s.io/kubernetes/pkg/registry/core/node"
"k8s.io/kubernetes/pkg/registry/generic/registry"
genericrest "k8s.io/kubernetes/pkg/registry/generic/rest"
"k8s.io/kubernetes/pkg/registry/node"
"k8s.io/kubernetes/pkg/runtime"
)

0
pkg/registry/node/strategy.go → pkg/registry/core/node/strategy.go
View File

0
pkg/registry/node/strategy_test.go → pkg/registry/core/node/strategy_test.go
View File

2
pkg/registry/persistentvolume/doc.go → pkg/registry/core/persistentvolume/doc.go
View File

@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package persistentvolume // import "k8s.io/kubernetes/pkg/registry/persistentvolume"
package persistentvolume // import "k8s.io/kubernetes/pkg/registry/core/persistentvolume"

2
pkg/registry/persistentvolume/etcd/etcd.go → pkg/registry/core/persistentvolume/etcd/etcd.go
View File

@ -20,9 +20,9 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/rest"
"k8s.io/kubernetes/pkg/registry/cachesize"
"k8s.io/kubernetes/pkg/registry/core/persistentvolume"
"k8s.io/kubernetes/pkg/registry/generic"
"k8s.io/kubernetes/pkg/registry/generic/registry"
"k8s.io/kubernetes/pkg/registry/persistentvolume"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/storage"
)

0
pkg/registry/persistentvolume/etcd/etcd_test.go → pkg/registry/core/persistentvolume/etcd/etcd_test.go
View File

0
pkg/registry/persistentvolume/strategy.go → pkg/registry/core/persistentvolume/strategy.go
View File

0
pkg/registry/persistentvolume/strategy_test.go → pkg/registry/core/persistentvolume/strategy_test.go
View File

2
pkg/registry/persistentvolumeclaim/doc.go → pkg/registry/core/persistentvolumeclaim/doc.go
View File

@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package persistentvolumeclaim // import "k8s.io/kubernetes/pkg/registry/persistentvolumeclaim"
package persistentvolumeclaim // import "k8s.io/kubernetes/pkg/registry/core/persistentvolumeclaim"

2
pkg/registry/persistentvolumeclaim/etcd/etcd.go → pkg/registry/core/persistentvolumeclaim/etcd/etcd.go
View File

@ -20,9 +20,9 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/rest"
"k8s.io/kubernetes/pkg/registry/cachesize"
"k8s.io/kubernetes/pkg/registry/core/persistentvolumeclaim"
"k8s.io/kubernetes/pkg/registry/generic"
"k8s.io/kubernetes/pkg/registry/generic/registry"
"k8s.io/kubernetes/pkg/registry/persistentvolumeclaim"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/storage"
)

0
pkg/registry/persistentvolumeclaim/etcd/etcd_test.go → pkg/registry/core/persistentvolumeclaim/etcd/etcd_test.go
View File

0
pkg/registry/persistentvolumeclaim/strategy.go → pkg/registry/core/persistentvolumeclaim/strategy.go
View File

0
pkg/registry/persistentvolumeclaim/strategy_test.go → pkg/registry/core/persistentvolumeclaim/strategy_test.go
View File

2
pkg/registry/pod/doc.go → pkg/registry/core/pod/doc.go
View File

@ -16,4 +16,4 @@ limitations under the License.
// Package pod provides Registry interface and it's RESTStorage
// implementation for storing Pod api objects.
package pod // import "k8s.io/kubernetes/pkg/registry/pod"
package pod // import "k8s.io/kubernetes/pkg/registry/core/pod"

4
pkg/registry/pod/etcd/etcd.go → pkg/registry/core/pod/etcd/etcd.go
View File

@ -31,10 +31,10 @@ import (
"k8s.io/kubernetes/pkg/kubelet/client"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/registry/cachesize"
"k8s.io/kubernetes/pkg/registry/core/pod"
podrest "k8s.io/kubernetes/pkg/registry/core/pod/rest"
"k8s.io/kubernetes/pkg/registry/generic"
"k8s.io/kubernetes/pkg/registry/generic/registry"
"k8s.io/kubernetes/pkg/registry/pod"
podrest "k8s.io/kubernetes/pkg/registry/pod/rest"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/storage"
)

0
pkg/registry/pod/etcd/etcd_test.go → pkg/registry/core/pod/etcd/etcd_test.go
View File

2
pkg/registry/pod/rest/log.go → pkg/registry/core/pod/rest/log.go
View File

@ -24,9 +24,9 @@ import (
"k8s.io/kubernetes/pkg/api/rest"
"k8s.io/kubernetes/pkg/api/validation"
"k8s.io/kubernetes/pkg/kubelet/client"
"k8s.io/kubernetes/pkg/registry/core/pod"
"k8s.io/kubernetes/pkg/registry/generic/registry"
genericrest "k8s.io/kubernetes/pkg/registry/generic/rest"
"k8s.io/kubernetes/pkg/registry/pod"
"k8s.io/kubernetes/pkg/runtime"
)

Some files were not shown because too many files have changed in this diff Show More