Skip to content

Commit 27889b7

Browse files
committed
fix: include syncPeriod on all request response
Signed-off-by: dntosas <ntosas@gmail.com>
1 parent a4f2b45 commit 27889b7

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

controllers/capi2argo_reconciler.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func (r *Capi2Argo) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resul
6161

6262
// Validate Secret.Metadata.Name complies with CAPI pattern: <clusterName>-kubeconfig
6363
if !ValidateCapiNaming(req.NamespacedName) {
64-
return ctrl.Result{}, nil
64+
return ctrl.Result{RequeueAfter: r.SyncPeriod}, nil
6565
}
6666

6767
// Fetch CapiSecret
@@ -71,7 +71,7 @@ func (r *Capi2Argo) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resul
7171
if err != nil {
7272
// If we get error reading the object - requeue the request.
7373
if client.IgnoreNotFound(err) != nil {
74-
return ctrl.Result{}, err
74+
return ctrl.Result{RequeueAfter: r.SyncPeriod}, err
7575
}
7676

7777
// If secret is deleted and GC is enabled, mark ArgoSecret for deletion.
@@ -87,21 +87,21 @@ func (r *Capi2Argo) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resul
8787
if err != nil {
8888
log.Error(err, "Failed to list Cluster Secrets")
8989

90-
return ctrl.Result{}, err
90+
return ctrl.Result{RequeueAfter: r.SyncPeriod}, err
9191
}
9292

9393
if err := r.Delete(ctx, &secretList.Items[0]); err != nil {
9494
log.Error(err, "Failed to delete ArgoSecret")
9595

96-
return ctrl.Result{}, err
96+
return ctrl.Result{RequeueAfter: r.SyncPeriod}, err
9797
}
9898

9999
log.Info("Deleted successfully of ArgoSecret")
100100

101-
return ctrl.Result{}, nil
101+
return ctrl.Result{RequeueAfter: r.SyncPeriod}, nil
102102
}
103103

104-
return ctrl.Result{}, client.IgnoreNotFound(err)
104+
return ctrl.Result{RequeueAfter: r.SyncPeriod}, client.IgnoreNotFound(err)
105105
}
106106

107107
log.Info("Fetched CapiSecret")
@@ -112,7 +112,7 @@ func (r *Capi2Argo) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resul
112112
if err != nil {
113113
log.Info("Ignoring secret as it's missing proper CAPI type", "type", capiSecret.Type)
114114

115-
return ctrl.Result{}, err
115+
return ctrl.Result{RequeueAfter: r.SyncPeriod}, err
116116
}
117117

118118
// Construct CapiCluster from CapiSecret.
@@ -124,7 +124,7 @@ func (r *Capi2Argo) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resul
124124
if err != nil {
125125
log.Error(err, "Failed to unmarshal CapiCluster")
126126

127-
return ctrl.Result{}, err
127+
return ctrl.Result{RequeueAfter: r.SyncPeriod}, err
128128
}
129129

130130
clusterObject := &clusterv1.Cluster{}
@@ -138,15 +138,15 @@ func (r *Capi2Argo) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resul
138138
if validateClusterIgnoreLabel(clusterObject) {
139139
log.Info("The cluster has label to be ignored, skipping...")
140140

141-
return ctrl.Result{}, nil
141+
return ctrl.Result{RequeueAfter: r.SyncPeriod}, nil
142142
}
143143

144144
// Construct ArgoCluster from CapiCluster and CapiSecret.Metadata.
145145
argoCluster, err := NewArgoCluster(capiCluster, &capiSecret, clusterObject)
146146
if err != nil {
147147
log.Error(err, "Failed to construct ArgoCluster")
148148

149-
return ctrl.Result{}, err
149+
return ctrl.Result{RequeueAfter: r.SyncPeriod}, err
150150
}
151151

152152
// Convert ArgoCluster into ArgoSecret to work natively on k8s objects.
@@ -156,7 +156,7 @@ func (r *Capi2Argo) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resul
156156
if err != nil {
157157
log.Error(err, "Failed to convert ArgoCluster to ArgoSecret")
158158

159-
return ctrl.Result{}, err
159+
return ctrl.Result{RequeueAfter: r.SyncPeriod}, err
160160
}
161161

162162
// Represent a possible existing ArgoSecret.
@@ -177,7 +177,7 @@ func (r *Capi2Argo) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resul
177177
} else {
178178
log.Error(err, "Failed to fetch ArgoSecret to check if exists")
179179

180-
return ctrl.Result{}, err
180+
return ctrl.Result{RequeueAfter: r.SyncPeriod}, err
181181
}
182182

183183
// Reconcile ArgoSecret:
@@ -191,12 +191,12 @@ func (r *Capi2Argo) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resul
191191
if err := r.Create(ctx, argoSecret); err != nil {
192192
log.Error(err, "Failed to create ArgoSecret")
193193

194-
return ctrl.Result{}, err
194+
return ctrl.Result{RequeueAfter: r.SyncPeriod}, err
195195
}
196196

197197
log.Info("Created new ArgoSecret")
198198

199-
return ctrl.Result{}, nil
199+
return ctrl.Result{RequeueAfter: r.SyncPeriod}, nil
200200

201201
case true:
202202
log.Info("Checking if ArgoSecret is managed by the Controller")
@@ -205,7 +205,7 @@ func (r *Capi2Argo) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resul
205205
if err != nil {
206206
log.Info("Not managed by Controller, skipping...")
207207

208-
return ctrl.Result{}, nil
208+
return ctrl.Result{RequeueAfter: r.SyncPeriod}, nil
209209
}
210210

211211
log.Info("Checking if ArgoSecret is out-of-sync with")
@@ -280,20 +280,20 @@ func (r *Capi2Argo) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resul
280280
if err := r.Update(ctx, &existingSecret); err != nil {
281281
log.Error(err, "Failed to update ArgoSecret")
282282

283-
return ctrl.Result{}, err
283+
return ctrl.Result{RequeueAfter: r.SyncPeriod}, err
284284
}
285285

286286
log.Info("Updated successfully of ArgoSecret")
287287

288-
return ctrl.Result{}, nil
288+
return ctrl.Result{RequeueAfter: r.SyncPeriod}, nil
289289
}
290290

291291
log.Info("ArgoSecret is in-sync with CapiCluster, skipping...")
292292

293293
return ctrl.Result{RequeueAfter: r.SyncPeriod}, nil
294294
}
295295

296-
return ctrl.Result{}, nil
296+
return ctrl.Result{RequeueAfter: r.SyncPeriod}, nil
297297
}
298298

299299
// SetupWithManager ..

0 commit comments

Comments
 (0)