diff --git a/api/core/v1beta2/machineset_types.go b/api/core/v1beta2/machineset_types.go index f6b27b1ad9ce..80cb19d36256 100644 --- a/api/core/v1beta2/machineset_types.go +++ b/api/core/v1beta2/machineset_types.go @@ -43,7 +43,7 @@ const ( MachineSetMoveMachinesToMachineSetAnnotation = "in-place-updates.internal.cluster.x-k8s.io/move-machines-to-machineset" // MachineSetReceiveMachinesFromMachineSetsAnnotation is an internal annotation added by the MD controller to the newMS - // when it should receive replicas from oldMSs as a first step of an in-place upgrade operation + // when it should receive replicas from oldMSs as a first step of an in-place update operation // The annotation value is a comma separated list of oldMSs. // Note: This annotation is used in pair with MachineSetMoveMachinesToMachineSetAnnotation to perform a two-ways check before moving a machine from oldMS to newMS: // diff --git a/docs/book/src/tasks/experimental-features/cluster-class/change-clusterclass.md b/docs/book/src/tasks/experimental-features/cluster-class/change-clusterclass.md index e321bebe139f..9a5980813ec1 100644 --- a/docs/book/src/tasks/experimental-features/cluster-class/change-clusterclass.md +++ b/docs/book/src/tasks/experimental-features/cluster-class/change-clusterclass.md @@ -146,17 +146,17 @@ underlying objects like control plane and MachineDeployment act in the same way | Changed field | Effects on Clusters | |---------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| infrastructure.ref | Corresponding InfrastructureCluster objects are updated (in place update). | -| controlPlane.metadata | If labels/annotations are added, changed or deleted the ControlPlane objects are updated (in place update).

In case of KCP, corresponding controlPlane Machines, KubeadmConfigs and InfrastructureMachines are updated in-place. | -| controlPlane.ref | Corresponding ControlPlane objects are updated (in place update).
If updating ControlPlane objects implies changes in the spec, the corresponding ControlPlane Machines are updated accordingly (rollout). | -| controlPlane.machineInfrastructure.ref | If the referenced template has changes only in metadata labels or annotations, the corresponding InfrastructureMachineTemplates are updated (in place update).

If the referenced template has changes in the spec:
- Corresponding InfrastructureMachineTemplate are rotated (create new, delete old)
- Corresponding ControlPlane objects are updated with the reference to the newly created template (in place update)
- The corresponding controlPlane Machines are updated accordingly (rollout). | +| infrastructure.ref | Corresponding InfrastructureCluster objects are updated (in-place update). | +| controlPlane.metadata | If labels/annotations are added, changed or deleted the ControlPlane objects are updated (in-place update).

In case of KCP, corresponding controlPlane Machines, KubeadmConfigs and InfrastructureMachines are updated in-place. | +| controlPlane.ref | Corresponding ControlPlane objects are updated (in-place update).
If updating ControlPlane objects implies changes in the spec, the corresponding ControlPlane Machines are updated accordingly (rollout). | +| controlPlane.machineInfrastructure.ref | If the referenced template has changes only in metadata labels or annotations, the corresponding InfrastructureMachineTemplates are updated (in-place update).

If the referenced template has changes in the spec:
- Corresponding InfrastructureMachineTemplate are rotated (create new, delete old)
- Corresponding ControlPlane objects are updated with the reference to the newly created template (in-place update)
- The corresponding controlPlane Machines are updated accordingly (rollout). | | controlPlane.nodeDrainTimeout | If the value is changed the ControlPlane object is updated in-place.

In case of KCP, the change is propagated in-place to control plane Machines. | | controlPlane.nodeVolumeDetachTimeout | If the value is changed the ControlPlane object is updated in-place.

In case of KCP, the change is propagated in-place to control plane Machines. | | controlPlane.nodeDeletionTimeout | If the value is changed the ControlPlane object is updated in-place.

In case of KCP, the change is propagated in-place to control plane Machines. | | workers.machineDeployments | If a new MachineDeploymentClass is added, no changes are triggered to the Clusters.
If an existing MachineDeploymentClass is changed, effect depends on the type of change (see below). | -| workers.machineDeployments[].template.metadata | If labels/annotations are added, changed or deleted the MachineDeployment objects are updated (in place update) and corresponding worker Machines are updated (in-place). | -| workers.machineDeployments[].template.bootstrap.ref | If the referenced template has changes only in metadata labels or annotations, the corresponding BootstrapTemplates are updated (in place update).

If the referenced template has changes in the spec:
- Corresponding BootstrapTemplate are rotated (create new, delete old).
- Corresponding MachineDeployments objects are updated with the reference to the newly created template (in place update).
- The corresponding worker machines are updated accordingly (rollout) | -| workers.machineDeployments[].template.infrastructure.ref | If the referenced template has changes only in metadata labels or annotations, the corresponding InfrastructureMachineTemplates are updated (in place update).

If the referenced template has changes in the spec:
- Corresponding InfrastructureMachineTemplate are rotated (create new, delete old).
- Corresponding MachineDeployments objects are updated with the reference to the newly created template (in place update).
- The corresponding worker Machines are updated accordingly (rollout) | +| workers.machineDeployments[].template.metadata | If labels/annotations are added, changed or deleted the MachineDeployment objects are updated (in-place update) and corresponding worker Machines are updated (in-place). | +| workers.machineDeployments[].template.bootstrap.ref | If the referenced template has changes only in metadata labels or annotations, the corresponding BootstrapTemplates are updated (in-place update).

If the referenced template has changes in the spec:
- Corresponding BootstrapTemplate are rotated (create new, delete old).
- Corresponding MachineDeployments objects are updated with the reference to the newly created template (in-place update).
- The corresponding worker machines are updated accordingly (rollout) | +| workers.machineDeployments[].template.infrastructure.ref | If the referenced template has changes only in metadata labels or annotations, the corresponding InfrastructureMachineTemplates are updated (in-place update).

If the referenced template has changes in the spec:
- Corresponding InfrastructureMachineTemplate are rotated (create new, delete old).
- Corresponding MachineDeployments objects are updated with the reference to the newly created template (in-place update).
- The corresponding worker Machines are updated accordingly (rollout) | | workers.machineDeployments[].template.nodeDrainTimeout | If the value is changed the MachineDeployment is updated in-place.

The change is propagated in-place to the MachineDeployment Machine. | | workers.machineDeployments[].template.nodeVolumeDetachTimeout | If the value is changed the MachineDeployment is updated in-place.

The change is propagated in-place to the MachineDeployment Machine. | | workers.machineDeployments[].template.nodeDeletionTimeout | If the value is changed the MachineDeployment is updated in-place.

The change is propagated in-place to the MachineDeployment Machine. | diff --git a/docs/book/src/user/concepts.md b/docs/book/src/user/concepts.md index ea002042d75d..447f421d3e7c 100644 --- a/docs/book/src/user/concepts.md +++ b/docs/book/src/user/concepts.md @@ -49,7 +49,7 @@ A "Machine" is the declarative spec for an infrastructure component hosting a Ku Common fields such as Kubernetes version are modeled as fields on the Machine's spec. Any information that is provider-specific is part of the `InfrastructureRef` and is not portable between different providers. -#### Machine Immutability (In-place Upgrade vs. Replace) +#### Machine Immutability (In-place Update vs. Replace) From the perspective of Cluster API, all Machines are immutable: once they are created, they are never updated (except for labels, annotations and status), only deleted. diff --git a/docs/proposals/20181121-machine-api.md b/docs/proposals/20181121-machine-api.md index aec1a88a60ae..dfb4439e2440 100644 --- a/docs/proposals/20181121-machine-api.md +++ b/docs/proposals/20181121-machine-api.md @@ -70,7 +70,7 @@ One simplification that might be controversial in this proposal is the lack of API control over "in-place" versus "replace" reconciliation strategies. For instance, if a Machine's spec is updated with a different version of kubelet than is actually running, it is up to the provider-specific controller whether -the request would best be fulfilled by performing an in-place upgrade on the +the request would best be fulfilled by performing an in-place update on the Node, or by deleting the Node and creating a new one in its place (or reporting an error if this particular update is not supported). One can force a Node replacement by deleting and recreating the Machine object rather than updating diff --git a/docs/proposals/20240807-in-place-updates-implementation-notes.md b/docs/proposals/20240807-in-place-updates-implementation-notes.md index 31895877cba2..fb9c61e43cd8 100644 --- a/docs/proposals/20240807-in-place-updates-implementation-notes.md +++ b/docs/proposals/20240807-in-place-updates-implementation-notes.md @@ -23,9 +23,9 @@ into the proposal or into the user-facing documentation for this feature. - Old MS is instructed to move machines to the newMS, and newMS is informed to receive machines from oldMS. - MS controller manages a subset of Machines - When scaling down the old MS, if required to move, MS controller is responsible for moving a Machine to newMS - - When reconciling the new MachineSet, the MS controller takes ownership of the moved machine and begins the actual in-place upgrade. + - When reconciling the new MachineSet, the MS controller takes ownership of the moved machine and begins the actual in-place update. -- Orchestration of in-place upgrades between MD controller, MS controller, and Machine controller is implemented using annotations. +- Orchestration of in-place updates between MD controller, MS controller, and Machine controller is implemented using annotations. Following schemas provide an overview of how new annotations are used. Workflow #1: MD controller detects an in-place update is possible and it informs oldMS and newMS about how to perform this operation. @@ -74,7 +74,7 @@ sequenceDiagram MD Controller->>MS2 (NewMS): Scale up to acknowledge receipt of M1
Apply annotation ".../acknowledged-move": "M1" ``` -Workflow #4: MS controller, when reconciling newMS, detects that a machine has been acknowledged; it cleans up annotations on the machine, allowing the in-place upgrade to begin. +Workflow #4: MS controller, when reconciling newMS, detects that a machine has been acknowledged; it cleans up annotations on the machine, allowing the in-place update to begin. ```mermaid sequenceDiagram diff --git a/docs/proposals/20240807-in-place-updates.md b/docs/proposals/20240807-in-place-updates.md index c10975831c89..6523ff6f819c 100644 --- a/docs/proposals/20240807-in-place-updates.md +++ b/docs/proposals/20240807-in-place-updates.md @@ -78,7 +78,7 @@ __In-place Update__: any change to a Machine spec, including the Kubernetes Vers __Update Lifecycle Hook__: CAPI Lifecycle Runtime Hook to invoke external update extensions. -__Update Extension__: Runtime Extension (Implementation) is a component responsible to perform in place updates when the `External Update Lifecycle Hook` is invoked. +__Update Extension__: Runtime Extension (Implementation) is a component responsible to perform in-place updates when the `External Update Lifecycle Hook` is invoked. ## Summary @@ -114,9 +114,9 @@ With the implementation of an Update extension, users can take ownership of the ### Divide and conquer -Considering the complexity of this topic, a phased approach is required to design and implement the solution for in-place upgrades. +Considering the complexity of this topic, a phased approach is required to design and implement the solution for in-place updates. -The main goal of the first iteration of this proposal is to make it possible for Cluster API users to start experimenting usage of in-place upgrades, so we can gather feedback and evolve to the next stage. +The main goal of the first iteration of this proposal is to make it possible for Cluster API users to start experimenting usage of in-place updates, so we can gather feedback and evolve to the next stage. This iteration will focus on implementing the machinery required to interact with update extensions, while users facing changes in the API types are deferred to follow up iterations. @@ -172,7 +172,7 @@ As a cluster operator, I want to perform in-place updates on my Kubernetes clust #### Story 2 -As a cluster operator, I want to seamlessly transition between rolling and in-place updates while maintaining a consistent user interface. I appreciate the option to extend the rollout process with in-place upgrade capabilities, ensuring that the update process aligns with my organization's unique needs. +As a cluster operator, I want to seamlessly transition between rolling and in-place updates while maintaining a consistent user interface. I appreciate the option to extend the rollout process with in-place update capabilities, ensuring that the update process aligns with my organization's unique needs. #### Story 3 As a cluster operator for resource constrained environments, I want to utilize CAPI pluggable external update mechanism to implement in-place updates without requiring additional compute capacity in a single node cluster. diff --git a/docs/proposals/20240916-improve-status-in-CAPI-resources.md b/docs/proposals/20240916-improve-status-in-CAPI-resources.md index d07778c33455..f5dd11bfcdd6 100644 --- a/docs/proposals/20240916-improve-status-in-CAPI-resources.md +++ b/docs/proposals/20240916-improve-status-in-CAPI-resources.md @@ -548,7 +548,7 @@ Notes: - MachineSet is considered as a sort of implementation detail of MachineDeployments, so it doesn't have its own concept of availability. Similarly, this proposal is dropping the notion of MachineSet readiness because it is preferred to let users focus on Machines readiness. - When implementing this proposal `MachinesUpToDate` condition will be `false` for older MachineSet, `true` for the current MachineSet; - in the future this might change in case Cluster API will start supporting in-place upgrades. + in the future this might change in case Cluster API will start supporting in-place updates. - `Remediating` for older MachineSets will report that remediation will happen as part of the regular rollout (Cluster API does not remediate Machines on old MachineSets, because those Machines are already scheduled for deletion). diff --git a/internal/controllers/machine/machine_controller_inplace_update.go b/internal/controllers/machine/machine_controller_inplace_update.go index ea1733ccd359..cf4b1a9eb1ea 100644 --- a/internal/controllers/machine/machine_controller_inplace_update.go +++ b/internal/controllers/machine/machine_controller_inplace_update.go @@ -207,7 +207,7 @@ func (r *Reconciler) completeInPlaceUpdate(ctx context.Context, s *scope) error return err } - log.Info("In place upgrade completed!") + log.Info("In-place update completed!") return nil } diff --git a/internal/controllers/machine/machine_controller_status_test.go b/internal/controllers/machine/machine_controller_status_test.go index 7a17d56604ff..2f47b06e9e78 100644 --- a/internal/controllers/machine/machine_controller_status_test.go +++ b/internal/controllers/machine/machine_controller_status_test.go @@ -1893,7 +1893,7 @@ func TestSetReadyCondition(t *testing.T) { Type: clusterv1.MachineUpdatingCondition, Status: metav1.ConditionTrue, Reason: clusterv1.MachineInPlaceUpdatingReason, - Message: "In place update in progress", + Message: "In-place update in progress", }, }, }, @@ -1902,7 +1902,7 @@ func TestSetReadyCondition(t *testing.T) { Type: clusterv1.MachineReadyCondition, Status: metav1.ConditionFalse, Reason: clusterv1.MachineNotReadyReason, - Message: "* Updating: In place update in progress", + Message: "* Updating: In-place update in progress", }, }, { diff --git a/internal/controllers/machinedeployment/machinedeployment_rollout_ondelete_test.go b/internal/controllers/machinedeployment/machinedeployment_rollout_ondelete_test.go index 817fe4268c15..3df1281f922b 100644 --- a/internal/controllers/machinedeployment/machinedeployment_rollout_ondelete_test.go +++ b/internal/controllers/machinedeployment/machinedeployment_rollout_ondelete_test.go @@ -356,7 +356,7 @@ type onDeleteSequenceTestCase struct { // if this list contains new machines names (machine names not in currentMachineNames), it implies those machines have been created during a rollout; // please name new machines names as "mX" where X is a progressive number starting after the max number in currentMachineNames (do not skip numbers), // e.g. desiredMachineNames "m4","m5","m6" (desired machine names after a regular rollout of a MD with currentMachineNames "m1","m2","m3") - // e.g. desiredMachineNames "m1","m2","m3" (desired machine names after rollout performed using in-place upgrade for an MD with currentMachineNames "m1","m2","m3") + // e.g. desiredMachineNames "m1","m2","m3" (desired machine names after rollout performed using in-place update for an MD with currentMachineNames "m1","m2","m3") desiredMachineNames []string // maxUserUnavailable define the maximum numbers of unavailable machines a user want to have in the system. diff --git a/internal/controllers/machinedeployment/machinedeployment_rollout_planner_test.go b/internal/controllers/machinedeployment/machinedeployment_rollout_planner_test.go index bf21a51156bd..5abea19eab4f 100644 --- a/internal/controllers/machinedeployment/machinedeployment_rollout_planner_test.go +++ b/internal/controllers/machinedeployment/machinedeployment_rollout_planner_test.go @@ -520,7 +520,7 @@ func machineSetControllerMutator(log *fileLogger, ms *clusterv1.MachineSet, scop } } if replicasEndingInPlaceUpdate.Len() > 0 { - log.Logf("[MS controller] - Replicas %s completed in place update", sortAndJoin(replicasEndingInPlaceUpdate.UnsortedList())) + log.Logf("[MS controller] - Replicas %s completed in-place update", sortAndJoin(replicasEndingInPlaceUpdate.UnsortedList())) } // Starting from here, the code must mirror the implementation of the Reconcile func in the MachineSet controller to ensure the reliability of the tests. @@ -563,7 +563,7 @@ func machineSetControllerMutatorTriggerInPlaceUpdate(ms *clusterv1.MachineSet, s } else { // If this MachineSet is not accepting anymore machines from other MS (e.g. because of MD spec changes), // then drop the PendingAcknowledgeMove annotation; this machine will be treated as any other machine and either - // deleted or moved to another MS after completing the in-place upgrade. + // deleted or moved to another MS after completing the in-place update. delete(m.Annotations, clusterv1.PendingAcknowledgeMoveAnnotation) } } diff --git a/internal/controllers/machinedeployment/machinedeployment_rollout_rollingupdate.go b/internal/controllers/machinedeployment/machinedeployment_rollout_rollingupdate.go index c352307ff518..ca9ac9b4e9b9 100644 --- a/internal/controllers/machinedeployment/machinedeployment_rollout_rollingupdate.go +++ b/internal/controllers/machinedeployment/machinedeployment_rollout_rollingupdate.go @@ -42,7 +42,6 @@ func (r *Reconciler) rolloutRollingUpdate(ctx context.Context, md *clusterv1.Mac return err } - // TODO(in-place): TBD if we want to always prevent machine creation on oldMS. if err := planner.planRollingUpdate(ctx); err != nil { return err } @@ -173,7 +172,7 @@ func (p *rolloutPlanner) reconcileReplicasPendingAcknowledgeMove(ctx context.Con // which are also unavailable Machines. // // Notably, there is also no agreement yet on a different way forward because e.g. limiting scale down of the -// new MS could lead e.g. to completing in place update of Machines that will be otherwise deleted. +// new MS could lead e.g. to completing in-place update of Machines that will be otherwise deleted. func (p *rolloutPlanner) reconcileNewMachineSet(ctx context.Context) error { log := ctrl.LoggerFrom(ctx) allMSs := append(p.oldMSs, p.newMS) @@ -379,7 +378,7 @@ func (p *rolloutPlanner) scaleDownOldMSs(ctx context.Context, totalScaleDownCoun // When calling this func, new and old MS already have their scale intent, which was computed under the assumption that // rollout is going to happen by delete/re-create, and thus it will impact availability. // -// Also in place updates are assumed to impact availability, even if the in place update technically is not impacting workloads, +// Also in-place updates are assumed to impact availability, even if the in-place update technically is not impacting workloads, // the system must account for scenarios when the operation fails, leading to remediation of the machine/unavailability. // // As a consequence: @@ -387,7 +386,7 @@ func (p *rolloutPlanner) scaleDownOldMSs(ctx context.Context, totalScaleDownCoun // - unless the user accounts for this unavailability by setting MaxUnavailable >= 1, // rollout with in-place will create one additional machine to ensure MaxUnavailable == 0 is respected. // -// NOTE: if an in-place upgrade is possible and maxSurge is >= 1, creation of additional machines due to maxSurge is capped to 1 or entirely dropped. +// NOTE: if an in-place update is possible and maxSurge is >= 1, creation of additional machines due to maxSurge is capped to 1 or entirely dropped. // Instead, creation of new machines due to scale up goes through as usual. func (p *rolloutPlanner) reconcileInPlaceUpdateIntent(ctx context.Context) error { log := ctrl.LoggerFrom(ctx) @@ -409,7 +408,7 @@ func (p *rolloutPlanner) reconcileInPlaceUpdateIntent(ctx context.Context) error continue } - // If the oldMS is not eligible for in place updates, move to the next MachineSet. + // If the oldMS is not eligible for in-place updates, move to the next MachineSet. if result, ok := p.upToDateResults[oldMS.Name]; !ok || !result.EligibleForInPlaceUpdate { continue } @@ -428,7 +427,7 @@ func (p *rolloutPlanner) reconcileInPlaceUpdateIntent(ctx context.Context) error } // Set the annotation informing the oldMS that it must move machines to the newMS instead of deleting them. - // Note: After a machine is moved from oldMS to newMS, the newMS will take care of the in-place upgrade process. + // Note: After a machine is moved from oldMS to newMS, the newMS will take care of the in-place update process. // Note: Cleanup of the MachineSetMoveMachinesToMachineSetAnnotation will happen automatically as soon as the rollout planner stops // to set it, because this annotation is not part of the output of computeDesiredMS // (same applies to newMS, so annotation will always be removed from newMS). @@ -492,7 +491,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", p.newMS.Name, newScaleIntent, newScaleUpCount), "MachineSet", klog.KObj(p.newMS)) if newScaleUpCount == 0 { delete(p.scaleIntents, p.newMS.Name) } else { diff --git a/internal/controllers/machinedeployment/machinedeployment_rollout_rollingupdate_test.go b/internal/controllers/machinedeployment/machinedeployment_rollout_rollingupdate_test.go index 293f03b1a17f..891ef1a60187 100644 --- a/internal/controllers/machinedeployment/machinedeployment_rollout_rollingupdate_test.go +++ b/internal/controllers/machinedeployment/machinedeployment_rollout_rollingupdate_test.go @@ -1350,7 +1350,7 @@ type rollingUpdateSequenceTestCase struct { // if this list contains new machines names (machine names not in currentMachineNames), it implies those machines have been created during a rollout; // please name new machines names as "mX" where X is a progressive number starting after the max number in currentMachineNames (do not skip numbers), // e.g. desiredMachineNames "m4","m5","m6" (desired machine names after a regular rollout of a MD with currentMachineNames "m1","m2","m3") - // e.g. desiredMachineNames "m1","m2","m3" (desired machine names after rollout performed using in-place upgrade for an MD with currentMachineNames "m1","m2","m3") + // e.g. desiredMachineNames "m1","m2","m3" (desired machine names after rollout performed using in-place update for an MD with currentMachineNames "m1","m2","m3") desiredMachineNames []string // overrideCanUpdateMachineSetInPlaceFunc allows to inject a function that will be used to perform the canUpdateMachineSetInPlace decision diff --git a/internal/controllers/machinedeployment/machinedeployment_sync.go b/internal/controllers/machinedeployment/machinedeployment_sync.go index 1d30c6155de3..c4dc42bb0054 100644 --- a/internal/controllers/machinedeployment/machinedeployment_sync.go +++ b/internal/controllers/machinedeployment/machinedeployment_sync.go @@ -69,7 +69,7 @@ func (r *Reconciler) sync(ctx context.Context, md *clusterv1.MachineDeployment, oldMSs := planner.oldMSs allMSs := append(oldMSs, newMS) - // TODO(in-place): consider if to move the scale logic to the rollout planner as well, so we can improve test coverage + // Note: Consider if to move the scale logic to the rollout planner as well, so we can improve test coverage // like we did for RolloutUpdate and OnDelete strategy. if err := r.scale(ctx, md, newMS, oldMSs); err != nil { // If we get an error while trying to scale, the deployment will be requeued diff --git a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 12 replicas, maxsurge 3, maxunavailable 1, scale down to 6, random(0).test.log.golden b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 12 replicas, maxsurge 3, maxunavailable 1, scale down to 6, random(0).test.log.golden index dbd07e2d86c9..adeebdaa0b67 100644 --- a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 12 replicas, maxsurge 3, maxunavailable 1, scale down to 6, random(0).test.log.golden +++ b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 12 replicas, maxsurge 3, maxunavailable 1, scale down to 6, random(0).test.log.golden @@ -42,7 +42,7 @@ - ms2, 6/6 replicas (m1,m2,m3,m4🟡,m5🟡,m6🟡 <= ms1) [MS controller] Iteration 4, Reconcile ms1, 2/2 replicas (m11,m12 => ms2) [MS controller] Iteration 4, Reconcile ms2, 6/6 replicas (m1,m2,m3,m4🟡,m5🟡,m6🟡 <= ms1) -[MS controller] - Replicas m4,m5,m6 completed in place update +[MS controller] - Replicas m4,m5,m6 completed in-place update [MS controller] Iteration 5, Reconcile ms2, 6/6 replicas (m1,m2,m3,m4,m5,m6 <= ms1) [MD controller] Iteration 5, Reconcile md [MD controller] - Input to rollout planner diff --git a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 12 replicas, maxsurge 3, maxunavailable 1, scale down to 6.test.log.golden b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 12 replicas, maxsurge 3, maxunavailable 1, scale down to 6.test.log.golden index b33fdd7490e0..36497f92a689 100644 --- a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 12 replicas, maxsurge 3, maxunavailable 1, scale down to 6.test.log.golden +++ b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 12 replicas, maxsurge 3, maxunavailable 1, scale down to 6.test.log.golden @@ -43,7 +43,7 @@ - ms2, 6/6 replicas (m1,m2,m3,m4🟡,m5🟡,m6🟡 <= ms1) [MS controller] Iteration 3, Reconcile ms1, 2/2 replicas (m11,m12 => ms2) [MS controller] Iteration 3, Reconcile ms2, 6/6 replicas (m1,m2,m3,m4🟡,m5🟡,m6🟡 <= ms1) -[MS controller] - Replicas m4,m5,m6 completed in place update +[MS controller] - Replicas m4,m5,m6 completed in-place update [MD controller] Iteration 4, Reconcile md [MD controller] - Input to rollout planner md, 8/6 replicas diff --git a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 3 replicas, maxsurge 0, maxunavailable 1, random(0).test.log.golden b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 3 replicas, maxsurge 0, maxunavailable 1, random(0).test.log.golden index b6b40fdb2372..6103784acb14 100644 --- a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 3 replicas, maxsurge 0, maxunavailable 1, random(0).test.log.golden +++ b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 3 replicas, maxsurge 0, maxunavailable 1, random(0).test.log.golden @@ -48,7 +48,7 @@ - ms2, 1/1 replicas (m1🟡 <= ms1) [MS controller] Iteration 4, Reconcile ms1, 2/2 replicas (m2,m3 => ms2) [MS controller] Iteration 4, Reconcile ms2, 1/1 replicas (m1🟡 <= ms1) -[MS controller] - Replicas m1 completed in place update +[MS controller] - Replicas m1 completed in-place update [MS controller] Iteration 5, Reconcile ms2, 1/1 replicas (m1 <= ms1) [MD controller] Iteration 5, Reconcile md [MD controller] - Input to rollout planner @@ -96,7 +96,7 @@ [MS controller] Iteration 10, Reconcile ms2, 2/2 replicas (m1,m2🟡 <= ms1) [MS controller] Iteration 10, Reconcile ms1, 1/1 replicas (m3 => ms2) [MS controller] Iteration 11, Reconcile ms2, 2/2 replicas (m1,m2🟡 <= ms1) -[MS controller] - Replicas m2 completed in place update +[MS controller] - Replicas m2 completed in-place update [MD controller] Iteration 11, Reconcile md [MD controller] - Input to rollout planner md, 3/3 replicas @@ -150,7 +150,7 @@ [MS controller] Iteration 17, Reconcile ms2, 2/3 replicas (m1,m2,m3🟡 <= ms1) [MS controller] Iteration 17, Reconcile ms1, 0/0 replicas ( => ms2) [MS controller] Iteration 18, Reconcile ms2, 3/3 replicas (m1,m2,m3🟡 <= ms1) -[MS controller] - Replicas m3 completed in place update +[MS controller] - Replicas m3 completed in-place update [MD controller] Iteration 18, Reconcile md [MD controller] - Input to rollout planner md, 2/3 replicas diff --git a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 3 replicas, maxsurge 0, maxunavailable 1.test.log.golden b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 3 replicas, maxsurge 0, maxunavailable 1.test.log.golden index 362cb0b55aae..093ad2b991c2 100644 --- a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 3 replicas, maxsurge 0, maxunavailable 1.test.log.golden +++ b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 3 replicas, maxsurge 0, maxunavailable 1.test.log.golden @@ -38,7 +38,7 @@ - ms2, 1/1 replicas (m1🟡 <= ms1) [MS controller] Iteration 3, Reconcile ms1, 2/2 replicas (m2,m3 => ms2) [MS controller] Iteration 3, Reconcile ms2, 1/1 replicas (m1🟡 <= ms1) -[MS controller] - Replicas m1 completed in place update +[MS controller] - Replicas m1 completed in-place update [MD controller] Iteration 4, Reconcile md [MD controller] - Input to rollout planner md, 3/3 replicas @@ -74,7 +74,7 @@ - ms2, 2/2 replicas (m1,m2🟡 <= ms1) [MS controller] Iteration 6, Reconcile ms1, 1/1 replicas (m3 => ms2) [MS controller] Iteration 6, Reconcile ms2, 2/2 replicas (m1,m2🟡 <= ms1) -[MS controller] - Replicas m2 completed in place update +[MS controller] - Replicas m2 completed in-place update [MD controller] Iteration 7, Reconcile md [MD controller] - Input to rollout planner md, 3/3 replicas @@ -110,7 +110,7 @@ - ms2, 3/3 replicas (m1,m2,m3🟡 <= ms1) [MS controller] Iteration 9, Reconcile ms1, 0/0 replicas ( => ms2) [MS controller] Iteration 9, Reconcile ms2, 3/3 replicas (m1,m2,m3🟡 <= ms1) -[MS controller] - Replicas m3 completed in place update +[MS controller] - Replicas m3 completed in-place update [MD controller] Iteration 10, Reconcile md [MD controller] - Input to rollout planner md, 3/3 replicas diff --git a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 3 replicas, maxsurge 1, maxunavailable 0, random(0).test.log.golden b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 3 replicas, maxsurge 1, maxunavailable 0, random(0).test.log.golden index 77ab587ec391..359293638185 100644 --- a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 3 replicas, maxsurge 1, maxunavailable 0, random(0).test.log.golden +++ b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 3 replicas, maxsurge 1, maxunavailable 0, random(0).test.log.golden @@ -48,7 +48,7 @@ - ms2, 2/2 replicas (m1🟡,m4 <= ms1) [MS controller] Iteration 4, Reconcile ms1, 2/2 replicas (m2,m3 => ms2) [MS controller] Iteration 4, Reconcile ms2, 2/2 replicas (m1🟡,m4 <= ms1) -[MS controller] - Replicas m1 completed in place update +[MS controller] - Replicas m1 completed in-place update [MS controller] Iteration 5, Reconcile ms2, 2/2 replicas (m1,m4 <= ms1) [MD controller] Iteration 5, Reconcile md [MD controller] - Input to rollout planner @@ -96,7 +96,7 @@ [MS controller] Iteration 10, Reconcile ms2, 3/3 replicas (m1,m2🟡,m4 <= ms1) [MS controller] Iteration 10, Reconcile ms1, 1/1 replicas (m3 => ms2) [MS controller] Iteration 11, Reconcile ms2, 3/3 replicas (m1,m2🟡,m4 <= ms1) -[MS controller] - Replicas m2 completed in place update +[MS controller] - Replicas m2 completed in-place update [MD controller] Iteration 11, Reconcile md [MD controller] - Input to rollout planner md, 4/3 replicas diff --git a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 3 replicas, maxsurge 1, maxunavailable 0.test.log.golden b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 3 replicas, maxsurge 1, maxunavailable 0.test.log.golden index 2509e2674f36..0f1357f177fc 100644 --- a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 3 replicas, maxsurge 1, maxunavailable 0.test.log.golden +++ b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 3 replicas, maxsurge 1, maxunavailable 0.test.log.golden @@ -50,7 +50,7 @@ - ms2, 2/2 replicas (m1🟡,m4 <= ms1) [MS controller] Iteration 4, Reconcile ms1, 2/2 replicas (m2,m3 => ms2) [MS controller] Iteration 4, Reconcile ms2, 2/2 replicas (m1🟡,m4 <= ms1) -[MS controller] - Replicas m1 completed in place update +[MS controller] - Replicas m1 completed in-place update [MD controller] Iteration 5, Reconcile md [MD controller] - Input to rollout planner md, 4/3 replicas @@ -86,7 +86,7 @@ - ms2, 3/3 replicas (m1,m2🟡,m4 <= ms1) [MS controller] Iteration 7, Reconcile ms1, 1/1 replicas (m3 => ms2) [MS controller] Iteration 7, Reconcile ms2, 3/3 replicas (m1,m2🟡,m4 <= ms1) -[MS controller] - Replicas m2 completed in place update +[MS controller] - Replicas m2 completed in-place update [MD controller] Iteration 8, Reconcile md [MD controller] - Input to rollout planner md, 4/3 replicas diff --git a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 0, maxunavailable 10, random(0).test.log.golden b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 0, maxunavailable 10, random(0).test.log.golden index 54953ba1e120..13335d7f96f6 100644 --- a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 0, maxunavailable 10, random(0).test.log.golden +++ b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 0, maxunavailable 10, random(0).test.log.golden @@ -48,7 +48,7 @@ - ms2, 6/6 replicas (m1🟡,m2🟡,m3🟡,m4🟡,m5🟡,m6🟡 <= ms1) [MS controller] Iteration 4, Reconcile ms1, 0/0 replicas ( => ms2) [MS controller] Iteration 4, Reconcile ms2, 6/6 replicas (m1🟡,m2🟡,m3🟡,m4🟡,m5🟡,m6🟡 <= ms1) -[MS controller] - Replicas m1,m2,m3,m4,m5,m6 completed in place update +[MS controller] - Replicas m1,m2,m3,m4,m5,m6 completed in-place update [MS controller] Iteration 5, Reconcile ms2, 6/6 replicas (m1,m2,m3,m4,m5,m6 <= ms1) [MD controller] Iteration 5, Reconcile md [MD controller] - Input to rollout planner diff --git a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 0, maxunavailable 10.test.log.golden b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 0, maxunavailable 10.test.log.golden index 0e85f314baf8..8b7c15e3c6b6 100644 --- a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 0, maxunavailable 10.test.log.golden +++ b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 0, maxunavailable 10.test.log.golden @@ -38,7 +38,7 @@ - ms2, 6/6 replicas (m1🟡,m2🟡,m3🟡,m4🟡,m5🟡,m6🟡 <= ms1) [MS controller] Iteration 3, Reconcile ms1, 0/0 replicas ( => ms2) [MS controller] Iteration 3, Reconcile ms2, 6/6 replicas (m1🟡,m2🟡,m3🟡,m4🟡,m5🟡,m6🟡 <= ms1) -[MS controller] - Replicas m1,m2,m3,m4,m5,m6 completed in place update +[MS controller] - Replicas m1,m2,m3,m4,m5,m6 completed in-place update [MD controller] Iteration 4, Reconcile md [MD controller] - Input to rollout planner md, 6/6 replicas diff --git a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 1, maxunavailable 3, random(0).test.log.golden b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 1, maxunavailable 3, random(0).test.log.golden index 38c4c68000bf..2b0504dc4e34 100644 --- a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 1, maxunavailable 3, random(0).test.log.golden +++ b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 1, maxunavailable 3, random(0).test.log.golden @@ -48,7 +48,7 @@ - ms2, 3/3 replicas (m1🟡,m2🟡,m3🟡 <= ms1) [MS controller] Iteration 4, Reconcile ms1, 3/3 replicas (m4,m5,m6 => ms2) [MS controller] Iteration 4, Reconcile ms2, 3/3 replicas (m1🟡,m2🟡,m3🟡 <= ms1) -[MS controller] - Replicas m1,m2,m3 completed in place update +[MS controller] - Replicas m1,m2,m3 completed in-place update [MS controller] Iteration 5, Reconcile ms2, 3/3 replicas (m1,m2,m3 <= ms1) [MD controller] Iteration 5, Reconcile md [MD controller] - Input to rollout planner @@ -96,7 +96,7 @@ [MS controller] Iteration 10, Reconcile ms2, 6/6 replicas (m1,m2,m3,m4🟡,m5🟡,m6🟡 <= ms1) [MS controller] Iteration 10, Reconcile ms1, 0/0 replicas ( => ms2) [MS controller] Iteration 11, Reconcile ms2, 6/6 replicas (m1,m2,m3,m4🟡,m5🟡,m6🟡 <= ms1) -[MS controller] - Replicas m4,m5,m6 completed in place update +[MS controller] - Replicas m4,m5,m6 completed in-place update [MD controller] Iteration 11, Reconcile md [MD controller] - Input to rollout planner md, 6/6 replicas diff --git a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 1, maxunavailable 3.test.log.golden b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 1, maxunavailable 3.test.log.golden index f2fdaa26fbe7..8ca7b7ef6d88 100644 --- a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 1, maxunavailable 3.test.log.golden +++ b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 1, maxunavailable 3.test.log.golden @@ -38,7 +38,7 @@ - ms2, 3/3 replicas (m1🟡,m2🟡,m3🟡 <= ms1) [MS controller] Iteration 3, Reconcile ms1, 3/3 replicas (m4,m5,m6 => ms2) [MS controller] Iteration 3, Reconcile ms2, 3/3 replicas (m1🟡,m2🟡,m3🟡 <= ms1) -[MS controller] - Replicas m1,m2,m3 completed in place update +[MS controller] - Replicas m1,m2,m3 completed in-place update [MD controller] Iteration 4, Reconcile md [MD controller] - Input to rollout planner md, 6/6 replicas @@ -74,7 +74,7 @@ - ms2, 6/6 replicas (m1,m2,m3,m4🟡,m5🟡,m6🟡 <= ms1) [MS controller] Iteration 6, Reconcile ms1, 0/0 replicas ( => ms2) [MS controller] Iteration 6, Reconcile ms2, 6/6 replicas (m1,m2,m3,m4🟡,m5🟡,m6🟡 <= ms1) -[MS controller] - Replicas m4,m5,m6 completed in place update +[MS controller] - Replicas m4,m5,m6 completed in-place update [MD controller] Iteration 7, Reconcile md [MD controller] - Input to rollout planner md, 6/6 replicas diff --git a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 10, maxunavailable 0, random(0).test.log.golden b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 10, maxunavailable 0, random(0).test.log.golden index 62a796248b47..bfc83e5a32e2 100644 --- a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 10, maxunavailable 0, random(0).test.log.golden +++ b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 10, maxunavailable 0, random(0).test.log.golden @@ -48,7 +48,7 @@ - ms2, 2/2 replicas (m1🟡,m7 <= ms1) [MS controller] Iteration 4, Reconcile ms1, 5/5 replicas (m2,m3,m4,m5,m6 => ms2) [MS controller] Iteration 4, Reconcile ms2, 2/2 replicas (m1🟡,m7 <= ms1) -[MS controller] - Replicas m1 completed in place update +[MS controller] - Replicas m1 completed in-place update [MS controller] Iteration 5, Reconcile ms2, 2/2 replicas (m1,m7 <= ms1) [MD controller] Iteration 5, Reconcile md [MD controller] - Input to rollout planner @@ -96,7 +96,7 @@ [MS controller] Iteration 10, Reconcile ms2, 3/3 replicas (m1,m2🟡,m7 <= ms1) [MS controller] Iteration 10, Reconcile ms1, 4/4 replicas (m3,m4,m5,m6 => ms2) [MS controller] Iteration 11, Reconcile ms2, 3/3 replicas (m1,m2🟡,m7 <= ms1) -[MS controller] - Replicas m2 completed in place update +[MS controller] - Replicas m2 completed in-place update [MD controller] Iteration 11, Reconcile md [MD controller] - Input to rollout planner md, 7/6 replicas @@ -150,7 +150,7 @@ [MS controller] Iteration 17, Reconcile ms2, 3/4 replicas (m1,m2,m3🟡,m7 <= ms1) [MS controller] Iteration 17, Reconcile ms1, 3/3 replicas (m4,m5,m6 => ms2) [MS controller] Iteration 18, Reconcile ms2, 4/4 replicas (m1,m2,m3🟡,m7 <= ms1) -[MS controller] - Replicas m3 completed in place update +[MS controller] - Replicas m3 completed in-place update [MD controller] Iteration 18, Reconcile md [MD controller] - Input to rollout planner md, 6/6 replicas @@ -175,7 +175,7 @@ [MS controller] Iteration 19, Reconcile ms2, 4/5 replicas (m1,m2,m3,m4🟡,m7 <= ms1) [MS controller] Iteration 19, Reconcile ms1, 2/2 replicas (m5,m6 => ms2) [MS controller] Iteration 20, Reconcile ms2, 5/5 replicas (m1,m2,m3,m4🟡,m7 <= ms1) -[MS controller] - Replicas m4 completed in place update +[MS controller] - Replicas m4 completed in-place update [MS controller] Iteration 20, Reconcile ms1, 2/2 replicas (m5,m6 => ms2) [MS controller] Iteration 21, Reconcile ms1, 2/2 replicas (m5,m6 => ms2) [MS controller] Iteration 21, Reconcile ms2, 5/5 replicas (m1,m2,m3,m4,m7 <= ms1) @@ -224,7 +224,7 @@ - ms1, 1/1 replicas (m6 => ms2) - ms2, 6/6 replicas (m1,m2,m3,m4,m5🟡,m7 <= ms1) [MS controller] Iteration 25, Reconcile ms2, 6/6 replicas (m1,m2,m3,m4,m5🟡,m7 <= ms1) -[MS controller] - Replicas m5 completed in place update +[MS controller] - Replicas m5 completed in-place update [MS controller] Iteration 25, Reconcile ms1, 1/1 replicas (m6 => ms2) [MS controller] Iteration 25, Reconcile ms2, 6/6 replicas (m1,m2,m3,m4,m5,m7 <= ms1) [MD controller] Iteration 26, Reconcile md diff --git a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 10, maxunavailable 0.test.log.golden b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 10, maxunavailable 0.test.log.golden index de6a4c61b4ff..7de2e01d8e0d 100644 --- a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 10, maxunavailable 0.test.log.golden +++ b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 10, maxunavailable 0.test.log.golden @@ -50,7 +50,7 @@ - ms2, 2/2 replicas (m1🟡,m7 <= ms1) [MS controller] Iteration 4, Reconcile ms1, 5/5 replicas (m2,m3,m4,m5,m6 => ms2) [MS controller] Iteration 4, Reconcile ms2, 2/2 replicas (m1🟡,m7 <= ms1) -[MS controller] - Replicas m1 completed in place update +[MS controller] - Replicas m1 completed in-place update [MD controller] Iteration 5, Reconcile md [MD controller] - Input to rollout planner md, 7/6 replicas @@ -86,7 +86,7 @@ - ms2, 3/3 replicas (m1,m2🟡,m7 <= ms1) [MS controller] Iteration 7, Reconcile ms1, 4/4 replicas (m3,m4,m5,m6 => ms2) [MS controller] Iteration 7, Reconcile ms2, 3/3 replicas (m1,m2🟡,m7 <= ms1) -[MS controller] - Replicas m2 completed in place update +[MS controller] - Replicas m2 completed in-place update [MD controller] Iteration 8, Reconcile md [MD controller] - Input to rollout planner md, 7/6 replicas @@ -122,7 +122,7 @@ - ms2, 4/4 replicas (m1,m2,m3🟡,m7 <= ms1) [MS controller] Iteration 10, Reconcile ms1, 3/3 replicas (m4,m5,m6 => ms2) [MS controller] Iteration 10, Reconcile ms2, 4/4 replicas (m1,m2,m3🟡,m7 <= ms1) -[MS controller] - Replicas m3 completed in place update +[MS controller] - Replicas m3 completed in-place update [MD controller] Iteration 11, Reconcile md [MD controller] - Input to rollout planner md, 7/6 replicas @@ -158,7 +158,7 @@ - ms2, 5/5 replicas (m1,m2,m3,m4🟡,m7 <= ms1) [MS controller] Iteration 13, Reconcile ms1, 2/2 replicas (m5,m6 => ms2) [MS controller] Iteration 13, Reconcile ms2, 5/5 replicas (m1,m2,m3,m4🟡,m7 <= ms1) -[MS controller] - Replicas m4 completed in place update +[MS controller] - Replicas m4 completed in-place update [MD controller] Iteration 14, Reconcile md [MD controller] - Input to rollout planner md, 7/6 replicas @@ -194,7 +194,7 @@ - ms2, 6/6 replicas (m1,m2,m3,m4,m5🟡,m7 <= ms1) [MS controller] Iteration 16, Reconcile ms1, 1/1 replicas (m6 => ms2) [MS controller] Iteration 16, Reconcile ms2, 6/6 replicas (m1,m2,m3,m4,m5🟡,m7 <= ms1) -[MS controller] - Replicas m5 completed in place update +[MS controller] - Replicas m5 completed in-place update [MD controller] Iteration 17, Reconcile md [MD controller] - Input to rollout planner md, 7/6 replicas diff --git a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1, change spec, random(0).test.log.golden b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1, change spec, random(0).test.log.golden index 8bb3fd1488ca..e42219493a2f 100644 --- a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1, change spec, random(0).test.log.golden +++ b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1, change spec, random(0).test.log.golden @@ -62,7 +62,7 @@ [MS controller] Iteration 6, Reconcile ms3, 1/1 replicas (m4🟡 <= ms1,ms2) [MS controller] Iteration 6, Reconcile ms1, 2/2 replicas (m5,m6 => ms3) [MS controller] Iteration 6, Reconcile ms3, 1/1 replicas (m4🟡 <= ms1,ms2) -[MS controller] - Replicas m4 completed in place update +[MS controller] - Replicas m4 completed in-place update [MD controller] Iteration 7, Reconcile md [MD controller] - Input to rollout planner md, 6/6 replicas @@ -123,7 +123,7 @@ [MS controller] Iteration 10, Reconcile ms1, 1/1 replicas (m6 => ms3) [MS controller] Iteration 11, Reconcile ms1, 1/1 replicas (m6 => ms3) [MS controller] Iteration 12, Reconcile ms3, 2/2 replicas (m4,m5🟡 <= ms1,ms2) -[MS controller] - Replicas m5 completed in place update +[MS controller] - Replicas m5 completed in-place update [MS controller] Iteration 12, Reconcile ms1, 1/1 replicas (m6 => ms3) [MD controller] Iteration 12, Reconcile md [MD controller] - Input to rollout planner @@ -182,7 +182,7 @@ [MS controller] Iteration 16, Reconcile ms2, 3/3 replicas (m1,m2,m3 => ms3) [MS controller] Iteration 17, Reconcile ms2, 3/3 replicas (m1,m2,m3 => ms3) [MS controller] Iteration 17, Reconcile ms3, 3/3 replicas (m4,m5,m6🟡 <= ms2) -[MS controller] - Replicas m6 completed in place update +[MS controller] - Replicas m6 completed in-place update [MS controller] Iteration 18, Reconcile ms2, 3/3 replicas (m1,m2,m3 => ms3) [MS controller] Iteration 18, Reconcile ms2, 3/3 replicas (m1,m2,m3 => ms3) [MS controller] Iteration 18, Reconcile ms1, 0/0 replicas ( => ms3) @@ -233,7 +233,7 @@ [MS controller] Iteration 22, Reconcile ms1, 0/0 replicas ( => ms3) [MS controller] Iteration 23, Reconcile ms2, 2/2 replicas (m2,m3 => ms3) [MS controller] Iteration 23, Reconcile ms3, 4/4 replicas (m1🟡,m4,m5,m6 <= ms2) -[MS controller] - Replicas m1 completed in place update +[MS controller] - Replicas m1 completed in-place update [MS controller] Iteration 23, Reconcile ms3, 4/4 replicas (m1,m4,m5,m6 <= ms2) [MD controller] Iteration 23, Reconcile md [MD controller] - Input to rollout planner @@ -276,7 +276,7 @@ [MS controller] Iteration 25, Reconcile ms1, 0/0 replicas ( => ms3) [MS controller] Iteration 25, Reconcile ms3, 4/5 replicas (m1,m2🟡,m4,m5,m6 <= ms2) [MS controller] Iteration 25, Reconcile ms3, 5/5 replicas (m1,m2🟡,m4,m5,m6 <= ms2) -[MS controller] - Replicas m2 completed in place update +[MS controller] - Replicas m2 completed in-place update [MS controller] Iteration 26, Reconcile ms2, 1/1 replicas (m3 => ms3) [MS controller] Iteration 26, Reconcile ms3, 5/5 replicas (m1,m2,m4,m5,m6 <= ms2) [MS controller] Iteration 26, Reconcile ms1, 0/0 replicas ( => ms3) @@ -358,7 +358,7 @@ - ms2, 0/0 replicas ( => ms3) - ms3, 6/6 replicas (m1,m2,m3🟡,m4,m5,m6 <= ms2) [MS controller] Iteration 31, Reconcile ms3, 6/6 replicas (m1,m2,m3🟡,m4,m5,m6 <= ms2) -[MS controller] - Replicas m3 completed in place update +[MS controller] - Replicas m3 completed in-place update [MS controller] Iteration 32, Reconcile ms3, 6/6 replicas (m1,m2,m3,m4,m5,m6 <= ms2) [MS controller] Iteration 32, Reconcile ms3, 6/6 replicas (m1,m2,m3,m4,m5,m6 <= ms2) [MS controller] Iteration 32, Reconcile ms2, 0/0 replicas ( => ms3) diff --git a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1, change spec.test.log.golden b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1, change spec.test.log.golden index 730be50361ab..2229ca60fad0 100644 --- a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1, change spec.test.log.golden +++ b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1, change spec.test.log.golden @@ -48,7 +48,7 @@ [MS controller] Iteration 3, Reconcile ms1, 2/2 replicas (m5,m6 => ms3) [MS controller] Iteration 3, Reconcile ms2, 3/3 replicas (m1,m2,m3 => ms3) [MS controller] Iteration 3, Reconcile ms3, 1/1 replicas (m4🟡 <= ms1,ms2) -[MS controller] - Replicas m4 completed in place update +[MS controller] - Replicas m4 completed in-place update [MD controller] Iteration 4, Reconcile md [MD controller] - Input to rollout planner md, 6/6 replicas @@ -93,7 +93,7 @@ [MS controller] Iteration 6, Reconcile ms1, 1/1 replicas (m6 => ms3) [MS controller] Iteration 6, Reconcile ms2, 3/3 replicas (m1,m2,m3 => ms3) [MS controller] Iteration 6, Reconcile ms3, 2/2 replicas (m4,m5🟡 <= ms1,ms2) -[MS controller] - Replicas m5 completed in place update +[MS controller] - Replicas m5 completed in-place update [MD controller] Iteration 7, Reconcile md [MD controller] - Input to rollout planner md, 6/6 replicas @@ -138,7 +138,7 @@ [MS controller] Iteration 9, Reconcile ms1, 0/0 replicas ( => ms3) [MS controller] Iteration 9, Reconcile ms2, 3/3 replicas (m1,m2,m3 => ms3) [MS controller] Iteration 9, Reconcile ms3, 3/3 replicas (m4,m5,m6🟡 <= ms2) -[MS controller] - Replicas m6 completed in place update +[MS controller] - Replicas m6 completed in-place update [MD controller] Iteration 10, Reconcile md [MD controller] - Input to rollout planner md, 6/6 replicas @@ -183,7 +183,7 @@ [MS controller] Iteration 12, Reconcile ms1, 0/0 replicas ( => ms3) [MS controller] Iteration 12, Reconcile ms2, 2/2 replicas (m2,m3 => ms3) [MS controller] Iteration 12, Reconcile ms3, 4/4 replicas (m1🟡,m4,m5,m6 <= ms2) -[MS controller] - Replicas m1 completed in place update +[MS controller] - Replicas m1 completed in-place update [MD controller] Iteration 13, Reconcile md [MD controller] - Input to rollout planner md, 6/6 replicas @@ -228,7 +228,7 @@ [MS controller] Iteration 15, Reconcile ms1, 0/0 replicas ( => ms3) [MS controller] Iteration 15, Reconcile ms2, 1/1 replicas (m3 => ms3) [MS controller] Iteration 15, Reconcile ms3, 5/5 replicas (m1,m2🟡,m4,m5,m6 <= ms2) -[MS controller] - Replicas m2 completed in place update +[MS controller] - Replicas m2 completed in-place update [MD controller] Iteration 16, Reconcile md [MD controller] - Input to rollout planner md, 6/6 replicas @@ -273,7 +273,7 @@ [MS controller] Iteration 18, Reconcile ms1, 0/0 replicas ( => ms3) [MS controller] Iteration 18, Reconcile ms2, 0/0 replicas ( => ms3) [MS controller] Iteration 18, Reconcile ms3, 6/6 replicas (m1,m2,m3🟡,m4,m5,m6 <= ms2) -[MS controller] - Replicas m3 completed in place update +[MS controller] - Replicas m3 completed in-place update [MD controller] Iteration 19, Reconcile md [MD controller] - Input to rollout planner md, 6/6 replicas diff --git a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1, random(0).test.log.golden b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1, random(0).test.log.golden index 825557a53b5d..cc0490781c93 100644 --- a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1, random(0).test.log.golden +++ b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1, random(0).test.log.golden @@ -48,7 +48,7 @@ - ms2, 1/1 replicas (m1🟡 <= ms1) [MS controller] Iteration 4, Reconcile ms1, 5/5 replicas (m2,m3,m4,m5,m6 => ms2) [MS controller] Iteration 4, Reconcile ms2, 1/1 replicas (m1🟡 <= ms1) -[MS controller] - Replicas m1 completed in place update +[MS controller] - Replicas m1 completed in-place update [MS controller] Iteration 5, Reconcile ms2, 1/1 replicas (m1 <= ms1) [MD controller] Iteration 5, Reconcile md [MD controller] - Input to rollout planner @@ -96,7 +96,7 @@ [MS controller] Iteration 10, Reconcile ms2, 2/2 replicas (m1,m2🟡 <= ms1) [MS controller] Iteration 10, Reconcile ms1, 4/4 replicas (m3,m4,m5,m6 => ms2) [MS controller] Iteration 11, Reconcile ms2, 2/2 replicas (m1,m2🟡 <= ms1) -[MS controller] - Replicas m2 completed in place update +[MS controller] - Replicas m2 completed in-place update [MD controller] Iteration 11, Reconcile md [MD controller] - Input to rollout planner md, 6/6 replicas @@ -150,7 +150,7 @@ [MS controller] Iteration 17, Reconcile ms2, 2/3 replicas (m1,m2,m3🟡 <= ms1) [MS controller] Iteration 17, Reconcile ms1, 3/3 replicas (m4,m5,m6 => ms2) [MS controller] Iteration 18, Reconcile ms2, 3/3 replicas (m1,m2,m3🟡 <= ms1) -[MS controller] - Replicas m3 completed in place update +[MS controller] - Replicas m3 completed in-place update [MD controller] Iteration 18, Reconcile md [MD controller] - Input to rollout planner md, 5/6 replicas @@ -175,7 +175,7 @@ [MS controller] Iteration 19, Reconcile ms2, 3/4 replicas (m1,m2,m3,m4🟡 <= ms1) [MS controller] Iteration 19, Reconcile ms1, 2/2 replicas (m5,m6 => ms2) [MS controller] Iteration 20, Reconcile ms2, 4/4 replicas (m1,m2,m3,m4🟡 <= ms1) -[MS controller] - Replicas m4 completed in place update +[MS controller] - Replicas m4 completed in-place update [MS controller] Iteration 20, Reconcile ms1, 2/2 replicas (m5,m6 => ms2) [MS controller] Iteration 21, Reconcile ms1, 2/2 replicas (m5,m6 => ms2) [MS controller] Iteration 21, Reconcile ms2, 4/4 replicas (m1,m2,m3,m4 <= ms1) @@ -224,7 +224,7 @@ - ms1, 1/1 replicas (m6 => ms2) - ms2, 5/5 replicas (m1,m2,m3,m4,m5🟡 <= ms1) [MS controller] Iteration 25, Reconcile ms2, 5/5 replicas (m1,m2,m3,m4,m5🟡 <= ms1) -[MS controller] - Replicas m5 completed in place update +[MS controller] - Replicas m5 completed in-place update [MS controller] Iteration 25, Reconcile ms1, 1/1 replicas (m6 => ms2) [MS controller] Iteration 25, Reconcile ms2, 5/5 replicas (m1,m2,m3,m4,m5 <= ms1) [MD controller] Iteration 26, Reconcile md @@ -290,7 +290,7 @@ - ms1, 0/0 replicas ( => ms2) - ms2, 6/6 replicas (m1,m2,m3,m4,m5,m6🟡 <= ms1) [MS controller] Iteration 31, Reconcile ms2, 6/6 replicas (m1,m2,m3,m4,m5,m6🟡 <= ms1) -[MS controller] - Replicas m6 completed in place update +[MS controller] - Replicas m6 completed in-place update [MS controller] Iteration 31, Reconcile ms1, 0/0 replicas ( => ms2) [MD controller] Iteration 32, Reconcile md [MD controller] - Input to rollout planner diff --git a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1, scale up to 12, random(0).test.log.golden b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1, scale up to 12, random(0).test.log.golden index 6650d308191e..62247b1bfc21 100644 --- a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1, scale up to 12, random(0).test.log.golden +++ b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1, scale up to 12, random(0).test.log.golden @@ -66,7 +66,7 @@ - ms1, 2/2 replicas (m5,m6 => ms2) - ms2, 10/10 replicas (m1,m2,m3,m4🟡,m7,m8,m9,m10,m11,m12 <= ms1) [MS controller] Iteration 7, Reconcile ms2, 10/10 replicas (m1,m2,m3,m4🟡,m7,m8,m9,m10,m11,m12 <= ms1) -[MS controller] - Replicas m4 completed in place update +[MS controller] - Replicas m4 completed in-place update [MD controller] Iteration 8, Reconcile md [MD controller] - Input to rollout planner md, 12/12 replicas @@ -93,7 +93,7 @@ [MS controller] Iteration 10, Reconcile ms2, 11/11 replicas (m1,m2,m3,m4,m5🟡,m7,m8,m9,m10,m11,m12 <= ms1) [MS controller] Iteration 10, Reconcile ms1, 1/1 replicas (m6 => ms2) [MS controller] Iteration 11, Reconcile ms2, 11/11 replicas (m1,m2,m3,m4,m5🟡,m7,m8,m9,m10,m11,m12 <= ms1) -[MS controller] - Replicas m5 completed in place update +[MS controller] - Replicas m5 completed in-place update [MD controller] Iteration 11, Reconcile md [MD controller] - Input to rollout planner md, 12/12 replicas @@ -147,7 +147,7 @@ [MS controller] Iteration 17, Reconcile ms2, 11/12 replicas (m1,m2,m3,m4,m5,m6🟡,m7,m8,m9,m10,m11,m12 <= ms1) [MS controller] Iteration 17, Reconcile ms1, 0/0 replicas ( => ms2) [MS controller] Iteration 18, Reconcile ms2, 12/12 replicas (m1,m2,m3,m4,m5,m6🟡,m7,m8,m9,m10,m11,m12 <= ms1) -[MS controller] - Replicas m6 completed in place update +[MS controller] - Replicas m6 completed in-place update [MD controller] Iteration 18, Reconcile md [MD controller] - Input to rollout planner md, 11/12 replicas diff --git a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1, scale up to 12.test.log.golden b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1, scale up to 12.test.log.golden index fee5d3e6e0bb..cce54d65444b 100644 --- a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1, scale up to 12.test.log.golden +++ b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1, scale up to 12.test.log.golden @@ -53,7 +53,7 @@ - ms2, 10/10 replicas (m1,m2,m3,m4🟡,m7,m8,m9,m10,m11,m12 <= ms1) [MS controller] Iteration 4, Reconcile ms1, 2/2 replicas (m5,m6 => ms2) [MS controller] Iteration 4, Reconcile ms2, 10/10 replicas (m1,m2,m3,m4🟡,m7,m8,m9,m10,m11,m12 <= ms1) -[MS controller] - Replicas m4 completed in place update +[MS controller] - Replicas m4 completed in-place update [MD controller] Iteration 5, Reconcile md [MD controller] - Input to rollout planner md, 12/12 replicas @@ -89,7 +89,7 @@ - ms2, 11/11 replicas (m1,m2,m3,m4,m5🟡,m7,m8,m9,m10,m11,m12 <= ms1) [MS controller] Iteration 7, Reconcile ms1, 1/1 replicas (m6 => ms2) [MS controller] Iteration 7, Reconcile ms2, 11/11 replicas (m1,m2,m3,m4,m5🟡,m7,m8,m9,m10,m11,m12 <= ms1) -[MS controller] - Replicas m5 completed in place update +[MS controller] - Replicas m5 completed in-place update [MD controller] Iteration 8, Reconcile md [MD controller] - Input to rollout planner md, 12/12 replicas @@ -125,7 +125,7 @@ - ms2, 12/12 replicas (m1,m2,m3,m4,m5,m6🟡,m7,m8,m9,m10,m11,m12 <= ms1) [MS controller] Iteration 10, Reconcile ms1, 0/0 replicas ( => ms2) [MS controller] Iteration 10, Reconcile ms2, 12/12 replicas (m1,m2,m3,m4,m5,m6🟡,m7,m8,m9,m10,m11,m12 <= ms1) -[MS controller] - Replicas m6 completed in place update +[MS controller] - Replicas m6 completed in-place update [MD controller] Iteration 11, Reconcile md [MD controller] - Input to rollout planner md, 12/12 replicas diff --git a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1.test.log.golden b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1.test.log.golden index 6f9f4aaec8e0..e8939839e3b3 100644 --- a/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1.test.log.golden +++ b/internal/controllers/machinedeployment/testdata/rollingupdate/in-place rollout, 6 replicas, maxsurge 3, maxunavailable 1.test.log.golden @@ -38,7 +38,7 @@ - ms2, 1/1 replicas (m1🟡 <= ms1) [MS controller] Iteration 3, Reconcile ms1, 5/5 replicas (m2,m3,m4,m5,m6 => ms2) [MS controller] Iteration 3, Reconcile ms2, 1/1 replicas (m1🟡 <= ms1) -[MS controller] - Replicas m1 completed in place update +[MS controller] - Replicas m1 completed in-place update [MD controller] Iteration 4, Reconcile md [MD controller] - Input to rollout planner md, 6/6 replicas @@ -74,7 +74,7 @@ - ms2, 2/2 replicas (m1,m2🟡 <= ms1) [MS controller] Iteration 6, Reconcile ms1, 4/4 replicas (m3,m4,m5,m6 => ms2) [MS controller] Iteration 6, Reconcile ms2, 2/2 replicas (m1,m2🟡 <= ms1) -[MS controller] - Replicas m2 completed in place update +[MS controller] - Replicas m2 completed in-place update [MD controller] Iteration 7, Reconcile md [MD controller] - Input to rollout planner md, 6/6 replicas @@ -110,7 +110,7 @@ - ms2, 3/3 replicas (m1,m2,m3🟡 <= ms1) [MS controller] Iteration 9, Reconcile ms1, 3/3 replicas (m4,m5,m6 => ms2) [MS controller] Iteration 9, Reconcile ms2, 3/3 replicas (m1,m2,m3🟡 <= ms1) -[MS controller] - Replicas m3 completed in place update +[MS controller] - Replicas m3 completed in-place update [MD controller] Iteration 10, Reconcile md [MD controller] - Input to rollout planner md, 6/6 replicas @@ -146,7 +146,7 @@ - ms2, 4/4 replicas (m1,m2,m3,m4🟡 <= ms1) [MS controller] Iteration 12, Reconcile ms1, 2/2 replicas (m5,m6 => ms2) [MS controller] Iteration 12, Reconcile ms2, 4/4 replicas (m1,m2,m3,m4🟡 <= ms1) -[MS controller] - Replicas m4 completed in place update +[MS controller] - Replicas m4 completed in-place update [MD controller] Iteration 13, Reconcile md [MD controller] - Input to rollout planner md, 6/6 replicas @@ -182,7 +182,7 @@ - ms2, 5/5 replicas (m1,m2,m3,m4,m5🟡 <= ms1) [MS controller] Iteration 15, Reconcile ms1, 1/1 replicas (m6 => ms2) [MS controller] Iteration 15, Reconcile ms2, 5/5 replicas (m1,m2,m3,m4,m5🟡 <= ms1) -[MS controller] - Replicas m5 completed in place update +[MS controller] - Replicas m5 completed in-place update [MD controller] Iteration 16, Reconcile md [MD controller] - Input to rollout planner md, 6/6 replicas @@ -218,7 +218,7 @@ - ms2, 6/6 replicas (m1,m2,m3,m4,m5,m6🟡 <= ms1) [MS controller] Iteration 18, Reconcile ms1, 0/0 replicas ( => ms2) [MS controller] Iteration 18, Reconcile ms2, 6/6 replicas (m1,m2,m3,m4,m5,m6🟡 <= ms1) -[MS controller] - Replicas m6 completed in place update +[MS controller] - Replicas m6 completed in-place update [MD controller] Iteration 19, Reconcile md [MD controller] - Input to rollout planner md, 6/6 replicas diff --git a/internal/controllers/machineset/machineset_controller.go b/internal/controllers/machineset/machineset_controller.go index 70e645446a78..cbfc066bff7d 100644 --- a/internal/controllers/machineset/machineset_controller.go +++ b/internal/controllers/machineset/machineset_controller.go @@ -357,7 +357,7 @@ func (r *Reconciler) triggerInPlaceUpdate(ctx context.Context, s *scope) (ctrl.R errs := []error{} machinesTriggeredInPlace := []*clusterv1.Machine{} for _, machine := range s.machines { - // If a machine is not updating in place, or if the in place upgrade has been already triggered, no-op + // If a machine is not updating in place, or if the in-place update has been already triggered, no-op if _, ok := machine.Annotations[clusterv1.UpdateInProgressAnnotation]; !ok || hooks.IsPending(runtimehooksv1.UpdateMachine, machine) { continue } @@ -384,7 +384,7 @@ func (r *Reconciler) triggerInPlaceUpdate(ctx context.Context, s *scope) (ctrl.R } else { // If this MachineSet is not accepting anymore machines from other MS (e.g. because of MD spec changes), // then drop the PendingAcknowledgeMove annotation; this machine will be treated as any other machine and either - // deleted or moved to another MS after completing the in-place upgrade. + // deleted or moved to another MS after completing the in-place update. delete(machine.Annotations, clusterv1.PendingAcknowledgeMoveAnnotation) } } diff --git a/internal/controllers/machineset/machineset_controller_test.go b/internal/controllers/machineset/machineset_controller_test.go index 3531ceab026d..9e4b11a7bd54 100644 --- a/internal/controllers/machineset/machineset_controller_test.go +++ b/internal/controllers/machineset/machineset_controller_test.go @@ -3213,7 +3213,7 @@ func TestMachineSetReconciler_triggerInPlaceUpdate(t *testing.T) { wantErr: false, }, { - name: "No op when in place upgrade has been already triggered", + name: "No op when in-place update has been already triggered", ms: newMachineSet("ms1", "cluster1", 2), machines: []*clusterv1.Machine{ fakeMachine("m1", withMachineAnnotations(map[string]string{clusterv1.UpdateInProgressAnnotation: "", runtimev1.PendingHooksAnnotation: "UpdateMachine"})), @@ -3221,7 +3221,7 @@ func TestMachineSetReconciler_triggerInPlaceUpdate(t *testing.T) { }, interceptorFuncs: interceptor.Funcs{ Get: func(_ context.Context, _ client.WithWatch, _ client.ObjectKey, _ client.Object, _ ...client.GetOption) error { - return errors.New("injected error performing get") // we should not perform any get if in place upgrade has been already triggered + return errors.New("injected error performing get") // we should not perform any get if in-place update has been already triggered }, }, wantMachinesNotInPlaceUpdating: nil, @@ -3490,12 +3490,12 @@ func TestMachineSetReconciler_triggerInPlaceUpdate(t *testing.T) { } res, err := r.triggerInPlaceUpdate(ctx, s) if tt.wantErr { - g.Expect(err).To(HaveOccurred(), "expected error when triggering in place update, got none") + g.Expect(err).To(HaveOccurred(), "expected error when triggering in-place update, got none") g.Expect(err.Error()).To(ContainSubstring(tt.wantErrorMessage)) } else { - g.Expect(err).ToNot(HaveOccurred(), "unexpected error when triggering in place update") + g.Expect(err).ToNot(HaveOccurred(), "unexpected error when triggering in-place update") } - g.Expect(res.IsZero()).To(BeTrue(), "unexpected non zero result when triggering in place update") + g.Expect(res.IsZero()).To(BeTrue(), "unexpected non zero result when triggering in-place update") machines := &clusterv1.MachineList{} g.Expect(fakeClient.List(ctx, machines)).ToNot(HaveOccurred(), "unexpected error when listing machines") diff --git a/internal/controllers/machineset/machineset_deletion_order.go b/internal/controllers/machineset/machineset_deletion_order.go index b1ca18db28c8..ce42ff269901 100644 --- a/internal/controllers/machineset/machineset_deletion_order.go +++ b/internal/controllers/machineset/machineset_deletion_order.go @@ -56,7 +56,7 @@ func oldestDeletionOrder(machine *clusterv1.Machine) deletePriority { return shouldDeleteFirst } // If there is machine still updating in progress and the MS is scaling down, consider this machine next - // so the system avoids to complete unnecessary in-place upgrades (drop machines not at the desired state first). + // so the system avoids to complete unnecessary in-place updates (drop machines not at the desired state first). if inplace.IsUpdateInProgress(machine) { return shouldDelete } @@ -86,7 +86,7 @@ func newestDeletionOrder(machine *clusterv1.Machine) deletePriority { return shouldDeleteFirst } // If there is machine still updating in progress and the MS is scaling down, consider this machine next - // so the system avoids to complete unnecessary in-place upgrades (drop machines not at the desired state first). + // so the system avoids to complete unnecessary in-place updates (drop machines not at the desired state first). if inplace.IsUpdateInProgress(machine) { return shouldDelete } @@ -109,7 +109,7 @@ func randomDeletionOrder(machine *clusterv1.Machine) deletePriority { return shouldDeleteFirst } // If there is machine still updating in progress and the MS is scaling down, consider this machine next - // so the system avoids to complete unnecessary in-place upgrades (drop machines not at the desired state first). + // so the system avoids to complete unnecessary in-place updates (drop machines not at the desired state first). if inplace.IsUpdateInProgress(machine) { return shouldDelete } diff --git a/internal/util/inplace/inplace.go b/internal/util/inplace/inplace.go index 94d976cacf71..178627511e08 100644 --- a/internal/util/inplace/inplace.go +++ b/internal/util/inplace/inplace.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package inplace provides utils for in place updates. +// Package inplace provides utils for in-place updates. package inplace import (