github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 19:23:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #121663 from carlory/clean-010

Browse Source 
remove EventRecorder from ControllerParameters of pv base controller
This commit is contained in:
Kubernetes Prow Robot 2023-12-13 22:34:33 +01:00 committed by GitHub
commit 2f0aca1fc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/volume/persistentvolume/framework_test.go
View File

@ -232,13 +232,13 @@ func newTestController(ctx context.Context, kubeClient clientset.Interface, info
ClassInformer: informerFactory.Storage().V1().StorageClasses(), ClassInformer: informerFactory.Storage().V1().StorageClasses(),
PodInformer: informerFactory.Core().V1().Pods(), PodInformer: informerFactory.Core().V1().Pods(),
NodeInformer: informerFactory.Core().V1().Nodes(), NodeInformer: informerFactory.Core().V1().Nodes(),
EventRecorder: record.NewFakeRecorder(1000),
EnableDynamicProvisioning: enableDynamicProvisioning, EnableDynamicProvisioning: enableDynamicProvisioning,
} }
ctrl, err := NewController(ctx, params) ctrl, err := NewController(ctx, params)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to construct persistentvolume controller: %v", err) return nil, fmt.Errorf("failed to construct persistentvolume controller: %v", err)
} }
ctrl.eventRecorder = record.NewFakeRecorder(1000)
ctrl.volumeListerSynced = alwaysReady ctrl.volumeListerSynced = alwaysReady
ctrl.claimListerSynced = alwaysReady ctrl.claimListerSynced = alwaysReady
ctrl.classListerSynced = alwaysReady ctrl.classListerSynced = alwaysReady

18
pkg/controller/volume/persistentvolume/pv_controller_base.go
View File

@ -72,18 +72,13 @@ type ControllerParameters struct {
ClassInformer storageinformers.StorageClassInformer ClassInformer storageinformers.StorageClassInformer
PodInformer coreinformers.PodInformer PodInformer coreinformers.PodInformer
NodeInformer coreinformers.NodeInformer NodeInformer coreinformers.NodeInformer
EventRecorder record.EventRecorder
EnableDynamicProvisioning bool EnableDynamicProvisioning bool
} }
// NewController creates a new PersistentVolume controller // NewController creates a new PersistentVolume controller
func NewController(ctx context.Context, p ControllerParameters) (*PersistentVolumeController, error) { func NewController(ctx context.Context, p ControllerParameters) (*PersistentVolumeController, error) {
eventRecorder := p.EventRecorder eventBroadcaster := record.NewBroadcaster()
var eventBroadcaster record.EventBroadcaster eventRecorder := eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "persistentvolume-controller"})
if eventRecorder == nil {
eventBroadcaster = record.NewBroadcaster()
eventRecorder = eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "persistentvolume-controller"})
}
controller := &PersistentVolumeController{ controller := &PersistentVolumeController{
volumes: newPersistentVolumeOrderedIndex(), volumes: newPersistentVolumeOrderedIndex(),
@ -310,11 +305,10 @@ func (ctrl *PersistentVolumeController) Run(ctx context.Context) {
defer ctrl.volumeQueue.ShutDown() defer ctrl.volumeQueue.ShutDown()
// Start events processing pipeline. // Start events processing pipeline.
if ctrl.eventBroadcaster != nil { ctrl.eventBroadcaster.StartStructuredLogging(0)
ctrl.eventBroadcaster.StartStructuredLogging(0) ctrl.eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: ctrl.kubeClient.CoreV1().Events("")})
ctrl.eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: ctrl.kubeClient.CoreV1().Events("")}) defer ctrl.eventBroadcaster.Shutdown()
defer ctrl.eventBroadcaster.Shutdown()
}
logger := klog.FromContext(ctx) logger := klog.FromContext(ctx)
logger.Info("Starting persistent volume controller") logger.Info("Starting persistent volume controller")
defer logger.Info("Shutting down persistent volume controller") defer logger.Info("Shutting down persistent volume controller")