Skip to content

Commit e8e8a8e

Browse files
authored
Merge pull request #60087 from jeana-redhat/Machine-deletion-hook-editorial-review
[OSDOCS-4789]: Editorial feedback from manual cherrypick review
2 parents 5def314 + 3acef0c commit e8e8a8e

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

machine_management/deleting-machine.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ include::modules/machine-lifecycle-hook-deletion-etcd.adoc[leveloffset=+2]
2828
[id="additional-resources_unhealthy-etcd-member"]
2929
== Additional resources
3030

31-
* xref:../backup_and_restore/control_plane_backup_and_restore/replacing-unhealthy-etcd-member.adoc[Replacing an unhealthy etcd member]
31+
* xref:../backup_and_restore/control_plane_backup_and_restore/replacing-unhealthy-etcd-member.adoc#replacing-unhealthy-etcd-member[Replacing an unhealthy etcd member]
3232
* xref:../machine_management/control_plane_machine_management/cpmso-using.adoc#cpmso-using[Managing control plane machines with control plane machine sets]

modules/machine-lifecycle-hook-deletion-format.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ metadata:
1818
spec:
1919
lifecycleHooks:
2020
preDrain:
21-
- name: <hook-name> <1>
22-
owner: <hook-owner> <2>
21+
- name: <hook_name> <1>
22+
owner: <hook_owner> <2>
2323
...
2424
----
2525
<1> The name of the `preDrain` lifecycle hook.
@@ -35,8 +35,8 @@ metadata:
3535
spec:
3636
lifecycleHooks:
3737
preTerminate:
38-
- name: <hook-name> <1>
39-
owner: <hook-owner> <2>
38+
- name: <hook_name> <1>
39+
owner: <hook_owner> <2>
4040
...
4141
----
4242
<1> The name of the `preTerminate` lifecycle hook.

modules/machine-lifecycle-hook-deletion-uses.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[id="machine-lifecycle-hook-deletion-uses_{context}"]
77
= Machine deletion lifecycle hook examples for Operator developers
88

9-
Operators can use lifecycle hooks for the machine deletion phase to modify the machine deletion process. The following examples demonstrate possible ways that an Operator can use this functionality:
9+
Operators can use lifecycle hooks for the machine deletion phase to modify the machine deletion process. The following examples demonstrate possible ways that an Operator can use this functionality.
1010

1111
[discrete]
1212
[id="machine-lifecycle-hook-deletion-uses-predrain_{context}"]

modules/machine-lifecycle-hook-deletion.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ In the context of machine deletion, the machine controller performs the followin
2727
* Delete the `Node` object.
2828
--
2929

30-
Lifecycle hook:: A defined point in the reconciliation lifecycle of an object where the normal lifecycle process can be interrupted. Components can use a lifecycle hook to inject changes into the process to accomplish a desired outcome.
30+
Lifecycle hook:: A lifecycle hook is a defined point in the reconciliation lifecycle of an object where the normal lifecycle process can be interrupted. Components can use a lifecycle hook to inject changes into the process to accomplish a desired outcome.
3131
+
3232
There are two lifecycle hooks in the machine `Deleting` phase:
3333
--
3434
* `preDrain` lifecycle hooks must be resolved before the node that is backed by the machine can be drained.
3535
* `preTerminate` lifecycle hooks must be resolved before the instance can be removed from the infrastructure provider.
3636
--
3737

38-
Hook-implementing controller:: A controller, other than the machine controller, that can interact with a lifecycle hook. A hook-implementing controller can do one or more of the following actions:
38+
Hook-implementing controller:: A hook-implementing controller is a controller, other than the machine controller, that can interact with a lifecycle hook. A hook-implementing controller can do one or more of the following actions:
3939
+
4040
--
4141
* Add a lifecycle hook.

0 commit comments

Comments
 (0)