Move watch to pre-apply

justinsb · justinsb · commit cbb12faf2aa8 · 2023-03-02T22:58:32.000-05:00
diff --git a/pkg/patterns/declarative/watch.go b/pkg/patterns/declarative/watch.go
@@ -151,8 +151,8 @@ type clusterWatch struct {
 	registered map[string]struct{}
 }
 
-// AfterApply is called by the controller after an apply. We establish any new watches.
-func (w *clusterWatch) AfterApply(ctx context.Context, op *ApplyOperation) error {
+// BeforeApply is called by the controller before an apply. We establish any new watches that will be needed by the apply.
+func (w *clusterWatch) BeforeApply(ctx context.Context, op *ApplyOperation) error {
 	log := log.FromContext(ctx)
 
 	labelSelector, err := labels.ValidatedSelectorFromSet(w.labelMaker(ctx, op.Subject))

Original file line number	Diff line number	Diff line change
`@@ -151,8 +151,8 @@ type clusterWatch struct {`
`151`	`151`	`registered map[string]struct{}`
`152`	`152`	`}`
`153`	`153`
`154`		`-// AfterApply is called by the controller after an apply. We establish any new watches.`
`155`		`-func (w clusterWatch) AfterApply(ctx context.Context, op ApplyOperation) error {`
	`154`	`+// BeforeApply is called by the controller before an apply. We establish any new watches that will be needed by the apply.`
	`155`	`+func (w clusterWatch) BeforeApply(ctx context.Context, op ApplyOperation) error {`
`156`	`156`	`log := log.FromContext(ctx)`
`157`	`157`
`158`	`158`	`labelSelector, err := labels.ValidatedSelectorFromSet(w.labelMaker(ctx, op.Subject))`