From 58236aa3ebf2268b828a8ff13d7a7501d9b69f0c Mon Sep 17 00:00:00 2001 From: carlory Date: Wed, 1 Nov 2023 13:47:23 +0800 Subject: [PATCH] remove EventRecorder from ControllerParameters of pv base controller --- .../volume/persistentvolume/framework_test.go | 2 +- .../persistentvolume/pv_controller_base.go | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/pkg/controller/volume/persistentvolume/framework_test.go b/pkg/controller/volume/persistentvolume/framework_test.go index b16f5668338..90d95927c4d 100644 --- a/pkg/controller/volume/persistentvolume/framework_test.go +++ b/pkg/controller/volume/persistentvolume/framework_test.go @@ -232,13 +232,13 @@ func newTestController(ctx context.Context, kubeClient clientset.Interface, info ClassInformer: informerFactory.Storage().V1().StorageClasses(), PodInformer: informerFactory.Core().V1().Pods(), NodeInformer: informerFactory.Core().V1().Nodes(), - EventRecorder: record.NewFakeRecorder(1000), EnableDynamicProvisioning: enableDynamicProvisioning, } ctrl, err := NewController(ctx, params) if err != nil { return nil, fmt.Errorf("failed to construct persistentvolume controller: %v", err) } + ctrl.eventRecorder = record.NewFakeRecorder(1000) ctrl.volumeListerSynced = alwaysReady ctrl.claimListerSynced = alwaysReady ctrl.classListerSynced = alwaysReady diff --git a/pkg/controller/volume/persistentvolume/pv_controller_base.go b/pkg/controller/volume/persistentvolume/pv_controller_base.go index 6c7779d2d58..e4f93563971 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller_base.go +++ b/pkg/controller/volume/persistentvolume/pv_controller_base.go @@ -72,18 +72,13 @@ type ControllerParameters struct { ClassInformer storageinformers.StorageClassInformer PodInformer coreinformers.PodInformer NodeInformer coreinformers.NodeInformer - EventRecorder record.EventRecorder EnableDynamicProvisioning bool } // NewController creates a new PersistentVolume controller func NewController(ctx context.Context, p ControllerParameters) (*PersistentVolumeController, error) { - eventRecorder := p.EventRecorder - var eventBroadcaster record.EventBroadcaster - if eventRecorder == nil { - eventBroadcaster = record.NewBroadcaster() - eventRecorder = eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "persistentvolume-controller"}) - } + eventBroadcaster := record.NewBroadcaster() + eventRecorder := eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "persistentvolume-controller"}) controller := &PersistentVolumeController{ volumes: newPersistentVolumeOrderedIndex(), @@ -310,11 +305,10 @@ func (ctrl *PersistentVolumeController) Run(ctx context.Context) { defer ctrl.volumeQueue.ShutDown() // Start events processing pipeline. - if ctrl.eventBroadcaster != nil { - ctrl.eventBroadcaster.StartStructuredLogging(0) - ctrl.eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: ctrl.kubeClient.CoreV1().Events("")}) - defer ctrl.eventBroadcaster.Shutdown() - } + ctrl.eventBroadcaster.StartStructuredLogging(0) + ctrl.eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: ctrl.kubeClient.CoreV1().Events("")}) + defer ctrl.eventBroadcaster.Shutdown() + logger := klog.FromContext(ctx) logger.Info("Starting persistent volume controller") defer logger.Info("Shutting down persistent volume controller")