Skip to content

Commit c743109

Browse files
committed
fix: move field index to mc manager
1 parent 4d47874 commit c743109

2 files changed

Lines changed: 20 additions & 22 deletions

File tree

cmd/main.go

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -262,28 +262,6 @@ func main() {
262262
os.Exit(1)
263263
}
264264

265-
// Register field indexes used by the replicator when listing DNSRecordSets
266-
if err := deploymentCluster.GetCache().IndexField(context.Background(),
267-
&dnsv1alpha1.DNSRecordSet{}, "spec.dnsZoneRef.name",
268-
func(obj client.Object) []string {
269-
rs := obj.(*dnsv1alpha1.DNSRecordSet)
270-
return []string{rs.Spec.DNSZoneRef.Name}
271-
},
272-
); err != nil {
273-
setupLog.Error(err, "failed to index spec.dnsZoneRef.name")
274-
os.Exit(1)
275-
}
276-
if err := deploymentCluster.GetCache().IndexField(context.Background(),
277-
&dnsv1alpha1.DNSRecordSet{}, "spec.recordType",
278-
func(obj client.Object) []string {
279-
rs := obj.(*dnsv1alpha1.DNSRecordSet)
280-
return []string{string(rs.Spec.RecordType)}
281-
},
282-
); err != nil {
283-
setupLog.Error(err, "failed to index spec.recordType")
284-
os.Exit(1)
285-
}
286-
287265
// Initialize cluster discovery provider (single or milo)
288266
runnables, provider, err := initializeClusterDiscovery(serverConfig, deploymentCluster, scheme)
289267
if err != nil {

internal/controller/dnszone_replicator_controller.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,26 @@ func (r *DNSZoneReplicator) updateStatus(ctx context.Context, c client.Client, s
402402
func (r *DNSZoneReplicator) SetupWithManager(mgr mcmanager.Manager, downstreamCl cluster.Cluster) error {
403403
r.mgr = mgr
404404

405+
// Register field indexes used by this controller when listing DNSRecordSets
406+
if err := mgr.GetFieldIndexer().IndexField(context.Background(),
407+
&dnsv1alpha1.DNSRecordSet{}, "spec.dnsZoneRef.name",
408+
func(obj client.Object) []string {
409+
rs := obj.(*dnsv1alpha1.DNSRecordSet)
410+
return []string{rs.Spec.DNSZoneRef.Name}
411+
},
412+
); err != nil {
413+
return err
414+
}
415+
if err := mgr.GetFieldIndexer().IndexField(context.Background(),
416+
&dnsv1alpha1.DNSRecordSet{}, "spec.recordType",
417+
func(obj client.Object) []string {
418+
rs := obj.(*dnsv1alpha1.DNSRecordSet)
419+
return []string{string(rs.Spec.RecordType)}
420+
},
421+
); err != nil {
422+
return err
423+
}
424+
405425
b := mcbuilder.TypedControllerManagedBy[GVKRequest](mgr)
406426

407427
// Upstream watch

0 commit comments

Comments
 (0)