Skip to content

Commit 946b47f

Browse files
authored
Merge pull request #12970 from sbueringer/pr-typoes-todos
📖 Consistent spelling of in-place update, remove in-place TODOs
2 parents 2607e55 + af87a1e commit 946b47f

File tree

36 files changed

+101
-102
lines changed

36 files changed

+101
-102
lines changed

api/core/v1beta2/machineset_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const (
4343
MachineSetMoveMachinesToMachineSetAnnotation = "in-place-updates.internal.cluster.x-k8s.io/move-machines-to-machineset"
4444

4545
// MachineSetReceiveMachinesFromMachineSetsAnnotation is an internal annotation added by the MD controller to the newMS
46-
// when it should receive replicas from oldMSs as a first step of an in-place upgrade operation
46+
// when it should receive replicas from oldMSs as a first step of an in-place update operation
4747
// The annotation value is a comma separated list of oldMSs.
4848
// Note: This annotation is used in pair with MachineSetMoveMachinesToMachineSetAnnotation to perform a two-ways check before moving a machine from oldMS to newMS:
4949
//

docs/book/src/tasks/experimental-features/cluster-class/change-clusterclass.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,17 +146,17 @@ underlying objects like control plane and MachineDeployment act in the same way
146146

147147
| Changed field | Effects on Clusters |
148148
|---------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
149-
| infrastructure.ref | Corresponding InfrastructureCluster objects are updated (in place update). |
150-
| controlPlane.metadata | If labels/annotations are added, changed or deleted the ControlPlane objects are updated (in place update).<br /><br /> In case of KCP, corresponding controlPlane Machines, KubeadmConfigs and InfrastructureMachines are updated in-place. |
151-
| controlPlane.ref | Corresponding ControlPlane objects are updated (in place update). <br /> If updating ControlPlane objects implies changes in the spec, the corresponding ControlPlane Machines are updated accordingly (rollout). |
152-
| controlPlane.machineInfrastructure.ref | If the referenced template has changes only in metadata labels or annotations, the corresponding InfrastructureMachineTemplates are updated (in place update). <br /> <br />If the referenced template has changes in the spec:<br /> - Corresponding InfrastructureMachineTemplate are rotated (create new, delete old)<br /> - Corresponding ControlPlane objects are updated with the reference to the newly created template (in place update)<br /> - The corresponding controlPlane Machines are updated accordingly (rollout). |
149+
| infrastructure.ref | Corresponding InfrastructureCluster objects are updated (in-place update). |
150+
| controlPlane.metadata | If labels/annotations are added, changed or deleted the ControlPlane objects are updated (in-place update).<br /><br /> In case of KCP, corresponding controlPlane Machines, KubeadmConfigs and InfrastructureMachines are updated in-place. |
151+
| controlPlane.ref | Corresponding ControlPlane objects are updated (in-place update). <br /> If updating ControlPlane objects implies changes in the spec, the corresponding ControlPlane Machines are updated accordingly (rollout). |
152+
| controlPlane.machineInfrastructure.ref | If the referenced template has changes only in metadata labels or annotations, the corresponding InfrastructureMachineTemplates are updated (in-place update). <br /> <br />If the referenced template has changes in the spec:<br /> - Corresponding InfrastructureMachineTemplate are rotated (create new, delete old)<br /> - Corresponding ControlPlane objects are updated with the reference to the newly created template (in-place update)<br /> - The corresponding controlPlane Machines are updated accordingly (rollout). |
153153
| controlPlane.nodeDrainTimeout | If the value is changed the ControlPlane object is updated in-place.<br/> <br/> In case of KCP, the change is propagated in-place to control plane Machines. |
154154
| controlPlane.nodeVolumeDetachTimeout | If the value is changed the ControlPlane object is updated in-place.<br/> <br/> In case of KCP, the change is propagated in-place to control plane Machines. |
155155
| controlPlane.nodeDeletionTimeout | If the value is changed the ControlPlane object is updated in-place.<br/> <br/> In case of KCP, the change is propagated in-place to control plane Machines. |
156156
| workers.machineDeployments | If a new MachineDeploymentClass is added, no changes are triggered to the Clusters. <br />If an existing MachineDeploymentClass is changed, effect depends on the type of change (see below). |
157-
| 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). |
158-
| 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).<br /> <br />If the referenced template has changes in the spec:<br /> - Corresponding BootstrapTemplate are rotated (create new, delete old). <br /> - Corresponding MachineDeployments objects are updated with the reference to the newly created template (in place update). <br /> - The corresponding worker machines are updated accordingly (rollout) |
159-
| 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). <br /> <br />If the referenced template has changes in the spec:<br /> - Corresponding InfrastructureMachineTemplate are rotated (create new, delete old).<br /> - Corresponding MachineDeployments objects are updated with the reference to the newly created template (in place update). <br /> - The corresponding worker Machines are updated accordingly (rollout) |
157+
| 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). |
158+
| 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).<br /> <br />If the referenced template has changes in the spec:<br /> - Corresponding BootstrapTemplate are rotated (create new, delete old). <br /> - Corresponding MachineDeployments objects are updated with the reference to the newly created template (in-place update). <br /> - The corresponding worker machines are updated accordingly (rollout) |
159+
| 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). <br /> <br />If the referenced template has changes in the spec:<br /> - Corresponding InfrastructureMachineTemplate are rotated (create new, delete old).<br /> - Corresponding MachineDeployments objects are updated with the reference to the newly created template (in-place update). <br /> - The corresponding worker Machines are updated accordingly (rollout) |
160160
| workers.machineDeployments[].template.nodeDrainTimeout | If the value is changed the MachineDeployment is updated in-place.<br/> <br/> The change is propagated in-place to the MachineDeployment Machine. |
161161
| workers.machineDeployments[].template.nodeVolumeDetachTimeout | If the value is changed the MachineDeployment is updated in-place.<br/> <br/> The change is propagated in-place to the MachineDeployment Machine. |
162162
| workers.machineDeployments[].template.nodeDeletionTimeout | If the value is changed the MachineDeployment is updated in-place.<br/> <br/> The change is propagated in-place to the MachineDeployment Machine. |

docs/book/src/user/concepts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ A "Machine" is the declarative spec for an infrastructure component hosting a Ku
4949

5050
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.
5151

52-
#### Machine Immutability (In-place Upgrade vs. Replace)
52+
#### Machine Immutability (In-place Update vs. Replace)
5353

5454
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.
5555

docs/proposals/20181121-machine-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ One simplification that might be controversial in this proposal is the lack of
7070
API control over "in-place" versus "replace" reconciliation strategies. For
7171
instance, if a Machine's spec is updated with a different version of kubelet
7272
than is actually running, it is up to the provider-specific controller whether
73-
the request would best be fulfilled by performing an in-place upgrade on the
73+
the request would best be fulfilled by performing an in-place update on the
7474
Node, or by deleting the Node and creating a new one in its place (or reporting
7575
an error if this particular update is not supported). One can force a Node
7676
replacement by deleting and recreating the Machine object rather than updating

docs/proposals/20240807-in-place-updates-implementation-notes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ into the proposal or into the user-facing documentation for this feature.
2323
- Old MS is instructed to move machines to the newMS, and newMS is informed to receive machines from oldMS.
2424
- MS controller manages a subset of Machines
2525
- When scaling down the old MS, if required to move, MS controller is responsible for moving a Machine to newMS
26-
- When reconciling the new MachineSet, the MS controller takes ownership of the moved machine and begins the actual in-place upgrade.
26+
- When reconciling the new MachineSet, the MS controller takes ownership of the moved machine and begins the actual in-place update.
2727

28-
- Orchestration of in-place upgrades between MD controller, MS controller, and Machine controller is implemented using annotations.
28+
- Orchestration of in-place updates between MD controller, MS controller, and Machine controller is implemented using annotations.
2929
Following schemas provide an overview of how new annotations are used.
3030

3131
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
7474
MD Controller->>MS2 (NewMS): Scale up to acknowledge receipt of M1<br/>Apply annotation ".../acknowledged-move": "M1"
7575
```
7676

77-
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.
77+
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.
7878

7979
```mermaid
8080
sequenceDiagram

docs/proposals/20240807-in-place-updates.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ __In-place Update__: any change to a Machine spec, including the Kubernetes Vers
7878

7979
__Update Lifecycle Hook__: CAPI Lifecycle Runtime Hook to invoke external update extensions.
8080

81-
__Update Extension__: Runtime Extension (Implementation) is a component responsible to perform in place updates when the `External Update Lifecycle Hook` is invoked.
81+
__Update Extension__: Runtime Extension (Implementation) is a component responsible to perform in-place updates when the `External Update Lifecycle Hook` is invoked.
8282

8383
## Summary
8484

@@ -114,9 +114,9 @@ With the implementation of an Update extension, users can take ownership of the
114114

115115
### Divide and conquer
116116

117-
Considering the complexity of this topic, a phased approach is required to design and implement the solution for in-place upgrades.
117+
Considering the complexity of this topic, a phased approach is required to design and implement the solution for in-place updates.
118118

119-
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.
119+
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.
120120

121121
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.
122122

@@ -172,7 +172,7 @@ As a cluster operator, I want to perform in-place updates on my Kubernetes clust
172172

173173
#### Story 2
174174

175-
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.
175+
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.
176176

177177
#### Story 3
178178
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.

0 commit comments

Comments
 (0)