Skip to content

Commit cf31baa

Browse files
committed
Fix review findings
1 parent 52c5329 commit cf31baa

File tree

3 files changed

+1
-9
lines changed

3 files changed

+1
-9
lines changed

docs/book/src/clusterctl/commands/alpha-rollout.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@ Use the `restart` sub-command to force an immediate rollout. Note that rollout r
2121
clusterctl alpha rollout restart machinedeployment/my-md-0
2222
```
2323

24-
### Undo
25-
26-
Use the `undo` sub-command to rollback to an earlier revision. For example, here the MachineDeployment `my-md-0` will be rolled back to revision number 3. If the `--to-revision` flag is omitted, the MachineDeployment will be rolled back to the revision immediately preceding the current one. If the desired revision does not exist, the undo will return an error.
27-
28-
```bash
29-
clusterctl alpha rollout undo machinedeployment/my-md-0 --to-revision=3
30-
```
31-
3224
### Pause/Resume
3325

3426
Use the `pause` sub-command to pause a Cluster API resource. The command is a NOP if the resource is already paused. Note that internally, this command sets the `Paused` field within the resource spec (e.g. MachineDeployment.Spec.Paused) to true.

docs/book/src/developer/providers/migrations/v1.10-to-v1.11.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ proposal because most of the changes described below are a consequence of the wo
129129
- The const values for `Failed` phase has been deprecated in the enum type for `status.phase` (controllers are not setting this value anymore)
130130
- The `status.phases` field is now computed using the same logic used for `ScalingUp` and `ScalingDown` conditions.
131131
- The `spec.revisionHistoryLimit` field has been removed. The MachineDeployment controller will now clean up all MachineSets without replicas.
132+
- The corresponding `machinedeployment.clusters.x-k8s.io/revision-history` annotation has also been removed.
132133

133134
### MachineSet
134135

docs/book/src/reference/api/labels-and-annotations.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
| machinedeployment.clusters.x-k8s.io/desired-replicas | It is the desired replicas for a machine deployment recorded as an annotation in its machine sets. Helps in separating scaling events from the rollout process and for determining if the new machine set for a deployment is really saturated. | Cluster API | MachineSets |
5353
| machinedeployment.clusters.x-k8s.io/max-replicas | It is the maximum replicas a deployment can have at a given point, which is machinedeployment.spec.replicas + maxSurge. Used by the underlying machine sets to estimate their proportions in case the deployment has surge replicas. | Cluster API | MachineSets |
5454
| machinedeployment.clusters.x-k8s.io/revision | It is the revision annotation of a machine deployment's machine sets which records its rollout sequence. | Cluster API | MachineSets |
55-
| machinedeployment.clusters.x-k8s.io/revision-history | It maintains the history of all old revisions that a machine set has served for a machine deployment. | Cluster API | MachineSets |
5655
| machineset.cluster.x-k8s.io/skip-preflight-checks | It can be applied on MachineDeployment and MachineSet resources to specify a comma-separated list of preflight checks that should be skipped during MachineSet reconciliation. Supported preflight checks are: All, KubeadmVersionSkew, KubernetesVersionSkew, ControlPlaneIsStable. | User | MachineDeployments, MachineSets |
5756
| pre-drain.delete.hook.machine.cluster.x-k8s.io | It specifies the prefix we search each annotation for during the pre-drain.delete lifecycle hook to pause reconciliation of deletion. These hooks will prevent removal of draining the associated node until all are removed. | User | Machines |
5857
| pre-terminate.delete.hook.machine.cluster.x-k8s.io | It specifies the prefix we search each annotation for during the pre-terminate.delete lifecycle hook to pause reconciliation of deletion. These hooks will prevent removal of an instance from an infrastructure provider until all are removed. | User | Machines |

0 commit comments

Comments
 (0)