github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #22628 from wojtek-t/efficient_resource_quota_controller 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2016-03-07 02:39:24 -08:00
parent e84fee2189 e2ebc50648
commit 88d0ac4a67
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/kube-controller-manager/app/controllermanager.go
View File

@ -240,11 +240,12 @@ func StartControllers(s *options.CMServer, kubeClient *client.Client, kubeconfig
api.Kind("ConfigMap"), api.Kind("ConfigMap"),
} }
resourceQuotaControllerOptions := &resourcequotacontroller.ResourceQuotaControllerOptions{ resourceQuotaControllerOptions := &resourcequotacontroller.ResourceQuotaControllerOptions{
KubeClient: resourceQuotaControllerClient, KubeClient: resourceQuotaControllerClient,
ResyncPeriod: controller.StaticResyncPeriodFunc(s.ResourceQuotaSyncPeriod.Duration), ResyncPeriod: controller.StaticResyncPeriodFunc(s.ResourceQuotaSyncPeriod.Duration),
Registry: resourceQuotaRegistry, Registry: resourceQuotaRegistry,
GroupKindsToReplenish: groupKindsToReplenish, ControllerFactory: resourcequotacontroller.NewReplenishmentControllerFactory(resourceQuotaControllerClient),
ControllerFactory: resourcequotacontroller.NewReplenishmentControllerFactory(resourceQuotaControllerClient), ReplenishmentResyncPeriod: ResyncPeriod(s),
GroupKindsToReplenish: groupKindsToReplenish,
} }
go resourcequotacontroller.NewResourceQuotaController(resourceQuotaControllerOptions).Run(s.ConcurrentResourceQuotaSyncs, wait.NeverStop) go resourcequotacontroller.NewResourceQuotaController(resourceQuotaControllerOptions).Run(s.ConcurrentResourceQuotaSyncs, wait.NeverStop)

4
pkg/controller/resourcequota/resource_quota_controller.go
View File

@ -45,6 +45,8 @@ type ResourceQuotaControllerOptions struct {
Registry quota.Registry Registry quota.Registry
// Knows how to build controllers that notify replenishment events // Knows how to build controllers that notify replenishment events
ControllerFactory ReplenishmentControllerFactory ControllerFactory ReplenishmentControllerFactory
// Controls full resync of objects monitored for replenihsment.
ReplenishmentResyncPeriod controller.ResyncPeriodFunc
// List of GroupKind objects that should be monitored for replenishment at // List of GroupKind objects that should be monitored for replenishment at
// a faster frequency than the quota controller recalculation interval // a faster frequency than the quota controller recalculation interval
GroupKindsToReplenish []unversioned.GroupKind GroupKindsToReplenish []unversioned.GroupKind
@ -124,7 +126,7 @@ func NewResourceQuotaController(options *ResourceQuotaControllerOptions) *Resour
for _, groupKindToReplenish := range options.GroupKindsToReplenish { for _, groupKindToReplenish := range options.GroupKindsToReplenish {
controllerOptions := &ReplenishmentControllerOptions{ controllerOptions := &ReplenishmentControllerOptions{
GroupKind: groupKindToReplenish, GroupKind: groupKindToReplenish,
ResyncPeriod: options.ResyncPeriod, ResyncPeriod: options.ReplenishmentResyncPeriod,
ReplenishmentFunc: rq.replenishQuota, ReplenishmentFunc: rq.replenishQuota,
} }
replenishmentController, err := options.ControllerFactory.NewController(controllerOptions) replenishmentController, err := options.ControllerFactory.NewController(controllerOptions)

9
pkg/controller/resourcequota/resource_quota_controller_test.go
View File

@ -113,7 +113,8 @@ func TestSyncResourceQuota(t *testing.T) {
api.Kind("ReplicationController"), api.Kind("ReplicationController"),
api.Kind("PersistentVolumeClaim"), api.Kind("PersistentVolumeClaim"),
}, },
ControllerFactory: NewReplenishmentControllerFactory(kubeClient), ControllerFactory: NewReplenishmentControllerFactory(kubeClient),
ReplenishmentResyncPeriod: controller.NoResyncPeriodFunc,
} }
quotaController := NewResourceQuotaController(resourceQuotaControllerOptions) quotaController := NewResourceQuotaController(resourceQuotaControllerOptions)
err := quotaController.syncResourceQuota(resourceQuota) err := quotaController.syncResourceQuota(resourceQuota)
@ -198,7 +199,8 @@ func TestSyncResourceQuotaSpecChange(t *testing.T) {
api.Kind("ReplicationController"), api.Kind("ReplicationController"),
api.Kind("PersistentVolumeClaim"), api.Kind("PersistentVolumeClaim"),
}, },
ControllerFactory: NewReplenishmentControllerFactory(kubeClient), ControllerFactory: NewReplenishmentControllerFactory(kubeClient),
ReplenishmentResyncPeriod: controller.NoResyncPeriodFunc,
} }
quotaController := NewResourceQuotaController(resourceQuotaControllerOptions) quotaController := NewResourceQuotaController(resourceQuotaControllerOptions)
err := quotaController.syncResourceQuota(resourceQuota) err := quotaController.syncResourceQuota(resourceQuota)
@ -274,7 +276,8 @@ func TestSyncResourceQuotaNoChange(t *testing.T) {
api.Kind("ReplicationController"), api.Kind("ReplicationController"),
api.Kind("PersistentVolumeClaim"), api.Kind("PersistentVolumeClaim"),
}, },
ControllerFactory: NewReplenishmentControllerFactory(kubeClient), ControllerFactory: NewReplenishmentControllerFactory(kubeClient),
ReplenishmentResyncPeriod: controller.NoResyncPeriodFunc,
} }
quotaController := NewResourceQuotaController(resourceQuotaControllerOptions) quotaController := NewResourceQuotaController(resourceQuotaControllerOptions)
err := quotaController.syncResourceQuota(resourceQuota) err := quotaController.syncResourceQuota(resourceQuota)