From 98dfaed4bec33b4995572685eb084d8202ac235b Mon Sep 17 00:00:00 2001 From: liyuerich Date: Mon, 16 Oct 2023 18:11:17 +0800 Subject: [PATCH] drop deprecated workqueue NewNamed package Signed-off-by: liyuerich --- pkg/controller/nodelifecycle/node_lifecycle_controller.go | 2 +- pkg/controller/volume/persistentvolume/pv_controller_base.go | 4 ++-- .../pkg/admission/plugin/resourcequota/controller.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/controller/nodelifecycle/node_lifecycle_controller.go b/pkg/controller/nodelifecycle/node_lifecycle_controller.go index 27192a6a44f..e7f6b627de2 100644 --- a/pkg/controller/nodelifecycle/node_lifecycle_controller.go +++ b/pkg/controller/nodelifecycle/node_lifecycle_controller.go @@ -344,7 +344,7 @@ func NewNodeLifecycleController( secondaryEvictionLimiterQPS: secondaryEvictionLimiterQPS, largeClusterThreshold: largeClusterThreshold, unhealthyZoneThreshold: unhealthyZoneThreshold, - nodeUpdateQueue: workqueue.NewNamed("node_lifecycle_controller"), + nodeUpdateQueue: workqueue.NewTypedWithConfig[any](workqueue.TypedQueueConfig[any]{Name: "node_lifecycle_controller"}), podUpdateQueue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "node_lifecycle_controller_pods"), } diff --git a/pkg/controller/volume/persistentvolume/pv_controller_base.go b/pkg/controller/volume/persistentvolume/pv_controller_base.go index fa1ab985d06..804b64064eb 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller_base.go +++ b/pkg/controller/volume/persistentvolume/pv_controller_base.go @@ -92,8 +92,8 @@ func NewController(ctx context.Context, p ControllerParameters) (*PersistentVolu clusterName: p.ClusterName, createProvisionedPVRetryCount: createProvisionedPVRetryCount, createProvisionedPVInterval: createProvisionedPVInterval, - claimQueue: workqueue.NewNamed("claims"), - volumeQueue: workqueue.NewNamed("volumes"), + claimQueue: workqueue.NewTypedWithConfig[any](workqueue.TypedQueueConfig[any]{Name: "claims"}), + volumeQueue: workqueue.NewTypedWithConfig[any](workqueue.TypedQueueConfig[any]{Name: "volumes"}), resyncPeriod: p.SyncPeriod, operationTimestamps: metrics.NewOperationStartTimeCache(), } diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/controller.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/controller.go index 09f020178d7..8301de72053 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/controller.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/controller.go @@ -122,7 +122,7 @@ func NewQuotaEvaluator(quotaAccessor QuotaAccessor, ignoredResources map[schema. ignoredResources: ignoredResources, registry: quotaRegistry, - queue: workqueue.NewNamed("admission_quota_controller"), + queue: workqueue.NewTypedWithConfig[any](workqueue.TypedQueueConfig[any]{Name: "admission_quota_controller"}), work: map[string][]*admissionWaiter{}, dirtyWork: map[string][]*admissionWaiter{}, inProgress: sets.String{},