Skip to content

Commit f43bb04

Browse files
rxbnrxbn
committed
fix: reconcile loop
1 parent 5d097f7 commit f43bb04

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

‎internal/controller/account_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func (r *AccountReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
9393
log.Error(err, "Failed to update Account status")
9494
return ctrl.Result{}, err
9595
}
96-
return ctrl.Result{RequeueAfter: time.Second * 30}, err
96+
return ctrl.Result{RequeueAfter: time.Second * 30}, nil
9797
}
9898

9999
cfApiToken := string(secret.Data["apiToken"])
@@ -112,7 +112,7 @@ func (r *AccountReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
112112
log.Error(err, "Failed to update Account status")
113113
return ctrl.Result{}, err
114114
}
115-
return ctrl.Result{RequeueAfter: time.Second * 30}, err
115+
return ctrl.Result{RequeueAfter: time.Second * 30}, nil
116116
}
117117
*r.Cf = *cf
118118
}

‎internal/controller/dnsrecord_controller.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ func (r *DNSRecordReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
9191
log.Error(err, "Failed to update DNSRecord status")
9292
return ctrl.Result{}, err
9393
}
94-
return ctrl.Result{RequeueAfter: time.Second * 30}, err
94+
return ctrl.Result{RequeueAfter: time.Second * 30}, nil
9595
}
9696
log.Error(err, "Failed to fetch Zone resources")
97-
return ctrl.Result{RequeueAfter: time.Second * 30}, err
97+
return ctrl.Result{RequeueAfter: time.Second * 30}, nil
9898
}
9999

100100
zone := cloudflareoperatoriov1.Zone{}
@@ -143,7 +143,7 @@ func (r *DNSRecordReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
143143
log.Error(err, "Failed to update DNSRecord status")
144144
return ctrl.Result{}, err
145145
}
146-
return ctrl.Result{RequeueAfter: time.Second * 30}, err
146+
return ctrl.Result{RequeueAfter: time.Second * 30}, nil
147147
}
148148
metrics.DnsRecordFailureCounter.DeleteLabelValues(dnsrecord.Namespace, dnsrecord.Name, dnsrecord.Spec.Name)
149149
}
@@ -182,7 +182,7 @@ func (r *DNSRecordReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
182182
log.Error(err, "Failed to update DNSRecord status")
183183
return ctrl.Result{}, err
184184
}
185-
return ctrl.Result{RequeueAfter: time.Second * 30}, err
185+
return ctrl.Result{RequeueAfter: time.Second * 30}, nil
186186
}
187187
if ip.Spec.Address != dnsrecord.Spec.Content {
188188
dnsrecord.Spec.Content = ip.Spec.Address
@@ -216,7 +216,7 @@ func (r *DNSRecordReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
216216
log.Error(err, "Failed to update DNSRecord status")
217217
return ctrl.Result{}, err
218218
}
219-
return ctrl.Result{RequeueAfter: time.Second * 30}, err
219+
return ctrl.Result{RequeueAfter: time.Second * 30}, nil
220220
}
221221
apimeta.SetStatusCondition(&dnsrecord.Status.Conditions, metav1.Condition{
222222
Type: "Ready",
@@ -248,7 +248,7 @@ func (r *DNSRecordReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
248248
log.Error(err, "Failed to update DNSRecord status")
249249
return ctrl.Result{}, err
250250
}
251-
return ctrl.Result{RequeueAfter: time.Second * 30}, err
251+
return ctrl.Result{RequeueAfter: time.Second * 30}, nil
252252
}
253253
apimeta.SetStatusCondition(&dnsrecord.Status.Conditions, metav1.Condition{
254254
Type: "Ready",

‎internal/controller/ingress_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func (r *IngressReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
8080
dnsRecords := &cloudflareoperatoriov1.DNSRecordList{}
8181
if err := r.List(ctx, dnsRecords, client.InNamespace(ingress.Namespace), client.MatchingFields{"metadata.ownerReferences.uid": string(ingress.UID)}); err != nil {
8282
log.Error(err, "Failed to fetch DNSRecord")
83-
return ctrl.Result{RequeueAfter: time.Second * 30}, err
83+
return ctrl.Result{RequeueAfter: time.Second * 30}, nil
8484
}
8585

8686
dnsRecordSpec := cloudflareoperatoriov1.DNSRecordSpec{}

‎internal/controller/ip_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ func (r *IPReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Re
171171
dnsRecords := &cloudflareoperatoriov1.DNSRecordList{}
172172
if err := r.List(ctx, dnsRecords); err != nil {
173173
log.Error(err, "Failed to list DNSRecords")
174-
return ctrl.Result{RequeueAfter: time.Second * 30}, err
174+
return ctrl.Result{RequeueAfter: time.Second * 30}, nil
175175
}
176176

177177
for _, dnsRecord := range dnsRecords.Items {

‎internal/controller/zone_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func (r *ZoneReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
121121
dnsRecords := &cloudflareoperatoriov1.DNSRecordList{}
122122
if err := r.List(ctx, dnsRecords); err != nil {
123123
log.Error(err, "Failed to list DNSRecord resources")
124-
return ctrl.Result{RequeueAfter: time.Second * 30}, err
124+
return ctrl.Result{RequeueAfter: time.Second * 30}, nil
125125
}
126126

127127
cfDnsRecords, _, err := r.Cf.ListDNSRecords(ctx, cloudflare.ZoneIdentifier(zone.Status.ID), cloudflare.ListDNSRecordsParams{})
@@ -130,7 +130,7 @@ func (r *ZoneReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
130130
log.Error(err, "Failed to update Zone status")
131131
return ctrl.Result{}, err
132132
}
133-
return ctrl.Result{RequeueAfter: time.Second * 30}, err
133+
return ctrl.Result{RequeueAfter: time.Second * 30}, nil
134134
}
135135

136136
dnsRecordMap := make(map[string]struct{})

0 commit comments

Comments
 (0)