Skip to content

Commit a2e42e0

Browse files
kobzonegakobzonega
committed
beautify changes nodesets
1 parent 1ca5220 commit a2e42e0

File tree

5 files changed

+57
-33
lines changed

5 files changed

+57
-33
lines changed

‎internal/controllers/constants/constants.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ const (
2424
DatabasePausedCondition = "DatabasePaused"
2525
DatabaseInitializedCondition = "DatabaseInitialized"
2626

27-
NodeSetPreparedCondition = "NodeSetPreparing"
28-
NodeSetProvisionedCondition = "NodeSetProvisioning"
27+
NodeSetPreparedCondition = "NodeSetPrepared"
28+
NodeSetProvisionedCondition = "NodeSetProvisioned"
2929
NodeSetReadyCondition = "NodeSetReady"
3030
NodeSetPausedCondition = "NodeSetPaused"
3131

‎internal/controllers/databasenodeset/sync.go‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
appsv1 "k8s.io/api/apps/v1"
1010
corev1 "k8s.io/api/core/v1"
11+
apierrors "k8s.io/apimachinery/pkg/api/errors"
1112
"k8s.io/apimachinery/pkg/api/meta"
1213
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1314
"k8s.io/apimachinery/pkg/runtime"
@@ -122,7 +123,7 @@ func (r *Reconciler) handleResourcesSync(
122123
r.Recorder.Event(
123124
databaseNodeSet,
124125
corev1.EventTypeWarning,
125-
string(DatabaseNodeSetPreparing),
126+
"ProvisioningFailed",
126127
fmt.Sprintf("Failed building resources: %s", err),
127128
)
128129
return err
@@ -132,7 +133,7 @@ func (r *Reconciler) handleResourcesSync(
132133
r.Recorder.Event(
133134
databaseNodeSet,
134135
corev1.EventTypeWarning,
135-
string(DatabaseNodeSetPreparing),
136+
"ProvisioningFailed",
136137
fmt.Sprintf("Error setting controller reference for resource: %s", err),
137138
)
138139
return err
@@ -151,7 +152,7 @@ func (r *Reconciler) handleResourcesSync(
151152
r.Recorder.Event(
152153
databaseNodeSet,
153154
corev1.EventTypeWarning,
154-
string(DatabaseNodeSetPreparing),
155+
"ProvisioningFailed",
155156
eventMessage+fmt.Sprintf(", failed to sync, error: %s", err),
156157
)
157158
meta.SetStatusCondition(&databaseNodeSet.Status.Conditions, metav1.Condition{
@@ -208,11 +209,20 @@ func (r *Reconciler) waitForStatefulSetToScale(
208209
Namespace: databaseNodeSet.Namespace,
209210
}, found)
210211
if err != nil {
212+
if apierrors.IsNotFound(err) {
213+
r.Recorder.Event(
214+
databaseNodeSet,
215+
corev1.EventTypeWarning,
216+
"Syncing",
217+
fmt.Sprintf("Failed to found StatefulSet: %s", err),
218+
)
219+
return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, nil
220+
}
211221
r.Recorder.Event(
212222
databaseNodeSet,
213223
corev1.EventTypeWarning,
214-
"ControllerError",
215-
fmt.Sprintf("Failed to get StatefulSet: %s", err),
224+
"Syncing",
225+
fmt.Sprintf("Failed to get StatefulSets: %s", err),
216226
)
217227
return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err
218228
}
@@ -231,8 +241,8 @@ func (r *Reconciler) waitForStatefulSetToScale(
231241
r.Recorder.Event(
232242
databaseNodeSet,
233243
corev1.EventTypeWarning,
234-
"ControllerError",
235-
fmt.Sprintf("Failed to list Pods: %s", err),
244+
"Syncing",
245+
fmt.Sprintf("Failed to list databaseNodeSet pods: %s", err),
236246
)
237247
return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err
238248
}
@@ -249,7 +259,7 @@ func (r *Reconciler) waitForStatefulSetToScale(
249259
databaseNodeSet,
250260
corev1.EventTypeNormal,
251261
string(DatabaseNodeSetProvisioning),
252-
fmt.Sprintf("Waiting for number of running pods to match expected: %d != %d", runningPods, databaseNodeSet.Spec.Nodes),
262+
fmt.Sprintf("Waiting for number of running databaseNodeSet pods to match expected: %d != %d", runningPods, databaseNodeSet.Spec.Nodes),
253263
)
254264
meta.SetStatusCondition(&databaseNodeSet.Status.Conditions, metav1.Condition{
255265
Type: NodeSetProvisionedCondition,
@@ -265,7 +275,7 @@ func (r *Reconciler) waitForStatefulSetToScale(
265275
Type: NodeSetProvisionedCondition,
266276
Status: metav1.ConditionTrue,
267277
Reason: ReasonCompleted,
268-
Message: fmt.Sprintf("Successfully scaled to desired number of nodes: %d", databaseNodeSet.Spec.Nodes),
278+
Message: fmt.Sprintf("Scaled DatabaseNodeSet to %d successfully", databaseNodeSet.Spec.Nodes),
269279
})
270280
return r.updateStatus(ctx, databaseNodeSet, StatusUpdateRequeueDelay)
271281
}
@@ -330,7 +340,7 @@ func (r *Reconciler) updateStatus(
330340
databaseNodeSet,
331341
corev1.EventTypeNormal,
332342
"StatusChanged",
333-
fmt.Sprintf("State moved from %s to %s", oldStatus, databaseNodeSet.Status.State),
343+
fmt.Sprintf("DatabaseNodeSet moved from %s to %s", oldStatus, databaseNodeSet.Status.State),
334344
)
335345
}
336346

‎internal/controllers/remotedatabasenodeset/sync.go‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ func (r *Reconciler) Sync(ctx context.Context, crRemoteDatabaseNodeSet *v1alpha1
3434
return result, err
3535
}
3636

37-
stop, result, err = r.removeUnusedRemoteObjects(ctx, &remoteDatabaseNodeSet, remoteObjects)
37+
stop, result, err = r.handleResourcesSync(ctx, &remoteDatabaseNodeSet)
3838
if stop {
3939
return result, err
4040
}
4141

42-
stop, result, err = r.handleResourcesSync(ctx, &remoteDatabaseNodeSet)
42+
stop, result, err = r.removeUnusedRemoteObjects(ctx, &remoteDatabaseNodeSet, remoteObjects)
4343
if stop {
4444
return result, err
4545
}
@@ -162,9 +162,23 @@ func (r *Reconciler) updateRemoteStatus(
162162
"ControllerError",
163163
fmt.Sprintf("Failed to update status: %s", err),
164164
)
165+
165166
return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err
166167
}
167168

169+
r.Recorder.Event(
170+
remoteDatabaseNodeSet,
171+
corev1.EventTypeNormal,
172+
"StatusChanged",
173+
"Status updated on remote cluster",
174+
)
175+
r.RemoteRecorder.Event(
176+
remoteDatabaseNodeSet,
177+
corev1.EventTypeNormal,
178+
"StatusChanged",
179+
"Status updated",
180+
)
181+
168182
r.Log.Info("complete step updateRemoteStatus")
169183
return Continue, ctrl.Result{}, nil
170184
}

‎internal/controllers/remotestoragenodeset/sync.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ func (r *Reconciler) Sync(ctx context.Context, crRemoteStorageNodeSet *v1alpha1.
3535
return result, err
3636
}
3737

38-
stop, result, err = r.removeUnusedRemoteObjects(ctx, &remoteStorageNodeSet, remoteObjects)
38+
stop, result, err = r.handleResourcesSync(ctx, &remoteStorageNodeSet)
3939
if stop {
4040
return result, err
4141
}
4242

43-
stop, result, err = r.handleResourcesSync(ctx, &remoteStorageNodeSet)
43+
stop, result, err = r.removeUnusedRemoteObjects(ctx, &remoteStorageNodeSet, remoteObjects)
4444
if stop {
4545
return result, err
4646
}

‎internal/controllers/storagenodeset/sync.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func (r *Reconciler) handleResourcesSync(
123123
r.Recorder.Event(
124124
storageNodeSet,
125125
corev1.EventTypeWarning,
126-
string(StorageNodeSetPreparing),
126+
"ProvisioningFailed",
127127
fmt.Sprintf("Failed building resources: %s", err),
128128
)
129129
return err
@@ -133,7 +133,7 @@ func (r *Reconciler) handleResourcesSync(
133133
r.Recorder.Event(
134134
storageNodeSet,
135135
corev1.EventTypeWarning,
136-
string(StorageNodeSetPreparing),
136+
"ProvisioningFailed",
137137
fmt.Sprintf("Error setting controller reference for resource: %s", err),
138138
)
139139
return err
@@ -152,7 +152,7 @@ func (r *Reconciler) handleResourcesSync(
152152
r.Recorder.Event(
153153
storageNodeSet,
154154
corev1.EventTypeWarning,
155-
string(StorageNodeSetPreparing),
155+
"ProvisioningFailed",
156156
eventMessage+fmt.Sprintf(", failed to sync, error: %s", err),
157157
)
158158
meta.SetStatusCondition(&storageNodeSet.Status.Conditions, metav1.Condition{
@@ -213,17 +213,17 @@ func (r *Reconciler) waitForStatefulSetToScale(
213213
r.Recorder.Event(
214214
storageNodeSet,
215215
corev1.EventTypeWarning,
216-
string(StorageNodeSetProvisioning),
217-
fmt.Sprintf("Failed to find StatefulSet: %s", err),
218-
)
219-
} else {
220-
r.Recorder.Event(
221-
storageNodeSet,
222-
corev1.EventTypeWarning,
223-
"ControllerError",
224-
fmt.Sprintf("Failed to get StatefulSet: %s", err),
216+
"Syncing",
217+
fmt.Sprintf("Failed to found StatefulSet: %s", err),
225218
)
219+
return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err
226220
}
221+
r.Recorder.Event(
222+
storageNodeSet,
223+
corev1.EventTypeWarning,
224+
"Syncing",
225+
fmt.Sprintf("Failed to get StatefulSets: %s", err),
226+
)
227227
return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err
228228
}
229229

@@ -241,8 +241,8 @@ func (r *Reconciler) waitForStatefulSetToScale(
241241
r.Recorder.Event(
242242
storageNodeSet,
243243
corev1.EventTypeWarning,
244-
"ControllerError",
245-
fmt.Sprintf("Failed to list pods: %s", err),
244+
"Syncing",
245+
fmt.Sprintf("Failed to list storageNodeSet pods: %s", err),
246246
)
247247
meta.SetStatusCondition(&storageNodeSet.Status.Conditions, metav1.Condition{
248248
Type: NodeSetProvisionedCondition,
@@ -265,7 +265,7 @@ func (r *Reconciler) waitForStatefulSetToScale(
265265
storageNodeSet,
266266
corev1.EventTypeNormal,
267267
string(StorageNodeSetProvisioning),
268-
fmt.Sprintf("Waiting for number of running pods to match expected: %d != %d", runningPods, storageNodeSet.Spec.Nodes),
268+
fmt.Sprintf("Waiting for number of running storageNodeSet pods to match expected: %d != %d", runningPods, storageNodeSet.Spec.Nodes),
269269
)
270270
meta.SetStatusCondition(&storageNodeSet.Status.Conditions, metav1.Condition{
271271
Type: NodeSetProvisionedCondition,
@@ -281,7 +281,7 @@ func (r *Reconciler) waitForStatefulSetToScale(
281281
Type: NodeSetProvisionedCondition,
282282
Status: metav1.ConditionTrue,
283283
Reason: ReasonCompleted,
284-
Message: "Successfully scaled to desired number of nodes",
284+
Message: fmt.Sprintf("Scaled StorageNodeSet to %d successfully", storageNodeSet.Spec.Nodes),
285285
})
286286
return r.updateStatus(ctx, storageNodeSet, StatusUpdateRequeueDelay)
287287
}
@@ -346,7 +346,7 @@ func (r *Reconciler) updateStatus(
346346
storageNodeSet,
347347
corev1.EventTypeNormal,
348348
"StatusChanged",
349-
fmt.Sprintf("State moved from %s to %s", oldStatus, storageNodeSet.Status.State),
349+
fmt.Sprintf("StorageNodeSet moved from %s to %s", oldStatus, storageNodeSet.Status.State),
350350
)
351351
}
352352

0 commit comments

Comments
 (0)