test

Author: kasiakoziol

.github/workflows/cla-check.yml

@@ -888,7 +888,7 @@ func (mgr *indexerClusterPodManager) Update(ctx context.Context, c splcommon.Con
 	eventPublisher := GetEventPublisher(ctx, mgr.cr)
 
 	// Track last successful replica count to emit scale events after completion
-	previousReplicas := mgr.cr.Status.Replicas
+	previousReadyReplicas := mgr.cr.Status.ReadyReplicas
 
 	// Assign client
 	if mgr.c == nil {
@@ -927,17 +927,19 @@ func (mgr *indexerClusterPodManager) Update(ctx context.Context, c splcommon.Con
 		return phase, err
 	}
 
-	// Emit ScaledUp event only after a successful scale-up has completed
+	// Emit scale events when phase is ready and ready replicas changed to match desired
 	if phase == enterpriseApi.PhaseReady {
-		if desiredReplicas > previousReplicas && mgr.cr.Status.Replicas == desiredReplicas {
-			if eventPublisher != nil {
-				eventPublisher.Normal(ctx, "ScaledUp",
-					fmt.Sprintf("Successfully scaled %s up from %d to %d replicas", mgr.cr.GetName(), previousReplicas, desiredReplicas))
-			}
-		} else if desiredReplicas < previousReplicas && mgr.cr.Status.Replicas == desiredReplicas {
-			if eventPublisher != nil {
-				eventPublisher.Normal(ctx, "ScaledDown",
-					fmt.Sprintf("Successfully scaled %s down from %d to %d replicas", mgr.cr.GetName(), previousReplicas, desiredReplicas))
+		if mgr.cr.Status.ReadyReplicas == desiredReplicas && previousReadyReplicas != desiredReplicas {
+			if desiredReplicas > previousReadyReplicas {
+				if eventPublisher != nil {
+					eventPublisher.Normal(ctx, "ScaledUp",
+						fmt.Sprintf("Successfully scaled %s up from %d to %d replicas", mgr.cr.GetName(), previousReadyReplicas, desiredReplicas))
+				}
+			} else if desiredReplicas < previousReadyReplicas {
+				if eventPublisher != nil {
+					eventPublisher.Normal(ctx, "ScaledDown",
+						fmt.Sprintf("Successfully scaled %s down from %d to %d replicas", mgr.cr.GetName(), previousReadyReplicas, desiredReplicas))
+				}
 			}
 		}
 	}

pkg/splunk/enterprise/indexercluster.go

@@ -49,7 +49,7 @@ func (mgr *searchHeadClusterPodManager) Update(ctx context.Context, c splcommon.
 	eventPublisher := GetEventPublisher(ctx, mgr.cr)
 
 	// Track last successful replica count to emit scale events after completion
-	previousReplicas := mgr.cr.Status.Replicas
+	previousReadyReplicas := mgr.cr.Status.ReadyReplicas
 
 	// update statefulset, if necessary
 	_, err := splctrl.ApplyStatefulSet(ctx, mgr.c, statefulSet)
@@ -79,17 +79,19 @@ func (mgr *searchHeadClusterPodManager) Update(ctx context.Context, c splcommon.
 		return phase, err
 	}
 
-	// Emit ScaledUp event only after a successful scale-up has completed
+	// Emit scale events when phase is ready and ready replicas changed to match desired
 	if phase == enterpriseApi.PhaseReady {
-		if desiredReplicas > previousReplicas && mgr.cr.Status.Replicas == desiredReplicas {
-			if eventPublisher != nil {
-				eventPublisher.Normal(ctx, "ScaledUp",
-					fmt.Sprintf("Successfully scaled %s up from %d to %d replicas", mgr.cr.GetName(), previousReplicas, desiredReplicas))
-			}
-		} else if desiredReplicas < previousReplicas && mgr.cr.Status.Replicas == desiredReplicas {
-			if eventPublisher != nil {
-				eventPublisher.Normal(ctx, "ScaledDown",
-					fmt.Sprintf("Successfully scaled %s down from %d to %d replicas", mgr.cr.GetName(), previousReplicas, desiredReplicas))
+		if mgr.cr.Status.ReadyReplicas == desiredReplicas && previousReadyReplicas != desiredReplicas {
+			if desiredReplicas > previousReadyReplicas {
+				if eventPublisher != nil {
+					eventPublisher.Normal(ctx, "ScaledUp",
+						fmt.Sprintf("Successfully scaled %s up from %d to %d replicas", mgr.cr.GetName(), previousReadyReplicas, desiredReplicas))
+				}
+			} else if desiredReplicas < previousReadyReplicas {
+				if eventPublisher != nil {
+					eventPublisher.Normal(ctx, "ScaledDown",
+						fmt.Sprintf("Successfully scaled %s down from %d to %d replicas", mgr.cr.GetName(), previousReadyReplicas, desiredReplicas))
+				}
 			}
 		}
 	}

pkg/splunk/enterprise/searchheadclusterpodmanager.go

@@ -216,7 +216,7 @@ func ApplyStandalone(ctx context.Context, client splcommon.ControllerClient, cr
 	}
 
 	// Track last successful replica count to emit scale events after completion
-	previousReplicas := cr.Status.Replicas
+	previousReadyReplicas := cr.Status.ReadyReplicas
 
 	mgr := splctrl.DefaultStatefulSetPodManager{}
 	phase, err := mgr.Update(ctx, client, statefulSet, cr.Spec.Replicas)
@@ -228,18 +228,20 @@ func ApplyStandalone(ctx context.Context, client splcommon.ControllerClient, cr
 	}
 	cr.Status.Phase = phase
 
-	// Emit scale events only after a successful scale operation has completed
+	// Emit scale events when phase is ready and ready replicas changed to match desired
 	if phase == enterpriseApi.PhaseReady {
 		desiredReplicas := cr.Spec.Replicas
-		if desiredReplicas > previousReplicas && cr.Status.Replicas == desiredReplicas {
-			if eventPublisher != nil {
-				eventPublisher.Normal(ctx, "ScaledUp",
-					fmt.Sprintf("Successfully scaled %s up from %d to %d replicas", cr.GetName(), previousReplicas, desiredReplicas))
-			}
-		} else if desiredReplicas < previousReplicas && cr.Status.Replicas == desiredReplicas {
-			if eventPublisher != nil {
-				eventPublisher.Normal(ctx, "ScaledDown",
-					fmt.Sprintf("Successfully scaled %s down from %d to %d replicas", cr.GetName(), previousReplicas, desiredReplicas))
+		if cr.Status.ReadyReplicas == desiredReplicas && previousReadyReplicas != desiredReplicas {
+			if desiredReplicas > previousReadyReplicas {
+				if eventPublisher != nil {
+					eventPublisher.Normal(ctx, "ScaledUp",
+						fmt.Sprintf("Successfully scaled %s up from %d to %d replicas", cr.GetName(), previousReadyReplicas, desiredReplicas))
+				}
+			} else if desiredReplicas < previousReadyReplicas {
+				if eventPublisher != nil {
+					eventPublisher.Normal(ctx, "ScaledDown",
+						fmt.Sprintf("Successfully scaled %s down from %d to %d replicas", cr.GetName(), previousReadyReplicas, desiredReplicas))
+				}
 			}
 		}
 	}