Use the And controller-runtime function to create a composite predicate

kevin85421 · kevin85421 · commit 7ca54bff0f1f · 2024-01-17T20:57:08.000Z
Use the `And` controller-runtime function to create a composite predicate.
diff --git a/internal/mode/static/manager.go b/internal/mode/static/manager.go
@@ -281,8 +281,9 @@ func registerControllers(
 		{
 			objectType: &gatewayv1.GatewayClass{},
 			options: []controller.Option{
-				controller.WithK8sPredicate(k8spredicate.GenerationChangedPredicate{}),
-				controller.WithK8sPredicate(predicate.GatewayClassPredicate{ControllerName: cfg.GatewayCtlrName}),
+				controller.WithK8sPredicate(k8spredicate.And(
+					k8spredicate.GenerationChangedPredicate{},
+					predicate.GatewayClassPredicate{ControllerName: cfg.GatewayCtlrName})),
 			},
 		},
 		{

Original file line number	Diff line number	Diff line change
`@@ -281,8 +281,9 @@ func registerControllers(`
`281`	`281`	`{`
`282`	`282`	`objectType: &gatewayv1.GatewayClass{},`
`283`	`283`	`options: []controller.Option{`
`284`		`- controller.WithK8sPredicate(k8spredicate.GenerationChangedPredicate{}),`
`285`		`- controller.WithK8sPredicate(predicate.GatewayClassPredicate{ControllerName: cfg.GatewayCtlrName}),`
	`284`	`+ controller.WithK8sPredicate(k8spredicate.And(`
	`285`	`+ k8spredicate.GenerationChangedPredicate{},`
	`286`	`+ predicate.GatewayClassPredicate{ControllerName: cfg.GatewayCtlrName})),`
`286`	`287`	`},`
`287`	`288`	`},`
`288`	`289`	`{`