Skip to content

Move pkg/predicate closer to where it is used. #3491

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

Closed
jmrodri wants to merge 2 commits into from
Closed

Move pkg/predicate closer to where it is used. #3491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71ba385
Move pkg/predicate closer to where it is used.
jmrodri Jul 22, 2020
3bf43a4
Favor c-r GenerationChangedPredicate instead of ours
jmrodri Jul 22, 2020
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
5 changes: 3 additions & 2 deletions pkg/ansible/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,13 @@ import (
"sigs.k8s.io/controller-runtime/pkg/controller"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
crpredicate "sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/source"

"github.com/operator-framework/operator-sdk/pkg/ansible/events"
"github.com/operator-framework/operator-sdk/pkg/ansible/predicate"
"github.com/operator-framework/operator-sdk/pkg/ansible/runner"
handler "github.com/operator-framework/operator-sdk/pkg/handler"
"github.com/operator-framework/operator-sdk/pkg/predicate"
)

var log = logf.Log.WithName("ansible-controller")
Expand Down Expand Up @@ -107,7 +108,7 @@ func Add(mgr manager.Manager, options Options) *controller.Controller {
}

if err := c.Watch(&source.Kind{Type: u}, &handler.InstrumentedEnqueueRequestForObject{},
predicate.GenerationChangedPredicate{}, filterPredicate); err != nil {
crpredicate.GenerationChangedPredicate{}, filterPredicate); err != nil {
log.Error(err, "")
os.Exit(1)
}
Expand Down
33 changes: 0 additions & 33 deletions pkg/predicate/predicate.go → pkg/ansible/predicate/predicate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,47 +18,14 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"sigs.k8s.io/controller-runtime/pkg/event"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/predicate"
)

var log = logf.Log.WithName("predicate").WithName("eventFilters")

// GenerationChangedPredicate implements a default update predicate function on generation change
// (adapted from sigs.k8s.io/controller-runtime/pkg/predicate/predicate.ResourceVersionChangedPredicate)
type GenerationChangedPredicate struct {
predicate.Funcs
}

type ResourceFilterPredicate struct {
predicate.Funcs
Selector labels.Selector
}

// Update implements default UpdateEvent filter for validating generation change
func (GenerationChangedPredicate) Update(e event.UpdateEvent) bool {
if e.MetaOld == nil {
log.Error(nil, "Update event has no old metadata", "event", e)
return false
}
if e.ObjectOld == nil {
log.Error(nil, "Update event has no old runtime object to update", "event", e)
return false
}
if e.ObjectNew == nil {
log.Error(nil, "Update event has no new runtime object for update", "event", e)
return false
}
if e.MetaNew == nil {
log.Error(nil, "Update event has no new metadata", "event", e)
return false
}
if e.MetaNew.GetGeneration() == e.MetaOld.GetGeneration() && e.MetaNew.GetGeneration() != 0 {
return false
}
return true
}

// Skips events that have labels matching selectors defined in watches.yaml
func (r ResourceFilterPredicate) eventFilter(eventLabels map[string]string) bool {
return r.Selector.Matches(labels.Set(eventLabels))
Expand Down