Skip to content

Bug 1703234: pkg/operator: ignore CM changes that we don't care about #813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jun 5, 2019
Merged

Bug 1703234: pkg/operator: ignore CM changes that we don't care about #813

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions pkg/operator/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
appslisterv1 "k8s.io/client-go/listers/apps/v1"
corelisterv1 "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/leaderelection/resourcelock"
"k8s.io/client-go/tools/record"
"k8s.io/client-go/util/workqueue"

Expand Down Expand Up @@ -247,12 +248,27 @@ func (optr *Operator) Run(workers int, stopCh <-chan struct{}) {
<-stopCh
}

func (optr *Operator) eventHandler() cache.ResourceEventHandler {
func (optr *Operator) enqueue(obj interface{}) {
// we're filtering out config maps that are "leader" based and we don't have logic around them
// resyncing on these causes the operator to sync every 14s for no good reason
if cm, ok := obj.(*v1.ConfigMap); ok && cm.GetAnnotations() != nil && cm.GetAnnotations()[resourcelock.LeaderElectionRecordAnnotationKey] != "" {
return
}
workQueueKey := fmt.Sprintf("%s/%s", optr.namespace, optr.name)
optr.queue.Add(workQueueKey)
}

func (optr *Operator) eventHandler() cache.ResourceEventHandler {
return cache.ResourceEventHandlerFuncs{
AddFunc: func(obj interface{}) { optr.queue.Add(workQueueKey) },
UpdateFunc: func(old, new interface{}) { optr.queue.Add(workQueueKey) },
DeleteFunc: func(obj interface{}) { optr.queue.Add(workQueueKey) },
AddFunc: func(obj interface{}) {
optr.enqueue(obj)
},
UpdateFunc: func(old, new interface{}) {
optr.enqueue(new)
},
DeleteFunc: func(obj interface{}) {
optr.enqueue(obj)
},
}
}

Expand Down