Skip to content

Commit 8bbac42

Browse files
author
mingzhou.swx
committed
fix resourcedistribution event watch
Signed-off-by: mingzhou.swx <[email protected]>
1 parent 7bcaa1b commit 8bbac42

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

pkg/controller/resourcedistribution/resourcedistribution_controller.go

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -110,39 +110,33 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
110110
}
111111

112112
// Watch for changes to Secrets
113-
err = c.Watch(&source.Kind{Type: &corev1.Secret{}}, &handler.EnqueueRequestForOwner{
113+
secret := unstructured.Unstructured{}
114+
secret.SetGroupVersionKind(corev1.SchemeGroupVersion.WithKind("Secret"))
115+
err = c.Watch(&source.Kind{Type: &secret}, &handler.EnqueueRequestForOwner{
114116
IsController: true, OwnerType: &appsv1alpha1.ResourceDistribution{},
115117
}, predicate.Funcs{
116118
CreateFunc: func(createEvent event.CreateEvent) bool {
117119
return false
118120
},
119-
UpdateFunc: func(updateEvent event.UpdateEvent) bool {
120-
oldObject, oldOK := updateEvent.ObjectOld.(*corev1.Secret)
121-
newObject, newOK := updateEvent.ObjectNew.(*corev1.Secret)
122-
if !oldOK || !newOK {
123-
return false
124-
}
125-
return !reflect.DeepEqual(oldObject.Data, newObject.Data) || !reflect.DeepEqual(oldObject.StringData, newObject.StringData)
121+
GenericFunc: func(genericEvent event.GenericEvent) bool {
122+
return false
126123
},
127124
})
128125
if err != nil {
129126
return err
130127
}
131128

132129
// Watch for changes to ConfigMap
133-
err = c.Watch(&source.Kind{Type: &corev1.ConfigMap{}}, &handler.EnqueueRequestForOwner{
130+
configMap := unstructured.Unstructured{}
131+
configMap.SetGroupVersionKind(corev1.SchemeGroupVersion.WithKind("ConfigMap"))
132+
err = c.Watch(&source.Kind{Type: &configMap}, &handler.EnqueueRequestForOwner{
134133
IsController: true, OwnerType: &appsv1alpha1.ResourceDistribution{},
135134
}, predicate.Funcs{
136135
CreateFunc: func(createEvent event.CreateEvent) bool {
137136
return false
138137
},
139-
UpdateFunc: func(updateEvent event.UpdateEvent) bool {
140-
oldObject, oldOK := updateEvent.ObjectOld.(*corev1.ConfigMap)
141-
newObject, newOK := updateEvent.ObjectNew.(*corev1.ConfigMap)
142-
if !oldOK || !newOK {
143-
return false
144-
}
145-
return !reflect.DeepEqual(oldObject.Data, newObject.Data) || !reflect.DeepEqual(oldObject.BinaryData, newObject.BinaryData)
138+
GenericFunc: func(genericEvent event.GenericEvent) bool {
139+
return false
146140
},
147141
})
148142
if err != nil {

0 commit comments

Comments
 (0)