Skip to content

Commit 320c42b

Browse files
committed
use "Typed" variants for some structs in event and handler packages
ref: kubernetes-sigs/controller-runtime#2783 Signed-off-by: Shinya Hayashi <shinya-hayashi@cybozu.co.jp>
1 parent 2af80b1 commit 320c42b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

local-pv-provisioner/controllers/persistent_volume.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (r *PersistentVolumeReconciler) Reconcile(ctx context.Context, req ctrl.Req
6262

6363
// SetupWithManager sets up the controller with the Manager.
6464
func (r *PersistentVolumeReconciler) SetupWithManager(mgr ctrl.Manager, nodeName string) error {
65-
ch := make(chan event.GenericEvent)
65+
ch := make(chan event.TypedGenericEvent[*corev1.PersistentVolume])
6666
watcher := &persistentVolumeWatcher{
6767
client: mgr.GetClient(),
6868
ch: ch,
@@ -73,7 +73,7 @@ func (r *PersistentVolumeReconciler) SetupWithManager(mgr ctrl.Manager, nodeName
7373
if err != nil {
7474
return err
7575
}
76-
src := source.Channel(ch, &handler.EnqueueRequestForObject{})
76+
src := source.Channel(ch, &handler.TypedEnqueueRequestForObject[*corev1.PersistentVolume]{})
7777

7878
pred := predicate.Funcs{
7979
CreateFunc: func(event.CreateEvent) bool { return true },
@@ -91,7 +91,7 @@ func (r *PersistentVolumeReconciler) SetupWithManager(mgr ctrl.Manager, nodeName
9191

9292
type persistentVolumeWatcher struct {
9393
client client.Client
94-
ch chan<- event.GenericEvent
94+
ch chan<- event.TypedGenericEvent[*corev1.PersistentVolume]
9595
nodeName string
9696
tick time.Duration
9797
}
@@ -126,7 +126,7 @@ func (w *persistentVolumeWatcher) fireEvent(ctx context.Context) error {
126126
if pv.Status.Phase != corev1.VolumeReleased {
127127
continue
128128
}
129-
w.ch <- event.GenericEvent{
129+
w.ch <- event.TypedGenericEvent[*corev1.PersistentVolume]{
130130
Object: pv.DeepCopy(),
131131
}
132132
}

0 commit comments

Comments
 (0)