From a11106edd3aa0c2d675042c2e1e911a7f81ea9b2 Mon Sep 17 00:00:00 2001 From: Alex Robinson Date: Mon, 23 Mar 2015 22:59:38 +0000 Subject: [PATCH] Put the node controller in its own package rather than in the generic cloudprovider/controller package. --- cmd/integration/integration.go | 4 ++-- cmd/kube-controller-manager/app/controllermanager.go | 4 ++-- cmd/kubernetes/kubernetes.go | 4 ++-- pkg/cloudprovider/{controller => nodecontroller}/doc.go | 4 ++-- .../{controller => nodecontroller}/nodecontroller.go | 2 +- .../{controller => nodecontroller}/nodecontroller_test.go | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename pkg/cloudprovider/{controller => nodecontroller}/doc.go (86%) rename pkg/cloudprovider/{controller => nodecontroller}/nodecontroller.go (99%) rename pkg/cloudprovider/{controller => nodecontroller}/nodecontroller_test.go (99%) diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go index 9b0a52a0739..8518ab16bd6 100644 --- a/cmd/integration/integration.go +++ b/cmd/integration/integration.go @@ -41,7 +41,7 @@ import ( "github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver" "github.com/GoogleCloudPlatform/kubernetes/pkg/client" "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - nodeControllerPkg "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/controller" + "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/nodecontroller" replicationControllerPkg "github.com/GoogleCloudPlatform/kubernetes/pkg/controller" "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/cadvisor" @@ -221,7 +221,7 @@ func startComponents(firstManifestURL, secondManifestURL, apiVersion string) (st api.ResourceName(api.ResourceMemory): resource.MustParse("10G"), }} - nodeController := nodeControllerPkg.NewNodeController(nil, "", machineList, nodeResources, cl, 10, 5*time.Minute, util.NewFakeRateLimiter(), 40*time.Second, 60*time.Second, 5*time.Second, "") + nodeController := nodecontroller.NewNodeController(nil, "", machineList, nodeResources, cl, 10, 5*time.Minute, util.NewFakeRateLimiter(), 40*time.Second, 60*time.Second, 5*time.Second, "") nodeController.Run(5*time.Second, true) cadvisorInterface := new(cadvisor.Fake) diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index e3914197383..db71f46c8ca 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -30,7 +30,7 @@ import ( "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" "github.com/GoogleCloudPlatform/kubernetes/pkg/client" "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" - nodeControllerPkg "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/controller" + "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/nodecontroller" replicationControllerPkg "github.com/GoogleCloudPlatform/kubernetes/pkg/controller" "github.com/GoogleCloudPlatform/kubernetes/pkg/master/ports" "github.com/GoogleCloudPlatform/kubernetes/pkg/namespace" @@ -187,7 +187,7 @@ func (s *CMServer) Run(_ []string) error { glog.Warning("DEPRECATION NOTICE: sync_node_status flag is being deprecated. It has no effect now and it will be removed in a future version.") } - nodeController := nodeControllerPkg.NewNodeController(cloud, s.MinionRegexp, s.MachineList, nodeResources, + nodeController := nodecontroller.NewNodeController(cloud, s.MinionRegexp, s.MachineList, nodeResources, kubeClient, s.RegisterRetryCount, s.PodEvictionTimeout, util.NewTokenBucketRateLimiter(s.DeletingPodsQps, s.DeletingPodsBurst), s.NodeMonitorGracePeriod, s.NodeStartupGracePeriod, s.NodeMonitorPeriod, s.ClusterName) nodeController.Run(s.NodeSyncPeriod, s.SyncNodeList) diff --git a/cmd/kubernetes/kubernetes.go b/cmd/kubernetes/kubernetes.go index 61708b9b815..1f4f1f9948e 100644 --- a/cmd/kubernetes/kubernetes.go +++ b/cmd/kubernetes/kubernetes.go @@ -34,7 +34,7 @@ import ( "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" "github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver" "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - nodeControllerPkg "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/controller" + "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/nodecontroller" "github.com/GoogleCloudPlatform/kubernetes/pkg/controller" "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/cadvisor" "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" @@ -128,7 +128,7 @@ func runControllerManager(machineList []string, cl *client.Client, nodeMilliCPU, }, } - nodeController := nodeControllerPkg.NewNodeController( + nodeController := nodecontroller.NewNodeController( nil, "", machineList, nodeResources, cl, 10, 5*time.Minute, util.NewTokenBucketRateLimiter(*deletingPodsQps, *deletingPodsBurst), 40*time.Second, 60*time.Second, 5*time.Second, "") nodeController.Run(10*time.Second, true) diff --git a/pkg/cloudprovider/controller/doc.go b/pkg/cloudprovider/nodecontroller/doc.go similarity index 86% rename from pkg/cloudprovider/controller/doc.go rename to pkg/cloudprovider/nodecontroller/doc.go index 64b73b3b216..097cac95d8c 100644 --- a/pkg/cloudprovider/controller/doc.go +++ b/pkg/cloudprovider/nodecontroller/doc.go @@ -14,6 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package controller contains code for syncing cloud instances with +// Package nodecontroller contains code for syncing cloud instances with // minion registry -package controller +package nodecontroller diff --git a/pkg/cloudprovider/controller/nodecontroller.go b/pkg/cloudprovider/nodecontroller/nodecontroller.go similarity index 99% rename from pkg/cloudprovider/controller/nodecontroller.go rename to pkg/cloudprovider/nodecontroller/nodecontroller.go index e88d27c4db1..2d1f03b30d2 100644 --- a/pkg/cloudprovider/controller/nodecontroller.go +++ b/pkg/cloudprovider/nodecontroller/nodecontroller.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package controller +package nodecontroller import ( "errors" diff --git a/pkg/cloudprovider/controller/nodecontroller_test.go b/pkg/cloudprovider/nodecontroller/nodecontroller_test.go similarity index 99% rename from pkg/cloudprovider/controller/nodecontroller_test.go rename to pkg/cloudprovider/nodecontroller/nodecontroller_test.go index fafdfd0dcbe..b32456864b2 100644 --- a/pkg/cloudprovider/controller/nodecontroller_test.go +++ b/pkg/cloudprovider/nodecontroller/nodecontroller_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package controller +package nodecontroller import ( "errors"