Merge pull request #104231 from astraw99/fix_unified_workers

Unify controller worker num param `threadiness` to `workers`

Kubernetes-commit: fca3175df7a453c24eec3c11b632090c49472c9d
This commit is contained in:
Kubernetes Publisher 2021-08-27 09:34:05 -07:00
commit 547277a10d
3 changed files with 10 additions and 10 deletions

View File

@ -148,7 +148,7 @@ func NewController(
// as syncing informer caches and starting workers. It will block until stopCh // as syncing informer caches and starting workers. It will block until stopCh
// is closed, at which point it will shutdown the workqueue and wait for // is closed, at which point it will shutdown the workqueue and wait for
// workers to finish processing their current work items. // workers to finish processing their current work items.
func (c *Controller) Run(threadiness int, stopCh <-chan struct{}) error { func (c *Controller) Run(workers int, stopCh <-chan struct{}) error {
defer utilruntime.HandleCrash() defer utilruntime.HandleCrash()
defer c.workqueue.ShutDown() defer c.workqueue.ShutDown()
@ -163,7 +163,7 @@ func (c *Controller) Run(threadiness int, stopCh <-chan struct{}) error {
klog.Info("Starting workers") klog.Info("Starting workers")
// Launch two workers to process Foo resources // Launch two workers to process Foo resources
for i := 0; i < threadiness; i++ { for i := 0; i < workers; i++ {
go wait.Until(c.runWorker, time.Second, stopCh) go wait.Until(c.runWorker, time.Second, stopCh)
} }

8
go.mod
View File

@ -7,14 +7,14 @@ go 1.16
require ( require (
k8s.io/api v0.0.0-20210825040442-f20796d02069 k8s.io/api v0.0.0-20210825040442-f20796d02069
k8s.io/apimachinery v0.0.0-20210825040238-74be3b88bedb k8s.io/apimachinery v0.0.0-20210825040238-74be3b88bedb
k8s.io/client-go v0.0.0-20210825040738-3dc80a3333cd k8s.io/client-go v0.0.0-20210827200652-b350fc31ceb9
k8s.io/code-generator v0.0.0-20210825040043-ef1f0655f0b0 k8s.io/code-generator v0.0.0-20210825160035-e7c2dcc7dff4
k8s.io/klog/v2 v2.9.0 k8s.io/klog/v2 v2.9.0
) )
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20210825040442-f20796d02069 k8s.io/api => k8s.io/api v0.0.0-20210825040442-f20796d02069
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210825040238-74be3b88bedb k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210825040238-74be3b88bedb
k8s.io/client-go => k8s.io/client-go v0.0.0-20210825040738-3dc80a3333cd k8s.io/client-go => k8s.io/client-go v0.0.0-20210827200652-b350fc31ceb9
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210825040043-ef1f0655f0b0 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210825160035-e7c2dcc7dff4
) )

8
go.sum
View File

@ -610,10 +610,10 @@ k8s.io/api v0.0.0-20210825040442-f20796d02069 h1:ezx9DT+tM7VpczffbJjnwyr3ulZEaXh
k8s.io/api v0.0.0-20210825040442-f20796d02069/go.mod h1:draCg0WF1Lr137sTJ2xg26MplnLcv5PRyIJaP89ntfc= k8s.io/api v0.0.0-20210825040442-f20796d02069/go.mod h1:draCg0WF1Lr137sTJ2xg26MplnLcv5PRyIJaP89ntfc=
k8s.io/apimachinery v0.0.0-20210825040238-74be3b88bedb h1:x865eFVcQlSLu6gCJ4NbCbKGqwgejXJ4yyaZuENYzcQ= k8s.io/apimachinery v0.0.0-20210825040238-74be3b88bedb h1:x865eFVcQlSLu6gCJ4NbCbKGqwgejXJ4yyaZuENYzcQ=
k8s.io/apimachinery v0.0.0-20210825040238-74be3b88bedb/go.mod h1:YwXrbrp8hgDAA01lpP9HPMC6PS55tjfs3EAatyMMfeM= k8s.io/apimachinery v0.0.0-20210825040238-74be3b88bedb/go.mod h1:YwXrbrp8hgDAA01lpP9HPMC6PS55tjfs3EAatyMMfeM=
k8s.io/client-go v0.0.0-20210825040738-3dc80a3333cd h1:VzSGGfkZIy991ZEbfHvHq1G0JjQnYeiwIAKTGsEfzjg= k8s.io/client-go v0.0.0-20210827200652-b350fc31ceb9 h1:KrsaAa/6U5epl+i1yYqeHVUeE1C0l2r+trW9WrAa1IU=
k8s.io/client-go v0.0.0-20210825040738-3dc80a3333cd/go.mod h1:LoKqAR7bihkfO2dEj4ExEfomATALXYAb4dj5K9ZVaT8= k8s.io/client-go v0.0.0-20210827200652-b350fc31ceb9/go.mod h1:LoKqAR7bihkfO2dEj4ExEfomATALXYAb4dj5K9ZVaT8=
k8s.io/code-generator v0.0.0-20210825040043-ef1f0655f0b0 h1:sBL8QokenD4pct76VoI2pq1hxyZ/V1ZVj1vnG6m+ovk= k8s.io/code-generator v0.0.0-20210825160035-e7c2dcc7dff4 h1:VWe5jzkCskIeoRNjvnituN0GQZyJbfngpItA8naT0TM=
k8s.io/code-generator v0.0.0-20210825040043-ef1f0655f0b0/go.mod h1:3TjBJoi+P+IOZpTKnqg1l/szNsy3SL0FywZ2liUa6Fc= k8s.io/code-generator v0.0.0-20210825160035-e7c2dcc7dff4/go.mod h1:3TjBJoi+P+IOZpTKnqg1l/szNsy3SL0FywZ2liUa6Fc=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c h1:GohjlNKauSai7gN4wsJkeZ3WAJx4Sh+oT/b5IYn5suA= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c h1:GohjlNKauSai7gN4wsJkeZ3WAJx4Sh+oT/b5IYn5suA=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=