Skip to content

Commit 3a584fe

Browse files
kobzonegakobzonega
committed
do not append ObservedGeneration for RemoteResource conditions
1 parent 1eaae78 commit 3a584fe

File tree

8 files changed

+39
-47
lines changed

8 files changed

+39
-47
lines changed

‎internal/controllers/database/sync.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ func (r *Reconciler) waitForNodeSetsToProvisioned(
277277
Status: metav1.ConditionTrue,
278278
Reason: ReasonCompleted,
279279
ObservedGeneration: database.Generation,
280-
Message: "Successfully scaled to desired number of nodes",
280+
Message: fmt.Sprintf("Successfully scaled to desired number of nodes: %d", database.Spec.Nodes),
281281
})
282282
return r.updateStatus(ctx, database, StatusUpdateRequeueDelay)
283283
}
@@ -343,7 +343,7 @@ func (r *Reconciler) waitForStatefulSetToScale(
343343
Status: metav1.ConditionFalse,
344344
Reason: ReasonInProgress,
345345
ObservedGeneration: database.Generation,
346-
Message: "Number of running nodes does not match expected",
346+
Message: fmt.Sprintf("Number of running nodes does not match expected: %d != %d", foundStatefulSet.Status.ReadyReplicas, database.Spec.Nodes),
347347
})
348348
return r.updateStatus(ctx, database, DefaultRequeueDelay)
349349
}
@@ -354,7 +354,7 @@ func (r *Reconciler) waitForStatefulSetToScale(
354354
Status: metav1.ConditionTrue,
355355
Reason: ReasonCompleted,
356356
ObservedGeneration: database.Generation,
357-
Message: "Successfully scaled to desired number of nodes",
357+
Message: fmt.Sprintf("Successfully scaled to desired number of nodes: %d", database.Spec.Nodes),
358358
})
359359
return r.updateStatus(ctx, database, StatusUpdateRequeueDelay)
360360
}

‎internal/controllers/databasenodeset/sync.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ func (r *Reconciler) waitForStatefulSetToScale(
242242
Status: metav1.ConditionFalse,
243243
Reason: ReasonInProgress,
244244
ObservedGeneration: databaseNodeSet.Generation,
245-
Message: "Number of running nodes does not match expected",
245+
Message: fmt.Sprintf("Number of running nodes does not match expected: %d != %d", foundStatefulSet.Status.ReadyReplicas, databaseNodeSet.Spec.Nodes),
246246
})
247247
return r.updateStatus(ctx, databaseNodeSet, DefaultRequeueDelay)
248248
}
@@ -253,7 +253,7 @@ func (r *Reconciler) waitForStatefulSetToScale(
253253
Status: metav1.ConditionTrue,
254254
Reason: ReasonCompleted,
255255
ObservedGeneration: databaseNodeSet.Generation,
256-
Message: "Successfully scaled to desired number of nodes",
256+
Message: fmt.Sprintf("Successfully scaled to desired number of nodes: %d", databaseNodeSet.Spec.Nodes),
257257
})
258258
return r.updateStatus(ctx, databaseNodeSet, StatusUpdateRequeueDelay)
259259
}

‎internal/controllers/remotedatabasenodeset/remote_objects.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ func (r *Reconciler) syncRemoteObjects(
5757
) (bool, ctrl.Result, error) {
5858
r.Log.Info("running step syncRemoteObjects")
5959

60-
for idx := range remoteObjects {
61-
remoteObj := remoteObjects[idx]
60+
for _, remoteObj := range remoteObjects {
6261
remoteObjName := remoteObj.GetName()
6362
remoteObjKind := remoteObj.GetObjectKind().GroupVersionKind().Kind
6463
var remoteResource *v1alpha1.RemoteResource

‎internal/controllers/remotestoragenodeset/remote_objects.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ func (r *Reconciler) syncRemoteObjects(
5757
) (bool, ctrl.Result, error) {
5858
r.Log.Info("running step syncRemoteObjects")
5959

60-
for idx := range remoteObjects {
61-
remoteObj := remoteObjects[idx]
60+
for _, remoteObj := range remoteObjects {
6261
remoteObjName := remoteObj.GetName()
6362
remoteObjKind := remoteObj.GetObjectKind().GroupVersionKind().Kind
6463
var remoteResource *v1alpha1.RemoteResource
@@ -145,7 +144,7 @@ func (r *Reconciler) syncRemoteObjects(
145144
"Provisioning",
146145
fmt.Sprintf("RemoteSync CREATE resource %s with name %s", remoteObjKind, remoteObjName),
147146
)
148-
remoteStorageNodeSet.UpdateRemoteResourceStatus(remoteResource, metav1.ConditionFalse, remoteObjRV)
147+
remoteStorageNodeSet.UpdateRemoteResourceStatus(remoteResource, metav1.ConditionTrue, remoteObjRV)
149148
return r.updateStatusRemoteObjects(ctx, remoteStorageNodeSet, StatusUpdateRequeueDelay)
150149
}
151150

‎internal/controllers/storage/sync.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ func (r *Reconciler) waitForStatefulSetToScale(
158158
Type: StorageProvisionedCondition,
159159
Status: metav1.ConditionFalse,
160160
Reason: ReasonInProgress,
161-
Message: "Number of running nodes does not match expected",
161+
Message: fmt.Sprintf("Number of running nodes does not match expected: %d != %d", foundStatefulSet.Status.ReadyReplicas, storage.Spec.Nodes),
162162
})
163163
return r.updateStatus(ctx, storage, DefaultRequeueDelay)
164164
}
@@ -168,7 +168,7 @@ func (r *Reconciler) waitForStatefulSetToScale(
168168
Type: StorageProvisionedCondition,
169169
Status: metav1.ConditionTrue,
170170
Reason: ReasonCompleted,
171-
Message: "Successfully scaled to desired number of nodes",
171+
Message: fmt.Sprintf("Successfully scaled to desired number of nodes: %d", storage.Spec.Nodes),
172172
})
173173
return r.updateStatus(ctx, storage, StatusUpdateRequeueDelay)
174174
}
@@ -266,7 +266,7 @@ func (r *Reconciler) waitForNodeSetsToProvisioned(
266266
Type: StorageProvisionedCondition,
267267
Status: metav1.ConditionTrue,
268268
Reason: ReasonCompleted,
269-
Message: "Successfully scaled to desired number of nodes",
269+
Message: fmt.Sprintf("Successfully scaled to desired number of nodes: %d", storage.Spec.Nodes),
270270
})
271271
return r.updateStatus(ctx, storage, StatusUpdateRequeueDelay)
272272
}

‎internal/controllers/storagenodeset/sync.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ func (r *Reconciler) waitForStatefulSetToScale(
237237
Type: NodeSetProvisionedCondition,
238238
Status: metav1.ConditionFalse,
239239
Reason: ReasonInProgress,
240-
Message: "Number of running nodes does not match expected",
240+
Message: fmt.Sprintf("Number of running nodes does not match expected: %d != %d", foundStatefulSet.Status.ReadyReplicas, storageNodeSet.Spec.Nodes),
241241
})
242242
return r.updateStatus(ctx, storageNodeSet, DefaultRequeueDelay)
243243
}
@@ -248,7 +248,7 @@ func (r *Reconciler) waitForStatefulSetToScale(
248248
Status: metav1.ConditionTrue,
249249
Reason: ReasonCompleted,
250250
ObservedGeneration: storageNodeSet.Generation,
251-
Message: "Successfully scaled to desired number of nodes",
251+
Message: fmt.Sprintf("Successfully scaled to desired number of nodes: %d", storageNodeSet.Spec.Nodes),
252252
})
253253
return r.updateStatus(ctx, storageNodeSet, StatusUpdateRequeueDelay)
254254
}

‎internal/resources/remotedatabasenodeset.go

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -203,40 +203,37 @@ func (b *RemoteDatabaseNodeSetResource) CreateRemoteResourceStatus(
203203
meta.SetStatusCondition(
204204
&b.Status.RemoteResources[len(b.Status.RemoteResources)-1].Conditions,
205205
metav1.Condition{
206-
Type: RemoteResourceSyncedCondition,
207-
Status: metav1.ConditionUnknown,
208-
Reason: ReasonInProgress,
209-
ObservedGeneration: b.Generation,
210-
Message: "Sync remoteObject in progress",
206+
Type: RemoteResourceSyncedCondition,
207+
Status: metav1.ConditionUnknown,
208+
Reason: ReasonInProgress,
209+
Message: "Sync remoteObject in progress",
211210
},
212211
)
213212
}
214213

215214
func (b *RemoteDatabaseNodeSetResource) UpdateRemoteResourceStatus(
216215
remoteResource *api.RemoteResource,
217216
status metav1.ConditionStatus,
218-
message string,
217+
resourceVersion string,
219218
) {
220219
if status == metav1.ConditionFalse {
221220
meta.SetStatusCondition(&remoteResource.Conditions,
222221
metav1.Condition{
223-
Type: RemoteResourceSyncedCondition,
224-
Status: metav1.ConditionFalse,
225-
Reason: ReasonInProgress,
226-
ObservedGeneration: b.Generation,
227-
Message: fmt.Sprintf("Failed to sync remoteObject to resourceVersion %s", message),
222+
Type: RemoteResourceSyncedCondition,
223+
Status: metav1.ConditionFalse,
224+
Reason: ReasonInProgress,
225+
Message: fmt.Sprintf("Failed to sync remoteObject to resourceVersion %s", resourceVersion),
228226
})
229227
remoteResource.State = ResourceSyncPending
230228
}
231229

232230
if status == metav1.ConditionTrue {
233231
meta.SetStatusCondition(&remoteResource.Conditions,
234232
metav1.Condition{
235-
Type: RemoteResourceSyncedCondition,
236-
Status: metav1.ConditionTrue,
237-
Reason: ReasonCompleted,
238-
ObservedGeneration: b.Generation,
239-
Message: fmt.Sprintf("Successfully synced remoteObject to resourceVersion %s", message),
233+
Type: RemoteResourceSyncedCondition,
234+
Status: metav1.ConditionTrue,
235+
Reason: ReasonCompleted,
236+
Message: fmt.Sprintf("Successfully synced remoteObject to resourceVersion %s", resourceVersion),
240237
})
241238
remoteResource.State = ResourceSyncSuccess
242239
}

‎internal/resources/remotestoragenodeset.go

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -182,40 +182,37 @@ func (b *RemoteStorageNodeSetResource) CreateRemoteResourceStatus(remoteObj clie
182182
meta.SetStatusCondition(
183183
&b.Status.RemoteResources[len(b.Status.RemoteResources)-1].Conditions,
184184
metav1.Condition{
185-
Type: RemoteResourceSyncedCondition,
186-
Status: metav1.ConditionUnknown,
187-
Reason: ReasonInProgress,
188-
ObservedGeneration: b.Generation,
189-
Message: "Sync remoteObject in progress",
185+
Type: RemoteResourceSyncedCondition,
186+
Status: metav1.ConditionUnknown,
187+
Reason: ReasonInProgress,
188+
Message: "Sync remoteObject in progress",
190189
},
191190
)
192191
}
193192

194193
func (b *RemoteStorageNodeSetResource) UpdateRemoteResourceStatus(
195194
remoteResource *api.RemoteResource,
196195
status metav1.ConditionStatus,
197-
message string,
196+
resourceVersion string,
198197
) {
199198
if status == metav1.ConditionFalse {
200199
meta.SetStatusCondition(&remoteResource.Conditions,
201200
metav1.Condition{
202-
Type: RemoteResourceSyncedCondition,
203-
Status: metav1.ConditionFalse,
204-
Reason: ReasonInProgress,
205-
ObservedGeneration: b.Generation,
206-
Message: fmt.Sprintf("Failed to sync remoteObject to resourceVersion %s", message),
201+
Type: RemoteResourceSyncedCondition,
202+
Status: metav1.ConditionFalse,
203+
Reason: ReasonInProgress,
204+
Message: fmt.Sprintf("Failed to sync remoteObject to resourceVersion %s", resourceVersion),
207205
})
208206
remoteResource.State = ResourceSyncPending
209207
}
210208

211209
if status == metav1.ConditionTrue {
212210
meta.SetStatusCondition(&remoteResource.Conditions,
213211
metav1.Condition{
214-
Type: RemoteResourceSyncedCondition,
215-
Status: metav1.ConditionTrue,
216-
Reason: ReasonCompleted,
217-
ObservedGeneration: b.Generation,
218-
Message: fmt.Sprintf("Successfully synced remoteObject to resourceVersion %s", message),
212+
Type: RemoteResourceSyncedCondition,
213+
Status: metav1.ConditionTrue,
214+
Reason: ReasonCompleted,
215+
Message: fmt.Sprintf("Successfully synced remoteObject to resourceVersion %s", resourceVersion),
219216
})
220217
remoteResource.State = ResourceSyncSuccess
221218
}

0 commit comments

Comments
 (0)