github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40393 from ReneSaenz/rename_controller17648

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 38739, 40480, 40495, 40172, 40393)

Rename controller pkg/registry/core/controller to pkg/registry/core/r…

…eplicationcontroller



**What this PR does / why we need it**:

Rename controller pkg/registry/core/controller to pkg/registry/core/replicationcontroller
This will clarify the purpose of the controller since intent is replicationcontroller

Please refer to 
https://github.com/kubernetes/kubernetes/issues/17648

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:
NONE
**Release note**:

```NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-01-25 21:20:33 -08:00 committed by GitHub
commit 28c439dcfb
14 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/registry/BUILD
View File

@ -43,7 +43,6 @@ filegroup(
"//pkg/registry/certificates/rest:all-srcs",
"//pkg/registry/core/componentstatus:all-srcs",
"//pkg/registry/core/configmap:all-srcs",
"//pkg/registry/core/controller:all-srcs",
"//pkg/registry/core/endpoint:all-srcs",
"//pkg/registry/core/event:all-srcs",
"//pkg/registry/core/limitrange:all-srcs",
@ -54,6 +53,7 @@ filegroup(
"//pkg/registry/core/pod:all-srcs",
"//pkg/registry/core/podtemplate:all-srcs",
"//pkg/registry/core/rangeallocation:all-srcs",
"//pkg/registry/core/replicationcontroller:all-srcs",
"//pkg/registry/core/resourcequota:all-srcs",
"//pkg/registry/core/rest:all-srcs",
"//pkg/registry/core/secret:all-srcs",

2
pkg/registry/core/controller/BUILD → pkg/registry/core/replicationcontroller/BUILD
View File

@ -58,7 +58,7 @@ filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//pkg/registry/core/controller/storage:all-srcs",
"//pkg/registry/core/replicationcontroller/storage:all-srcs",
],
tags = ["automanaged"],
)

2
pkg/registry/core/controller/doc.go → pkg/registry/core/replicationcontroller/doc.go
View File

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

2
pkg/registry/core/controller/registry.go → pkg/registry/core/replicationcontroller/registry.go
View File

@ -16,7 +16,7 @@ limitations under the License.
// If you make changes to this file, you should also make the corresponding change in ReplicaSet.
package controller
package replicationcontroller
import (
"fmt"

2
pkg/registry/core/controller/storage/BUILD → pkg/registry/core/replicationcontroller/storage/BUILD
View File

@ -41,7 +41,7 @@ go_library(
"//pkg/genericapiserver/registry/generic:go_default_library",
"//pkg/genericapiserver/registry/generic/registry:go_default_library",
"//pkg/genericapiserver/registry/rest:go_default_library",
"//pkg/registry/core/controller:go_default_library",
"//pkg/registry/core/replicationcontroller:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/labels",

18
pkg/registry/core/controller/storage/storage.go → pkg/registry/core/replicationcontroller/storage/storage.go
View File

@ -32,7 +32,7 @@ import (
"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry"
"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
"k8s.io/kubernetes/pkg/registry/core/controller"
"k8s.io/kubernetes/pkg/registry/core/replicationcontroller"
)
// ControllerStorage includes dummy storage for Replication Controllers and for Scale subresource.
@ -44,7 +44,7 @@ type ControllerStorage struct {
func NewStorage(optsGetter generic.RESTOptionsGetter) ControllerStorage {
controllerREST, statusREST := NewREST(optsGetter)
controllerRegistry := controller.NewRegistry(controllerREST)
controllerRegistry := replicationcontroller.NewRegistry(controllerREST)
return ControllerStorage{
Controller: controllerREST,
@ -65,20 +65,20 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
ObjectNameFunc: func(obj runtime.Object) (string, error) {
return obj.(*api.ReplicationController).Name, nil
},
PredicateFunc: controller.MatchController,
PredicateFunc: replicationcontroller.MatchController,
QualifiedResource: api.Resource("replicationcontrollers"),
CreateStrategy: controller.Strategy,
UpdateStrategy: controller.Strategy,
DeleteStrategy: controller.Strategy,
CreateStrategy: replicationcontroller.Strategy,
UpdateStrategy: replicationcontroller.Strategy,
DeleteStrategy: replicationcontroller.Strategy,
}
options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: controller.GetAttrs}
options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: replicationcontroller.GetAttrs}
if err := store.CompleteWithOptions(options); err != nil {
panic(err) // TODO: Propagate error up
}
statusStore := *store
statusStore.UpdateStrategy = controller.StatusStrategy
statusStore.UpdateStrategy = replicationcontroller.StatusStrategy
return &REST{store}, &StatusREST{store: &statusStore}
}
@ -103,7 +103,7 @@ func (r *StatusREST) Update(ctx genericapirequest.Context, name string, objInfo
}
type ScaleREST struct {
registry controller.Registry
registry replicationcontroller.Registry
}
// ScaleREST implements Patcher

0
pkg/registry/core/controller/storage/storage_test.go → pkg/registry/core/replicationcontroller/storage/storage_test.go
View File

2
pkg/registry/core/controller/strategy.go → pkg/registry/core/replicationcontroller/strategy.go
View File

@ -16,7 +16,7 @@ limitations under the License.
// If you make changes to this file, you should also make the corresponding change in ReplicaSet.
package controller
package replicationcontroller
import (
"fmt"

2
pkg/registry/core/controller/strategy_test.go → pkg/registry/core/replicationcontroller/strategy_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package controller
package replicationcontroller
import (
"strings"

2
pkg/registry/core/rest/BUILD
View File

@ -33,7 +33,6 @@ go_library(
"//pkg/master/ports:go_default_library",
"//pkg/registry/core/componentstatus:go_default_library",
"//pkg/registry/core/configmap/storage:go_default_library",
"//pkg/registry/core/controller/storage:go_default_library",
"//pkg/registry/core/endpoint:go_default_library",
"//pkg/registry/core/endpoint/storage:go_default_library",
"//pkg/registry/core/event/storage:go_default_library",
@ -45,6 +44,7 @@ go_library(
"//pkg/registry/core/pod/storage:go_default_library",
"//pkg/registry/core/podtemplate/storage:go_default_library",
"//pkg/registry/core/rangeallocation:go_default_library",
"//pkg/registry/core/replicationcontroller/storage:go_default_library",
"//pkg/registry/core/resourcequota/storage:go_default_library",
"//pkg/registry/core/secret/storage:go_default_library",
"//pkg/registry/core/service:go_default_library",

2
pkg/registry/core/rest/storage_core.go
View File

@ -39,7 +39,6 @@ import (
"k8s.io/kubernetes/pkg/master/ports"
"k8s.io/kubernetes/pkg/registry/core/componentstatus"
configmapstore "k8s.io/kubernetes/pkg/registry/core/configmap/storage"
controllerstore "k8s.io/kubernetes/pkg/registry/core/controller/storage"
"k8s.io/kubernetes/pkg/registry/core/endpoint"
endpointsstore "k8s.io/kubernetes/pkg/registry/core/endpoint/storage"
eventstore "k8s.io/kubernetes/pkg/registry/core/event/storage"
@ -51,6 +50,7 @@ import (
podstore "k8s.io/kubernetes/pkg/registry/core/pod/storage"
podtemplatestore "k8s.io/kubernetes/pkg/registry/core/podtemplate/storage"
"k8s.io/kubernetes/pkg/registry/core/rangeallocation"
controllerstore "k8s.io/kubernetes/pkg/registry/core/replicationcontroller/storage"
resourcequotastore "k8s.io/kubernetes/pkg/registry/core/resourcequota/storage"
secretstore "k8s.io/kubernetes/pkg/registry/core/secret/storage"
"k8s.io/kubernetes/pkg/registry/core/service"

4
pkg/registry/extensions/controller/storage/BUILD
View File

@ -37,8 +37,8 @@ go_library(
"//pkg/apis/extensions/validation:go_default_library",
"//pkg/genericapiserver/registry/generic:go_default_library",
"//pkg/genericapiserver/registry/rest:go_default_library",
"//pkg/registry/core/controller:go_default_library",
"//pkg/registry/core/controller/storage:go_default_library",
"//pkg/registry/core/replicationcontroller:go_default_library",
"//pkg/registry/core/replicationcontroller/storage:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/runtime",

8
pkg/registry/extensions/controller/storage/storage.go
View File

@ -28,8 +28,8 @@ import (
extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation"
"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
"k8s.io/kubernetes/pkg/registry/core/controller"
controllerstore "k8s.io/kubernetes/pkg/registry/core/controller/storage"
"k8s.io/kubernetes/pkg/registry/core/replicationcontroller"
controllerstore "k8s.io/kubernetes/pkg/registry/core/replicationcontroller/storage"
)
// Container includes dummy storage for RC pods and experimental storage for Scale.
@ -41,7 +41,7 @@ type ContainerStorage struct {
func NewStorage(optsGetter generic.RESTOptionsGetter) ContainerStorage {
// scale does not set status, only updates spec so we ignore the status
controllerREST, _ := controllerstore.NewREST(optsGetter)
rcRegistry := controller.NewRegistry(controllerREST)
rcRegistry := replicationcontroller.NewRegistry(controllerREST)
return ContainerStorage{
ReplicationController: &RcREST{},
@ -50,7 +50,7 @@ func NewStorage(optsGetter generic.RESTOptionsGetter) ContainerStorage {
}
type ScaleREST struct {
registry *controller.Registry
registry *replicationcontroller.Registry
}
// ScaleREST implements Patcher

4
test/test_owners.csv
View File

@ -767,8 +767,8 @@ k8s.io/kubernetes/pkg/registry/certificates/certificates,smarterclayton,1
k8s.io/kubernetes/pkg/registry/core/componentstatus,krousey,1
k8s.io/kubernetes/pkg/registry/core/configmap,janetkuo,1
k8s.io/kubernetes/pkg/registry/core/configmap/etcd,gmarek,1
k8s.io/kubernetes/pkg/registry/core/controller,freehan,1
k8s.io/kubernetes/pkg/registry/core/controller/etcd,fabioy,1
k8s.io/kubernetes/pkg/registry/core/replicationcontroller,freehan,1
k8s.io/kubernetes/pkg/registry/core/replicationcontroller/etcd,fabioy,1
k8s.io/kubernetes/pkg/registry/core/endpoint,bprashanth,1
k8s.io/kubernetes/pkg/registry/core/endpoint/etcd,mikedanese,1
k8s.io/kubernetes/pkg/registry/core/event,ixdy,1

1 name owner auto-assigned
767 k8s.io/kubernetes/pkg/registry/core/componentstatus krousey 1
768 k8s.io/kubernetes/pkg/registry/core/configmap janetkuo 1
769 k8s.io/kubernetes/pkg/registry/core/configmap/etcd gmarek 1
770 k8s.io/kubernetes/pkg/registry/core/controller k8s.io/kubernetes/pkg/registry/core/replicationcontroller freehan 1
771 k8s.io/kubernetes/pkg/registry/core/controller/etcd k8s.io/kubernetes/pkg/registry/core/replicationcontroller/etcd fabioy 1
772 k8s.io/kubernetes/pkg/registry/core/endpoint bprashanth 1
773 k8s.io/kubernetes/pkg/registry/core/endpoint/etcd mikedanese 1
774 k8s.io/kubernetes/pkg/registry/core/event ixdy 1