Skip to content

🌱 Use klog.Obj in log messages #13421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 3 commits into from
Mar 10, 2026
Merged

🌱 Use klog.Obj in log messages #13421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25e6d6c
Use klog.Obj in logs
fabriziopandini Mar 8, 2026
882d43f
Address comments
fabriziopandini Mar 9, 2026
8fa98e0
More comments
fabriziopandini Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions controlplane/kubeadm/internal/controllers/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ func (r *KubeadmControlPlaneReconciler) reconcile(ctx context.Context, controlPl
// progress is not counted as needs rollout).
if machines := controlPlane.MachinesToCompleteInPlaceUpdate(); machines.Len() > 0 {
for _, machine := range machines {
log.Info(fmt.Sprintf("Waiting for in-place update of Machine %s to complete", machine.Name), "Machine", klog.KObj(machine))
log.Info(fmt.Sprintf("Waiting for in-place update of Machine %s to complete", klog.KObj(machine)), "Machine", klog.KObj(machine))
}
return ctrl.Result{}, nil // Note: Changes to Machines trigger another reconcile.
}
Expand All @@ -517,11 +517,14 @@ func (r *KubeadmControlPlaneReconciler) reconcile(ctx context.Context, controlPl
switch {
case len(machinesNeedingRollout) > 0:
var allMessages []string
machinesNeedingRolloutNames := machinesNeedingRollout.Names()
slices.Sort(machinesNeedingRolloutNames)
for _, name := range machinesNeedingRolloutNames {
allMessages = append(allMessages, fmt.Sprintf("Machine %s needs rollout: %s", name, strings.Join(machinesUpToDateResults[name].LogMessages, ", ")))
machinesNeedingRolloutNames := make([]string, 0, machinesNeedingRollout.Len())
for _, m := range machinesNeedingRollout {
machinesNeedingRolloutNames = append(machinesNeedingRolloutNames, klog.KObj(m).String())
allMessages = append(allMessages, fmt.Sprintf("Machine %s needs rollout: %s", klog.KObj(m), strings.Join(machinesUpToDateResults[m.Name].LogMessages, ", ")))
}
slices.Sort(machinesNeedingRolloutNames)
slices.Sort(allMessages)

log.Info(fmt.Sprintf("Machines need rollout: %s", strings.Join(machinesNeedingRolloutNames, ",")), "reason", strings.Join(allMessages, ", "))
v1beta1conditions.MarkFalse(controlPlane.KCP, controlplanev1.MachinesSpecUpToDateV1Beta1Condition, controlplanev1.RollingUpdateInProgressV1Beta1Reason, clusterv1.ConditionSeverityWarning, "Rolling %d replicas with outdated spec (%d replicas up to date)", len(machinesNeedingRollout), len(controlPlane.Machines)-len(machinesNeedingRollout))
return r.updateControlPlane(ctx, controlPlane, machinesNeedingRollout, machinesUpToDateResults)
Expand Down Expand Up @@ -1515,7 +1518,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileCertificateExpiries(ctx context
log.V(4).Info("Reconciling certificate expiry")
certificateExpiry, err := workloadCluster.GetAPIServerCertificateExpiry(ctx, kubeadmConfig, nodeName)
if err != nil {
return errors.Wrapf(err, "failed to reconcile certificate expiry for Machine/%s", m.Name)
return errors.Wrapf(err, "failed to reconcile certificate expiry for Machine %s", klog.KObj(m))
}
expiry := certificateExpiry.Format(time.RFC3339)

Expand All @@ -1528,7 +1531,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileCertificateExpiries(ctx context
kubeadmConfig.SetAnnotations(annotations)

if err := r.Client.Patch(ctx, kubeadmConfig, client.MergeFrom(original)); err != nil {
return errors.Wrapf(err, "failed to reconcile certificate expiry for Machine/%s", m.Name)
return errors.Wrapf(err, "failed to reconcile certificate expiry for Machine %s", klog.KObj(m))
}
}

Expand Down
2 changes: 1 addition & 1 deletion controlplane/kubeadm/internal/controllers/inplace_canupdatemachine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func (r *KubeadmControlPlaneReconciler) canUpdateMachine(ctx context.Context, ma
return false, err
}
if !canUpdateMachine {
log.Info(fmt.Sprintf("Machine %s cannot be updated in-place by extensions", machine.Name), "reason", strings.Join(reasons, ","))
log.Info(fmt.Sprintf("Machine %s cannot be updated in-place by extensions", klog.KObj(machine)), "reason", strings.Join(reasons, ","))
return false, nil
}
return true, nil
Expand Down
4 changes: 2 additions & 2 deletions controlplane/kubeadm/internal/controllers/inplace_trigger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func (r *KubeadmControlPlaneReconciler) triggerInPlaceUpdate(ctx context.Context
}

log := ctrl.LoggerFrom(ctx).WithValues("Machine", klog.KObj(machine))
log.Info(fmt.Sprintf("Triggering in-place update for Machine %s", machine.Name))
log.Info(fmt.Sprintf("Triggering in-place update for Machine %s", klog.KObj(machine)))

// Mark Machine for in-place update.
// Note: Once we write UpdateInProgressAnnotation we will always continue with the in-place update.
Expand Down Expand Up @@ -134,7 +134,7 @@ func (r *KubeadmControlPlaneReconciler) triggerInPlaceUpdate(ctx context.Context
return errors.Wrapf(err, "failed to complete triggering in-place update for Machine %s", klog.KObj(machine))
}

log.Info(fmt.Sprintf("Completed triggering in-place update for Machine %s", machine.Name))
log.Info(fmt.Sprintf("Completed triggering in-place update for Machine %s", klog.KObj(machine)))
r.recorder.Event(machine, corev1.EventTypeNormal, "SuccessfulStartInPlaceUpdate", "Machine starting in-place update")

// Wait until the cache observed the Machine with PendingHooksAnnotation to ensure subsequent reconciles
Expand Down
2 changes: 1 addition & 1 deletion controlplane/kubeadm/internal/controllers/remediation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,7 @@ func (r *KubeadmControlPlaneReconciler) targetKubernetesControlPlaneComponentsHe

operations := []string{}
if kubernetesControlPlaneToBeDeleted != "" {
operations = append(operations, fmt.Sprintf("removal of Machine %s", kubernetesControlPlaneToBeDeleted))
operations = append(operations, fmt.Sprintf("removal of Machine %s", klog.KRef(controlPlane.KCP.Namespace, kubernetesControlPlaneToBeDeleted)))
}
if addKubernetesControlPlane {
operations = append(operations, "addition of 1 Machine")
Expand Down
6 changes: 3 additions & 3 deletions controlplane/kubeadm/internal/controllers/scale.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func (r *KubeadmControlPlaneReconciler) initializeControlPlane(ctx context.Conte
}

log.WithValues(controlPlane.StatusToLogKeyAndValues(newMachine, nil)...).
Info(fmt.Sprintf("Machine %s created (init)", newMachine.Name),
Info(fmt.Sprintf("Machine %s created (init)", klog.KObj(newMachine)),
"Machine", klog.KObj(newMachine),
newMachine.Spec.InfrastructureRef.Kind, klog.KRef(newMachine.Namespace, newMachine.Spec.InfrastructureRef.Name),
newMachine.Spec.Bootstrap.ConfigRef.Kind, klog.KRef(newMachine.Namespace, newMachine.Spec.Bootstrap.ConfigRef.Name), "desiredReplicas", ptr.Deref(controlPlane.KCP.Spec.Replicas, 0), "replicas", len(controlPlane.Machines))
Expand Down Expand Up @@ -94,7 +94,7 @@ func (r *KubeadmControlPlaneReconciler) scaleUpControlPlane(ctx context.Context,
}

log.WithValues(controlPlane.StatusToLogKeyAndValues(newMachine, nil)...).
Info(fmt.Sprintf("Machine %s created (scale up)", newMachine.Name),
Info(fmt.Sprintf("Machine %s created (scale up)", klog.KObj(newMachine)),
"Machine", klog.KObj(newMachine),
newMachine.Spec.InfrastructureRef.Kind, klog.KRef(newMachine.Namespace, newMachine.Spec.InfrastructureRef.Name),
newMachine.Spec.Bootstrap.ConfigRef.Kind, klog.KRef(newMachine.Namespace, newMachine.Spec.Bootstrap.ConfigRef.Name), "desiredReplicas", ptr.Deref(controlPlane.KCP.Spec.Replicas, 0), "replicas", len(controlPlane.Machines))
Expand Down Expand Up @@ -157,7 +157,7 @@ func (r *KubeadmControlPlaneReconciler) scaleDownControlPlane(
// Note: We intentionally log after Delete because we want this log line to show up only after DeletionTimestamp has been set.
// Also, setting DeletionTimestamp doesn't mean the Machine is actually deleted (deletion takes some time).
log.WithValues(controlPlane.StatusToLogKeyAndValues(nil, machineToDelete)...).
Info(fmt.Sprintf("Machine %s deleting (scale down)", machineToDelete.Name), "Machine", klog.KObj(machineToDelete), "desiredReplicas", ptr.Deref(controlPlane.KCP.Spec.Replicas, 0), "replicas", len(controlPlane.Machines))
Info(fmt.Sprintf("Machine %s deleting (scale down)", klog.KObj(machineToDelete)), "Machine", klog.KObj(machineToDelete), "desiredReplicas", ptr.Deref(controlPlane.KCP.Spec.Replicas, 0), "replicas", len(controlPlane.Machines))

return ctrl.Result{}, nil // No need to requeue here. Machine deletion above triggers reconciliation.
}
Expand Down
3 changes: 1 addition & 2 deletions docs/book/src/developer/core/logging.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,7 @@ logs, e.g.
- If an API field name is used in log messages, the entire path MUST be used and field names MUST capitalized like in the
API (not as in the golang type). For example `Waiting for spec.providerID to be set`
- If a log message is about a controlled or a referenced object, e.g. Machine controller performing an action on MachineSet,
the message MUST contain the Kind of the controlled/referenced object and its name, for example `Created MachineSet foo-bar`
- If the controlled/referenced object is in another namespace, use namespace/name instead of name
the message MUST contain the Kind of the controlled/referenced object and its namespace/name, for example `Created MachineSet default/foo-bar`
- The controlled/referenced object MUST also be added as a key value pair (see guidelines above)

## Log Levels
Expand Down
8 changes: 4 additions & 4 deletions internal/controllers/machinedeployment/machinedeployment_canupdatemachineset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ func (p *rolloutPlanner) canUpdateMachineSetInPlace(ctx context.Context, oldMS,

if cacheEntry, ok := p.canUpdateMachineSetCache.Has(entry.Key()); ok {
if cacheEntry.CanUpdateMachineSet {
log.V(5).Info(fmt.Sprintf("MachineSet %s can be updated in-place by extensions (cached)", oldMS.Name))
log.V(5).Info(fmt.Sprintf("MachineSet %s can be updated in-place by extensions (cached)", klog.KObj(oldMS)))
} else {
log.V(5).Info(fmt.Sprintf("MachineSet %s cannot be updated in-place by extensions (cached)", oldMS.Name))
log.V(5).Info(fmt.Sprintf("MachineSet %s cannot be updated in-place by extensions (cached)", klog.KObj(oldMS)))
}
return cacheEntry.CanUpdateMachineSet, nil
}
Expand All @@ -107,10 +107,10 @@ func (p *rolloutPlanner) canUpdateMachineSetInPlace(ctx context.Context, oldMS,
p.canUpdateMachineSetCache.Add(entry)

if !canUpdateMachineSet {
log.Info(fmt.Sprintf("MachineSet %s cannot be updated in-place by extensions", oldMS.Name), "reason", strings.Join(reasons, ","))
log.Info(fmt.Sprintf("MachineSet %s cannot be updated in-place by extensions", klog.KObj(oldMS)), "reason", strings.Join(reasons, ","))
return false, nil
}
log.Info(fmt.Sprintf("MachineSet %s can be updated in-place by extensions", oldMS.Name))
log.Info(fmt.Sprintf("MachineSet %s can be updated in-place by extensions", klog.KObj(oldMS)))
return true, nil
}

Expand Down
12 changes: 6 additions & 6 deletions internal/controllers/machinedeployment/machinedeployment_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,9 +380,9 @@ func (r *Reconciler) createOrUpdateMachineSetsAndSyncMachineDeploymentRevision(c
if len(p.oldMSs) > 0 {
log.Info(fmt.Sprintf("MachineSets need rollout: %s", strings.Join(machineSetNames(p.oldMSs), ", ")), "reason", p.createReason)
}
log.Info(fmt.Sprintf("MachineSet %s created, it is now the current MachineSet", ms.Name))
log.Info(fmt.Sprintf("MachineSet %s created, it is now the current MachineSet", klog.KObj(ms)))
if diff.DesiredReplicas > 0 {
log.Info(fmt.Sprintf("Scaled up current MachineSet %s from 0 to %d replicas (+%[2]d)", ms.Name, diff.DesiredReplicas))
log.Info(fmt.Sprintf("Scaled up current MachineSet %s from 0 to %d replicas (+%[2]d)", klog.KObj(ms), diff.DesiredReplicas))
}
r.recorder.Eventf(p.md, corev1.EventTypeNormal, "SuccessfulCreate", "Created MachineSet %s with %d replicas", klog.KObj(ms), diff.DesiredReplicas)

Expand Down Expand Up @@ -422,15 +422,15 @@ func (r *Reconciler) createOrUpdateMachineSetsAndSyncMachineDeploymentRevision(c
}

if diff.DesiredReplicas < diff.OriginalReplicas {
log.Info(fmt.Sprintf("Scaled down %s MachineSet %s from %d to %d replicas (-%d)", diff.Type, ms.Name, diff.OriginalReplicas, diff.DesiredReplicas, diff.OriginalReplicas-diff.DesiredReplicas))
log.Info(fmt.Sprintf("Scaled down %s MachineSet %s from %d to %d replicas (-%d)", diff.Type, klog.KObj(ms), diff.OriginalReplicas, diff.DesiredReplicas, diff.OriginalReplicas-diff.DesiredReplicas))
r.recorder.Eventf(p.md, corev1.EventTypeNormal, "SuccessfulScale", "Scaled down MachineSet %v: %d -> %d", ms.Name, diff.OriginalReplicas, diff.DesiredReplicas)
}
if diff.DesiredReplicas > diff.OriginalReplicas {
log.Info(fmt.Sprintf("Scaled up %s MachineSet %s from %d to %d replicas (+%d)", diff.Type, ms.Name, diff.OriginalReplicas, diff.DesiredReplicas, diff.DesiredReplicas-diff.OriginalReplicas))
log.Info(fmt.Sprintf("Scaled up %s MachineSet %s from %d to %d replicas (+%d)", diff.Type, klog.KObj(ms), diff.OriginalReplicas, diff.DesiredReplicas, diff.DesiredReplicas-diff.OriginalReplicas))
r.recorder.Eventf(p.md, corev1.EventTypeNormal, "SuccessfulScale", "Scaled up MachineSet %v: %d -> %d", ms.Name, diff.OriginalReplicas, diff.DesiredReplicas)
}
if diff.DesiredReplicas == diff.OriginalReplicas && diff.OtherChanges != "" {
log.Info(fmt.Sprintf("Updated %s MachineSet %s", diff.Type, ms.Name))
log.Info(fmt.Sprintf("Updated %s MachineSet %s", diff.Type, klog.KObj(ms)))
}

// Only wait for cache if the object was changed.
Expand Down Expand Up @@ -481,7 +481,7 @@ func (r *Reconciler) reconcileDelete(ctx context.Context, s *scope) error {
}
// Note: We intentionally log after Delete because we want this log line to show up only after DeletionTimestamp has been set.
// Also, setting DeletionTimestamp doesn't mean the MachineSet is actually deleted (deletion takes some time).
log.Info(fmt.Sprintf("MachineSet %s deleting (MachineDeployment deleting)", ms.Name), "MachineSet", klog.KObj(ms))
log.Info(fmt.Sprintf("MachineSet %s deleting (MachineDeployment deleting)", klog.KObj(ms)), "MachineSet", klog.KObj(ms))
}
}

Expand Down
4 changes: 2 additions & 2 deletions internal/controllers/machinedeployment/machinedeployment_rollout_ondelete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ func (p *rolloutPlanner) reconcileOldMachineSetsOnDelete(ctx context.Context) {
if scaleDownCount > 0 {
newScaleIntent := max(ptr.Deref(oldMS.Spec.Replicas, 0)-scaleDownCount, 0)
p.addNotef(oldMS, "scale down to align to existing Machines")
log.V(5).Info(fmt.Sprintf("Setting scale down intent for MachineSet %s to %d replicas (-%d)", oldMS.Name, newScaleIntent, scaleDownCount), "MachineSet", klog.KObj(oldMS))
log.V(5).Info(fmt.Sprintf("Setting scale down intent for MachineSet %s to %d replicas (-%d)", klog.KObj(oldMS), newScaleIntent, scaleDownCount), "MachineSet", klog.KObj(oldMS))
p.scaleIntents[oldMS.Name] = newScaleIntent

totalScaleDownCount -= scaleDownCount
Expand Down Expand Up @@ -140,7 +140,7 @@ func (p *rolloutPlanner) reconcileOldMachineSetsOnDelete(ctx context.Context) {
if scaleDownCount > 0 {
newScaleIntent := max(ptr.Deref(oldMS.Spec.Replicas, 0)-scaleDownCount, 0)
p.addNotef(oldMS, "scale down to align MachineSet spec.replicas to MachineDeployment spec.replicas")
log.V(5).Info(fmt.Sprintf("Setting scale down intent for MachineSet %s to %d replicas (-%d)", oldMS.Name, newScaleIntent, scaleDownCount), "MachineSet", klog.KObj(oldMS))
log.V(5).Info(fmt.Sprintf("Setting scale down intent for MachineSet %s to %d replicas (-%d)", klog.KObj(oldMS), newScaleIntent, scaleDownCount), "MachineSet", klog.KObj(oldMS))
p.scaleIntents[oldMS.Name] = newScaleIntent

totalScaleDownCount -= scaleDownCount
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/machinedeployment/machinedeployment_rollout_ondelete_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ func runOnDeleteTestCase(ctx context.Context, t *testing.T, tt onDeleteSequenceT
totMS := len(current.machineSets)
desiredNewMS = createMS(fmt.Sprintf("ms%d", totMS+1), deployment.Spec.Template.Spec.FailureDomain, 0)
current.machineSets = append(current.machineSets, desiredNewMS)
log.V(5).Info(fmt.Sprintf("Computing new MachineSet %s with %d replicas", desiredNewMS.Name, ptr.Deref(desiredNewMS.Spec.Replicas, 0)), "MachineSet", klog.KObj(desiredNewMS))
log.V(5).Info(fmt.Sprintf("Computing new MachineSet %s with %d replicas", klog.KObj(desiredNewMS), ptr.Deref(desiredNewMS.Spec.Replicas, 0)), "MachineSet", klog.KObj(desiredNewMS))
}
return desiredNewMS, nil
}
Expand Down
14 changes: 7 additions & 7 deletions internal/controllers/machinedeployment/machinedeployment_rollout_rollingupdate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ func (p *rolloutPlanner) reconcileNewMachineSet(ctx context.Context) error {
if *(p.newMS.Spec.Replicas) > *(p.md.Spec.Replicas) {
// Scale down.
p.addNotef(p.newMS, "scale down to align MachineSet spec.replicas to MachineDeployment spec.replicas")
log.V(5).Info(fmt.Sprintf("Setting scale down intent for MachineSet %s to %d replicas", p.newMS.Name, *(p.md.Spec.Replicas)), "MachineSet", klog.KObj(p.newMS))
log.V(5).Info(fmt.Sprintf("Setting scale down intent for MachineSet %s to %d replicas", klog.KObj(p.newMS), *(p.md.Spec.Replicas)), "MachineSet", klog.KObj(p.newMS))
p.scaleIntents[p.newMS.Name] = *(p.md.Spec.Replicas)
return nil
}
Expand All @@ -201,13 +201,13 @@ func (p *rolloutPlanner) reconcileNewMachineSet(ctx context.Context) error {
if newReplicasCount < *(p.newMS.Spec.Replicas) {
scaleDownCount := *(p.newMS.Spec.Replicas) - newReplicasCount
p.addNotef(p.newMS, "%s", note)
log.V(5).Info(fmt.Sprintf("Setting scale down intent for MachineSet %s to %d replicas (-%d)", p.newMS.Name, newReplicasCount, scaleDownCount), "MachineSet", klog.KObj(p.newMS))
log.V(5).Info(fmt.Sprintf("Setting scale down intent for MachineSet %s to %d replicas (-%d)", klog.KObj(p.newMS), newReplicasCount, scaleDownCount), "MachineSet", klog.KObj(p.newMS))
p.scaleIntents[p.newMS.Name] = newReplicasCount
}
if newReplicasCount > *(p.newMS.Spec.Replicas) {
scaleUpCount := newReplicasCount - *(p.newMS.Spec.Replicas)
p.addNotef(p.newMS, "%s", note)
log.V(5).Info(fmt.Sprintf("Setting scale up intent for MachineSet %s to %d replicas (+%d)", p.newMS.Name, newReplicasCount, scaleUpCount), "MachineSet", klog.KObj(p.newMS))
log.V(5).Info(fmt.Sprintf("Setting scale up intent for MachineSet %s to %d replicas (+%d)", klog.KObj(p.newMS), newReplicasCount, scaleUpCount), "MachineSet", klog.KObj(p.newMS))
p.scaleIntents[p.newMS.Name] = newReplicasCount
}
return nil
Expand Down Expand Up @@ -387,7 +387,7 @@ func (p *rolloutPlanner) scaleDownOldMSs(ctx context.Context, totalScaleDownCoun
} else {
p.addNotef(oldMS, "%d available replicas > %d minimum available replicas", oldTotalAvailableReplicas, minAvailable)
}
log.V(5).Info(fmt.Sprintf("Setting scale down intent for MachineSet %s to %d replicas (-%d)", oldMS.Name, newScaleIntent, scaleDown), "MachineSet", klog.KObj(oldMS))
log.V(5).Info(fmt.Sprintf("Setting scale down intent for MachineSet %s to %d replicas (-%d)", klog.KObj(oldMS), newScaleIntent, scaleDown), "MachineSet", klog.KObj(oldMS))
p.scaleIntents[oldMS.Name] = newScaleIntent
totalScaleDownCount = max(totalScaleDownCount-scaleDown, 0)
}
Expand Down Expand Up @@ -441,7 +441,7 @@ func (p *rolloutPlanner) reconcileInPlaceUpdateIntent(ctx context.Context) error
if err != nil {
return errors.Wrapf(err, "failed to determine if MachineSet %s can be updated in-place", oldMS.Name)
}
log.V(5).Info(fmt.Sprintf("CanUpdate in-place decision for MachineSet %s: %t", oldMS.Name, canUpdateInPlace), "MachineSet", klog.KObj(oldMS))
log.V(5).Info(fmt.Sprintf("CanUpdate in-place decision for MachineSet %s: %t", klog.KObj(oldMS), canUpdateInPlace), "MachineSet", klog.KObj(oldMS))

if !canUpdateInPlace {
continue
Expand Down Expand Up @@ -516,7 +516,7 @@ func (p *rolloutPlanner) reconcileInPlaceUpdateIntent(ctx context.Context) error
}

newScaleIntent := ptr.Deref(p.newMS.Spec.Replicas, 0) + newScaleUpCount
log.V(5).Info(fmt.Sprintf("Revisited scale up intent for MachineSet %s to %d replicas (+%d) to prevent creation of new machines while there are still in-place updates to be performed", p.newMS.Name, newScaleIntent, newScaleUpCount), "MachineSet", klog.KObj(p.newMS))
log.V(5).Info(fmt.Sprintf("Revisited scale up intent for MachineSet %s to %d replicas (+%d) to prevent creation of new machines while there are still in-place updates to be performed", klog.KObj(p.newMS), newScaleIntent, newScaleUpCount), "MachineSet", klog.KObj(p.newMS))
if newScaleUpCount == 0 {
delete(p.scaleIntents, p.newMS.Name)
} else {
Expand Down Expand Up @@ -618,7 +618,7 @@ func (p *rolloutPlanner) reconcileDeadlockBreaker(ctx context.Context) {

newScaleIntent := max(ptr.Deref(oldMS.Spec.Replicas, 0)-1, 0)
p.addNotef(p.newMS, "scaling down by 1 to unblock rollout stuck due to unavailable Machine on oldMS")
log.Info(fmt.Sprintf("Setting scale down intent for MachineSet %s to %d replicas (-%d) to unblock rollout stuck due to unavailable Machine on oldMS", oldMS.Name, newScaleIntent, 1), "MachineSet", klog.KObj(oldMS))
log.Info(fmt.Sprintf("Setting scale down intent for MachineSet %s to %d replicas (-%d) to unblock rollout stuck due to unavailable Machine on oldMS", klog.KObj(oldMS), newScaleIntent, 1), "MachineSet", klog.KObj(oldMS))
p.scaleIntents[oldMS.Name] = newScaleIntent
return
}
Expand Down
Loading