From 4ed5f9d2401788a1e8231eb0fbff0d9706800623 Mon Sep 17 00:00:00 2001 From: eulerzgy Date: Sat, 10 Oct 2015 11:58:57 +0800 Subject: [PATCH] adjust package name for pkg/controller directory --- cmd/integration/integration.go | 8 +++---- .../app/controllermanager.go | 22 +++++++++---------- .../controllermanager/controllermanager.go | 18 +++++++-------- .../mesos/pkg/scheduler/resource/resource.go | 2 +- pkg/controller/endpoint/doc.go | 2 +- .../endpoint/endpoints_controller.go | 2 +- .../endpoint/endpoints_controller_test.go | 2 +- pkg/controller/job/controller.go | 2 +- pkg/controller/namespace/doc.go | 2 +- .../namespace/namespace_controller.go | 2 +- .../namespace/namespace_controller_test.go | 2 +- pkg/controller/node/doc.go | 4 ++-- pkg/controller/node/nodecontroller.go | 2 +- pkg/controller/node/nodecontroller_test.go | 2 +- pkg/controller/node/rate_limited_queue.go | 2 +- .../node/rate_limited_queue_test.go | 2 +- ...ersistentvolume_claim_binder_controller.go | 2 +- ...tentvolume_claim_binder_controller_test.go | 2 +- .../persistentvolume_index_test.go | 2 +- .../persistentvolume_recycler_controller.go | 2 +- pkg/controller/persistentvolume/types.go | 2 +- pkg/controller/replication/doc.go | 2 +- .../replication/replication_controller.go | 2 +- .../replication_controller_test.go | 2 +- .../replication_controller_utils.go | 2 +- pkg/controller/resourcequota/doc.go | 2 +- .../resource_quota_controller.go | 2 +- .../resource_quota_controller_test.go | 2 +- pkg/controller/route/doc.go | 4 ++-- pkg/controller/route/routecontroller.go | 2 +- pkg/controller/route/routecontroller_test.go | 2 +- pkg/controller/service/doc.go | 4 ++-- pkg/controller/service/servicecontroller.go | 2 +- .../service/servicecontroller_test.go | 2 +- .../pkg/admission/resourcequota/admission.go | 2 +- .../admission/resourcequota/admission_test.go | 2 +- test/integration/framework/master_utils.go | 2 +- test/integration/persistent_volumes_test.go | 6 ++--- 38 files changed, 64 insertions(+), 64 deletions(-) diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go index 078d3fc2071..6af63c3524e 100644 --- a/cmd/integration/integration.go +++ b/cmd/integration/integration.go @@ -44,9 +44,9 @@ import ( "k8s.io/kubernetes/pkg/client/record" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/controller/endpoint" - "k8s.io/kubernetes/pkg/controller/node" - replicationControllerPkg "k8s.io/kubernetes/pkg/controller/replication" + endpointcontroller "k8s.io/kubernetes/pkg/controller/endpoint" + nodecontroller "k8s.io/kubernetes/pkg/controller/node" + replicationcontroller "k8s.io/kubernetes/pkg/controller/replication" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubelet/cadvisor" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" @@ -202,7 +202,7 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string Run(3, util.NeverStop) // TODO: Write an integration test for the replication controllers watch. - go replicationControllerPkg.NewReplicationManager(cl, controller.NoResyncPeriodFunc, replicationControllerPkg.BurstReplicas). + go replicationcontroller.NewReplicationManager(cl, controller.NoResyncPeriodFunc, replicationcontroller.BurstReplicas). Run(3, util.NeverStop) nodeController := nodecontroller.NewNodeController(nil, cl, 5*time.Minute, util.NewFakeRateLimiter(), util.NewFakeRateLimiter(), diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index 6b9b828e802..f5d084fa0b5 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -38,18 +38,18 @@ import ( "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/controller/daemon" "k8s.io/kubernetes/pkg/controller/deployment" - "k8s.io/kubernetes/pkg/controller/endpoint" + endpointcontroller "k8s.io/kubernetes/pkg/controller/endpoint" "k8s.io/kubernetes/pkg/controller/gc" "k8s.io/kubernetes/pkg/controller/job" - "k8s.io/kubernetes/pkg/controller/namespace" - "k8s.io/kubernetes/pkg/controller/node" - "k8s.io/kubernetes/pkg/controller/persistentvolume" + namespacecontroller "k8s.io/kubernetes/pkg/controller/namespace" + nodecontroller "k8s.io/kubernetes/pkg/controller/node" + persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/persistentvolume" "k8s.io/kubernetes/pkg/controller/podautoscaler" "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" - replicationControllerPkg "k8s.io/kubernetes/pkg/controller/replication" - "k8s.io/kubernetes/pkg/controller/resourcequota" - "k8s.io/kubernetes/pkg/controller/route" - "k8s.io/kubernetes/pkg/controller/service" + replicationcontroller "k8s.io/kubernetes/pkg/controller/replication" + resourcequotacontroller "k8s.io/kubernetes/pkg/controller/resourcequota" + routecontroller "k8s.io/kubernetes/pkg/controller/route" + servicecontroller "k8s.io/kubernetes/pkg/controller/service" "k8s.io/kubernetes/pkg/controller/serviceaccount" "k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/master/ports" @@ -243,7 +243,7 @@ func (s *CMServer) Run(_ []string) error { go endpointcontroller.NewEndpointController(kubeClient, s.resyncPeriod). Run(s.ConcurrentEndpointSyncs, util.NeverStop) - go replicationControllerPkg.NewReplicationManager(kubeClient, s.resyncPeriod, replicationControllerPkg.BurstReplicas). + go replicationcontroller.NewReplicationManager(kubeClient, s.resyncPeriod, replicationcontroller.BurstReplicas). Run(s.ConcurrentRCSyncs, util.NeverStop) if s.TerminatedPodGCThreshold > 0 { @@ -296,10 +296,10 @@ func (s *CMServer) Run(_ []string) error { Run(s.DeploymentControllerSyncPeriod) } - pvclaimBinder := volumeclaimbinder.NewPersistentVolumeClaimBinder(kubeClient, s.PVClaimBinderSyncPeriod) + pvclaimBinder := persistentvolumecontroller.NewPersistentVolumeClaimBinder(kubeClient, s.PVClaimBinderSyncPeriod) pvclaimBinder.Run() - pvRecycler, err := volumeclaimbinder.NewPersistentVolumeRecycler(kubeClient, s.PVClaimBinderSyncPeriod, ProbeRecyclableVolumePlugins(s.VolumeConfigFlags)) + pvRecycler, err := persistentvolumecontroller.NewPersistentVolumeRecycler(kubeClient, s.PVClaimBinderSyncPeriod, ProbeRecyclableVolumePlugins(s.VolumeConfigFlags)) if err != nil { glog.Fatalf("Failed to start persistent volume recycler: %+v", err) } diff --git a/contrib/mesos/pkg/controllermanager/controllermanager.go b/contrib/mesos/pkg/controllermanager/controllermanager.go index 3c0a69403e8..32e708e33da 100644 --- a/contrib/mesos/pkg/controllermanager/controllermanager.go +++ b/contrib/mesos/pkg/controllermanager/controllermanager.go @@ -33,13 +33,13 @@ import ( "k8s.io/kubernetes/pkg/cloudprovider/providers/mesos" "k8s.io/kubernetes/pkg/controller/daemon" kendpoint "k8s.io/kubernetes/pkg/controller/endpoint" - "k8s.io/kubernetes/pkg/controller/namespace" - "k8s.io/kubernetes/pkg/controller/node" - "k8s.io/kubernetes/pkg/controller/persistentvolume" - "k8s.io/kubernetes/pkg/controller/replication" - "k8s.io/kubernetes/pkg/controller/resourcequota" - "k8s.io/kubernetes/pkg/controller/route" - "k8s.io/kubernetes/pkg/controller/service" + namespacecontroller "k8s.io/kubernetes/pkg/controller/namespace" + nodecontroller "k8s.io/kubernetes/pkg/controller/node" + persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/persistentvolume" + replicationcontroller "k8s.io/kubernetes/pkg/controller/replication" + resourcequotacontroller "k8s.io/kubernetes/pkg/controller/resourcequota" + routecontroller "k8s.io/kubernetes/pkg/controller/route" + servicecontroller "k8s.io/kubernetes/pkg/controller/service" "k8s.io/kubernetes/pkg/controller/serviceaccount" "k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/util" @@ -159,9 +159,9 @@ func (s *CMServer) Run(_ []string) error { namespaceController := namespacecontroller.NewNamespaceController(kubeClient, false, s.NamespaceSyncPeriod) namespaceController.Run() - pvclaimBinder := volumeclaimbinder.NewPersistentVolumeClaimBinder(kubeClient, s.PVClaimBinderSyncPeriod) + pvclaimBinder := persistentvolumecontroller.NewPersistentVolumeClaimBinder(kubeClient, s.PVClaimBinderSyncPeriod) pvclaimBinder.Run() - pvRecycler, err := volumeclaimbinder.NewPersistentVolumeRecycler(kubeClient, s.PVClaimBinderSyncPeriod, app.ProbeRecyclableVolumePlugins(s.VolumeConfigFlags)) + pvRecycler, err := persistentvolumecontroller.NewPersistentVolumeRecycler(kubeClient, s.PVClaimBinderSyncPeriod, app.ProbeRecyclableVolumePlugins(s.VolumeConfigFlags)) if err != nil { glog.Fatalf("Failed to start persistent volume recycler: %+v", err) } diff --git a/contrib/mesos/pkg/scheduler/resource/resource.go b/contrib/mesos/pkg/scheduler/resource/resource.go index 7d3b8b9068e..9ce020cd8c7 100644 --- a/contrib/mesos/pkg/scheduler/resource/resource.go +++ b/contrib/mesos/pkg/scheduler/resource/resource.go @@ -19,7 +19,7 @@ package resource import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/controller/resourcequota" + resourcequotacontroller "k8s.io/kubernetes/pkg/controller/resourcequota" ) const ( diff --git a/pkg/controller/endpoint/doc.go b/pkg/controller/endpoint/doc.go index 058b1643a6b..c51ec65183b 100644 --- a/pkg/controller/endpoint/doc.go +++ b/pkg/controller/endpoint/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package service provides EndpointController implementation // to manage and sync service endpoints. -package endpointcontroller +package endpoint diff --git a/pkg/controller/endpoint/endpoints_controller.go b/pkg/controller/endpoint/endpoints_controller.go index 60ceb6a8fe7..4b5870784c7 100644 --- a/pkg/controller/endpoint/endpoints_controller.go +++ b/pkg/controller/endpoint/endpoints_controller.go @@ -16,7 +16,7 @@ limitations under the License. // CAUTION: If you update code in this file, you may need to also update code // in contrib/mesos/pkg/service/endpoints_controller.go -package endpointcontroller +package endpoint import ( "fmt" diff --git a/pkg/controller/endpoint/endpoints_controller_test.go b/pkg/controller/endpoint/endpoints_controller_test.go index 2d81629f51b..40d22993514 100644 --- a/pkg/controller/endpoint/endpoints_controller_test.go +++ b/pkg/controller/endpoint/endpoints_controller_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package endpointcontroller +package endpoint import ( "fmt" diff --git a/pkg/controller/job/controller.go b/pkg/controller/job/controller.go index 16f79ea0fef..783c12bdc0a 100644 --- a/pkg/controller/job/controller.go +++ b/pkg/controller/job/controller.go @@ -31,7 +31,7 @@ import ( client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/controller/replication" + replicationcontroller "k8s.io/kubernetes/pkg/controller/replication" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/namespace/doc.go b/pkg/controller/namespace/doc.go index 57c79007339..fea657af5e7 100644 --- a/pkg/controller/namespace/doc.go +++ b/pkg/controller/namespace/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // namespace contains a controller that handles namespace lifecycle -package namespacecontroller +package namespace diff --git a/pkg/controller/namespace/namespace_controller.go b/pkg/controller/namespace/namespace_controller.go index 5207f933011..083df43de20 100644 --- a/pkg/controller/namespace/namespace_controller.go +++ b/pkg/controller/namespace/namespace_controller.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package namespacecontroller +package namespace import ( "fmt" diff --git a/pkg/controller/namespace/namespace_controller_test.go b/pkg/controller/namespace/namespace_controller_test.go index d76e4cccbeb..93a462ec08c 100644 --- a/pkg/controller/namespace/namespace_controller_test.go +++ b/pkg/controller/namespace/namespace_controller_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package namespacecontroller +package namespace import ( "fmt" diff --git a/pkg/controller/node/doc.go b/pkg/controller/node/doc.go index 3174bef7c09..084754e699d 100644 --- a/pkg/controller/node/doc.go +++ b/pkg/controller/node/doc.go @@ -14,6 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package nodecontroller contains code for syncing cloud instances with +// Package node contains code for syncing cloud instances with // node registry -package nodecontroller +package node diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index 1ed075e0faf..aa93d587cce 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package nodecontroller +package node import ( "errors" diff --git a/pkg/controller/node/nodecontroller_test.go b/pkg/controller/node/nodecontroller_test.go index 75e77e3fbbb..abe3998ca9d 100644 --- a/pkg/controller/node/nodecontroller_test.go +++ b/pkg/controller/node/nodecontroller_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package nodecontroller +package node import ( "errors" diff --git a/pkg/controller/node/rate_limited_queue.go b/pkg/controller/node/rate_limited_queue.go index 1ce719d2021..4545243a2e2 100644 --- a/pkg/controller/node/rate_limited_queue.go +++ b/pkg/controller/node/rate_limited_queue.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package nodecontroller +package node import ( "container/heap" diff --git a/pkg/controller/node/rate_limited_queue_test.go b/pkg/controller/node/rate_limited_queue_test.go index ab25806bd3c..e0bccd54e92 100644 --- a/pkg/controller/node/rate_limited_queue_test.go +++ b/pkg/controller/node/rate_limited_queue_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package nodecontroller +package node import ( "reflect" diff --git a/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go b/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go index 230bff06c97..ee1c566d5f3 100644 --- a/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go +++ b/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package volumeclaimbinder +package persistentvolume import ( "fmt" diff --git a/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller_test.go b/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller_test.go index 352b44aa5b5..98adc82c4f4 100644 --- a/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller_test.go +++ b/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package volumeclaimbinder +package persistentvolume import ( "reflect" diff --git a/pkg/controller/persistentvolume/persistentvolume_index_test.go b/pkg/controller/persistentvolume/persistentvolume_index_test.go index 338d4d2efbe..154d47e3f42 100644 --- a/pkg/controller/persistentvolume/persistentvolume_index_test.go +++ b/pkg/controller/persistentvolume/persistentvolume_index_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package volumeclaimbinder +package persistentvolume import ( "testing" diff --git a/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go b/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go index 65de821adee..67380be0db8 100644 --- a/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go +++ b/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package volumeclaimbinder +package persistentvolume import ( "fmt" diff --git a/pkg/controller/persistentvolume/types.go b/pkg/controller/persistentvolume/types.go index adf1e289b63..6f38c36b86d 100644 --- a/pkg/controller/persistentvolume/types.go +++ b/pkg/controller/persistentvolume/types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package volumeclaimbinder +package persistentvolume import ( "fmt" diff --git a/pkg/controller/replication/doc.go b/pkg/controller/replication/doc.go index eb6027db312..b60e1d99c4e 100644 --- a/pkg/controller/replication/doc.go +++ b/pkg/controller/replication/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package replication contains logic for watching and synchronizing // replication controllers. -package replicationcontroller +package replication diff --git a/pkg/controller/replication/replication_controller.go b/pkg/controller/replication/replication_controller.go index 945629b9dba..f1b75aa809c 100644 --- a/pkg/controller/replication/replication_controller.go +++ b/pkg/controller/replication/replication_controller.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package replicationcontroller +package replication import ( "reflect" diff --git a/pkg/controller/replication/replication_controller_test.go b/pkg/controller/replication/replication_controller_test.go index f46375264d9..5747d75ad26 100644 --- a/pkg/controller/replication/replication_controller_test.go +++ b/pkg/controller/replication/replication_controller_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package replicationcontroller +package replication import ( "fmt" diff --git a/pkg/controller/replication/replication_controller_utils.go b/pkg/controller/replication/replication_controller_utils.go index b9a352ebc36..5033c29011c 100644 --- a/pkg/controller/replication/replication_controller_utils.go +++ b/pkg/controller/replication/replication_controller_utils.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package replicationcontroller +package replication import ( "github.com/golang/glog" diff --git a/pkg/controller/resourcequota/doc.go b/pkg/controller/resourcequota/doc.go index 73fa39f90e7..a83ad10dd66 100644 --- a/pkg/controller/resourcequota/doc.go +++ b/pkg/controller/resourcequota/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // resourcequota contains a controller that makes resource quota usage observations -package resourcequotacontroller +package resourcequota diff --git a/pkg/controller/resourcequota/resource_quota_controller.go b/pkg/controller/resourcequota/resource_quota_controller.go index 9d319aacaf8..963dbd61735 100644 --- a/pkg/controller/resourcequota/resource_quota_controller.go +++ b/pkg/controller/resourcequota/resource_quota_controller.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package resourcequotacontroller +package resourcequota import ( "fmt" diff --git a/pkg/controller/resourcequota/resource_quota_controller_test.go b/pkg/controller/resourcequota/resource_quota_controller_test.go index 4cb0b1f4f73..e72ef37d233 100644 --- a/pkg/controller/resourcequota/resource_quota_controller_test.go +++ b/pkg/controller/resourcequota/resource_quota_controller_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package resourcequotacontroller +package resourcequota import ( "strconv" diff --git a/pkg/controller/route/doc.go b/pkg/controller/route/doc.go index 8ad76248a5a..bc4ae60a27a 100644 --- a/pkg/controller/route/doc.go +++ b/pkg/controller/route/doc.go @@ -14,6 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package routecontroller contains code for syncing cloud routing rules with +// Package route contains code for syncing cloud routing rules with // the list of registered nodes. -package routecontroller +package route diff --git a/pkg/controller/route/routecontroller.go b/pkg/controller/route/routecontroller.go index bd513aca821..eb30dc13e8f 100644 --- a/pkg/controller/route/routecontroller.go +++ b/pkg/controller/route/routecontroller.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package routecontroller +package route import ( "fmt" diff --git a/pkg/controller/route/routecontroller_test.go b/pkg/controller/route/routecontroller_test.go index d09b6764eaf..4277aec45c1 100644 --- a/pkg/controller/route/routecontroller_test.go +++ b/pkg/controller/route/routecontroller_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package routecontroller +package route import ( "net" diff --git a/pkg/controller/service/doc.go b/pkg/controller/service/doc.go index da5426f365c..78c20eb9650 100644 --- a/pkg/controller/service/doc.go +++ b/pkg/controller/service/doc.go @@ -14,6 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package servicecontroller contains code for syncing cloud load balancers +// Package service contains code for syncing cloud load balancers // with the service registry. -package servicecontroller +package service diff --git a/pkg/controller/service/servicecontroller.go b/pkg/controller/service/servicecontroller.go index 9d335575026..3fba65073da 100644 --- a/pkg/controller/service/servicecontroller.go +++ b/pkg/controller/service/servicecontroller.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package servicecontroller +package service import ( "fmt" diff --git a/pkg/controller/service/servicecontroller_test.go b/pkg/controller/service/servicecontroller_test.go index 7c7da8b3ef3..05e84abae0c 100644 --- a/pkg/controller/service/servicecontroller_test.go +++ b/pkg/controller/service/servicecontroller_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package servicecontroller +package service import ( "reflect" diff --git a/plugin/pkg/admission/resourcequota/admission.go b/plugin/pkg/admission/resourcequota/admission.go index b7c8fe33765..1b24721c425 100644 --- a/plugin/pkg/admission/resourcequota/admission.go +++ b/plugin/pkg/admission/resourcequota/admission.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/controller/resourcequota" + resourcequotacontroller "k8s.io/kubernetes/pkg/controller/resourcequota" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" diff --git a/plugin/pkg/admission/resourcequota/admission_test.go b/plugin/pkg/admission/resourcequota/admission_test.go index c641955c5db..137bf1fe88a 100644 --- a/plugin/pkg/admission/resourcequota/admission_test.go +++ b/plugin/pkg/admission/resourcequota/admission_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/unversioned/testclient" - "k8s.io/kubernetes/pkg/controller/resourcequota" + resourcequotacontroller "k8s.io/kubernetes/pkg/controller/resourcequota" ) func getResourceList(cpu, memory string) api.ResourceList { diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index c34a7de846d..27f4772a46b 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -33,7 +33,7 @@ import ( "k8s.io/kubernetes/pkg/client/record" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/controller/replication" + replicationcontroller "k8s.io/kubernetes/pkg/controller/replication" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/labels" diff --git a/test/integration/persistent_volumes_test.go b/test/integration/persistent_volumes_test.go index 1e699d5bfe2..cf157cad7e2 100644 --- a/test/integration/persistent_volumes_test.go +++ b/test/integration/persistent_volumes_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/controller/persistentvolume" + persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/persistentvolume" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/volume" @@ -46,11 +46,11 @@ func TestPersistentVolumeRecycler(t *testing.T) { recyclerClient := client.NewOrDie(&client.Config{Host: s.URL, Version: testapi.Default.Version()}) testClient := client.NewOrDie(&client.Config{Host: s.URL, Version: testapi.Default.Version()}) - binder := volumeclaimbinder.NewPersistentVolumeClaimBinder(binderClient, 1*time.Second) + binder := persistentvolumecontroller.NewPersistentVolumeClaimBinder(binderClient, 1*time.Second) binder.Run() defer binder.Stop() - recycler, _ := volumeclaimbinder.NewPersistentVolumeRecycler(recyclerClient, 1*time.Second, []volume.VolumePlugin{&volume.FakeVolumePlugin{"plugin-name", volume.NewFakeVolumeHost("/tmp/fake", nil, nil)}}) + recycler, _ := persistentvolumecontroller.NewPersistentVolumeRecycler(recyclerClient, 1*time.Second, []volume.VolumePlugin{&volume.FakeVolumePlugin{"plugin-name", volume.NewFakeVolumeHost("/tmp/fake", nil, nil)}}) recycler.Run() defer recycler.Stop()