Skip to content
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

Jump to bottom

Allow default broker controller to reconcile unset brokerclass. #2761

Closed
wants to merge 1 commit into from
Closed

Allow default broker controller to reconcile unset brokerclass. #2761

Show file tree
Hide file tree
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
12 changes: 6 additions & 6 deletions pkg/client/injection/reconciler/eventing/v1alpha1/broker/controller.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions pkg/client/injection/reconciler/eventing/v1alpha1/broker/reconciler.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions pkg/client/injection/reconciler/eventing/v1alpha1/broker/stub/controller.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions pkg/reconciler/broker/broker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@ type Reconciler struct {
// Dynamic tracker to track AddressableTypes. In particular, it tracks Trigger subscribers.
addressableTracker duck.ListableTracker
uriResolver *resolver.URIResolver

// If specified, only reconcile brokers with these labels
brokerClass string
}

// Check that our Reconciler implements Interface
Expand Down
6 changes: 4 additions & 2 deletions pkg/reconciler/broker/broker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import (
messagingv1alpha1 "knative.dev/eventing/pkg/apis/messaging/v1alpha1"
"knative.dev/eventing/pkg/client/injection/ducks/duck/v1alpha1/channelable"
"knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1alpha1/broker"
brokerreconciler "knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1alpha1/broker"
"knative.dev/eventing/pkg/duck"
"knative.dev/eventing/pkg/reconciler"
"knative.dev/eventing/pkg/reconciler/broker/resources"
Expand All @@ -53,6 +54,7 @@ import (
"knative.dev/pkg/configmap"
"knative.dev/pkg/controller"
logtesting "knative.dev/pkg/logging/testing"
pkgreconciler "knative.dev/pkg/reconciler"
"knative.dev/pkg/resolver"
"knative.dev/pkg/system"

Expand Down Expand Up @@ -1459,9 +1461,9 @@ func TestReconcile(t *testing.T) {
channelableTracker: duck.NewListableTracker(ctx, channelable.Get, func(types.NamespacedName) {}, 0),
addressableTracker: duck.NewListableTracker(ctx, v1a1addr.Get, func(types.NamespacedName) {}, 0),
uriResolver: resolver.NewURIResolver(ctx, func(types.NamespacedName) {}),
brokerClass: eventing.ChannelBrokerClassValue,
}
return broker.NewReconciler(ctx, r.Logger, r.EventingClientSet, listers.GetBrokerLister(), r.Recorder, r, eventing.ChannelBrokerClassValue)
classFilter := pkgreconciler.AnnotationFilterFunc(brokerreconciler.ClassAnnotationKey, eventing.ChannelBrokerClassValue, true)
return broker.NewReconciler(ctx, r.Logger, r.EventingClientSet, listers.GetBrokerLister(), r.Recorder, r, classFilter)

},
false,
Expand Down
9 changes: 5 additions & 4 deletions pkg/reconciler/broker/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,11 @@ func NewController(
ingressServiceAccountName: env.IngressServiceAccount,
filterImage: env.FilterImage,
filterServiceAccountName: env.FilterServiceAccount,
brokerClass: env.BrokerClass,
}

impl := brokerreconciler.NewImpl(ctx, r, env.BrokerClass)
classValue := env.BrokerClass
allowUnset := true
classFilter := pkgreconciler.AnnotationFilterFunc(brokerreconciler.ClassAnnotationKey, classValue, allowUnset /*allowUnset*/)
impl := brokerreconciler.NewImpl(ctx, r, classFilter)

r.Logger.Info("Setting up event handlers")

Expand All @@ -103,7 +104,7 @@ func NewController(
r.uriResolver = resolver.NewURIResolver(ctx, impl.EnqueueKey)

brokerInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{
FilterFunc: pkgreconciler.AnnotationFilterFunc(brokerreconciler.ClassAnnotationKey, env.BrokerClass, false /*allowUnset*/),
FilterFunc: classFilter,
Handler: controller.HandleAll(impl.Enqueue),
})

Expand Down
4 changes: 2 additions & 2 deletions vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/reconciler_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ const (
// the queue through an implementation of {{.controllerReconciler|raw}}, delegating to
// the provided Interface and optional Finalizer methods. OptionsFn is used to return
// {{.controllerOptions|raw}} to be used but the internal reconciler.
func NewImpl(ctx {{.contextContext|raw}}, r Interface{{if .hasClass}}, classValue string{{end}}, optionsFns ...{{.controllerOptionsFn|raw}}) *{{.controllerImpl|raw}} {
func NewImpl(ctx {{.contextContext|raw}}, r Interface{{if .hasClass}}, classFilter func(interface{}) bool{{end}}, optionsFns ...{{.controllerOptionsFn|raw}}) *{{.controllerImpl|raw}} {
logger := {{.loggingFromContext|raw}}(ctx)

// Check the options function input. It should be 0 or 1.
Expand Down Expand Up @@ -198,7 +198,7 @@ func NewImpl(ctx {{.contextContext|raw}}, r Interface{{if .hasClass}}, classValu
Lister: {{.type|lowercaseSingular}}Informer.Lister(),
Recorder: recorder,
reconciler: r,
{{if .hasClass}}classValue: classValue,{{end}}
{{if .hasClass}}classFilter: classFilter,{{end}}
}
impl := {{.controllerNewImpl|raw}}(rec, logger, defaultQueueName)

Expand Down
5 changes: 3 additions & 2 deletions vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/reconciler_controller_stub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,15 @@ func NewController(

{{if .hasClass}}
classValue := "default" // TODO: update this to the appropriate value.
classFilter := {{.annotationFilterFunc|raw}}({{.classAnnotationKey|raw}}, classValue, false /*allowUnset*/)
allowUnset := false // TODO: update this to specific matching unset ClassAnnotationKey or not.
classFilter := {{.annotationFilterFunc|raw}}({{.classAnnotationKey|raw}}, classValue, allowUnset /*allowUnset*/)
{{end}}

// TODO: setup additional informers here.
{{if .hasClass}}// TODO: remember to use the classFilter from above to filter appropriately.{{end}}

r := &Reconciler{}
impl := {{.reconcilerNewImpl|raw}}(ctx, r{{if .hasClass}}, classValue{{end}})
impl := {{.reconcilerNewImpl|raw}}(ctx, r{{if .hasClass}}, classFilter{{end}})

logger.Info("Setting up event handlers.")

Expand Down
12 changes: 6 additions & 6 deletions vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/reconciler_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ type reconcilerImpl struct {
reconciler Interface

{{if .hasClass}}
// classValue is the resource annotation[{{ .class }}] instance value this reconciler instance filters on.
classValue string
// classFilter is the filter function for annotation[eventing.knative.dev/broker.class] instance value this reconciler instance filters on.
classFilter func(interface{}) bool
{{end}}
}

Expand All @@ -209,7 +209,7 @@ var _ controller.Reconciler = (*reconcilerImpl)(nil)
`

var reconcilerNewReconciler = `
func NewReconciler(ctx {{.contextContext|raw}}, logger *{{.zapSugaredLogger|raw}}, client {{.clientsetInterface|raw}}, lister {{.resourceLister|raw}}, recorder {{.recordEventRecorder|raw}}, r Interface{{if .hasClass}}, classValue string{{end}}, options ...{{.controllerOptions|raw}} ) {{.controllerReconciler|raw}} {
func NewReconciler(ctx {{.contextContext|raw}}, logger *{{.zapSugaredLogger|raw}}, client {{.clientsetInterface|raw}}, lister {{.resourceLister|raw}}, recorder {{.recordEventRecorder|raw}}, r Interface{{if .hasClass}}, classFilter func(interface{}) bool{{end}}, options ...{{.controllerOptions|raw}} ) {{.controllerReconciler|raw}} {
// Check the options function input. It should be 0 or 1.
if len(options) > 1 {
logger.Fatalf("up to one options struct is supported, found %d", len(options))
Expand All @@ -220,7 +220,7 @@ func NewReconciler(ctx {{.contextContext|raw}}, logger *{{.zapSugaredLogger|raw}
Lister: lister,
Recorder: recorder,
reconciler: r,
{{if .hasClass}}classValue: classValue,{{end}}
{{if .hasClass}}classFilter: classFilter,{{end}}
}

for _, opts := range options {
Expand Down Expand Up @@ -263,10 +263,10 @@ func (r *reconcilerImpl) Reconcile(ctx {{.contextContext|raw}}, key string) erro
return err
}
{{if .hasClass}}
if classValue, found := original.GetAnnotations()[ClassAnnotationKey]; !found || classValue != r.classValue {
if !r.classFilter(original) {
logger.Debugw("Skip reconciling resource, class annotation value does not match reconciler instance value.",
zap.String("classKey", ClassAnnotationKey),
zap.String("issue", classValue+"!="+r.classValue))
zap.String("classValue", original.GetAnnotations()[ClassAnnotationKey]))
return nil
}
{{end}}
Expand Down