Skip to content

Commit 5cecc5a

Browse files
authored
Merge pull request #47881 from abhatt-rh/TD790
ECOPROJECT-883: Documentation for updated remediation templates
2 parents a8affbd + 5fca520 commit 5cecc5a

File tree

2 files changed

+20
-14
lines changed

2 files changed

+20
-14
lines changed

modules/eco-configuring-machine-health-check-with-self-node-remediation.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ metadata:
2828
name: selfnoderemediationtemplate-sample
2929
spec:
3030
template:
31-
spec: {}
31+
spec:
32+
remediationStrategy: ResourceDeletion <1>
3233
----
34+
<1> Specifies the remediation strategy. The default strategy is `ResourceDeletion`.
3335

3436
.. To create the `SelfNodeRemediationTemplate` CR, run the following command:
3537
+

modules/eco-self-node-remediation-operator-about.adoc

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,16 @@ or not in the namespace of the operator:
6969
[id="understanding-self-node-remediation-remediation-template-config_{context}"]
7070
== Understanding the Self Node Remediation Template configuration
7171

72-
The Self Node Remediation Operator also creates the `SelfNodeRemediationTemplate` CR with the name `self-node-remediation-default-template` in the Self Node Remediation Operator's namespace. This CR defines the remediation strategy for the nodes.
72+
The Self Node Remediation Operator also creates the `SelfNodeRemediationTemplate` Custom Resource Definition (CRD). This CRD defines the remediation strategy for the nodes. The following remediation strategies are available:
7373

74-
The default remediation strategy is `NodeDeletion` that removes the `node` object.
75-
In {product-title} 4.10, the Self Node Remediation Operator introduced a new remediation strategy called `ResourceDeletion`. The `ResourceDeletion` remediation strategy removes the pods and associated volume attachments on the node rather than the `node` object. This strategy helps to recover workloads faster.
74+
`ResourceDeletion`:: This remediation strategy removes the pods and associated volume attachments on the node rather than the node object. This strategy helps to recover workloads faster. `ResourceDeletion` is the default remediation strategy.
75+
76+
`NodeDeletion`:: This remediation strategy removes the node object.
77+
78+
The Self Node Remediation Operator creates the following `SelfNodeRemediationTemplate` CRs for each strategy:
79+
80+
* `self-node-remediation-resource-deletion-template`, which the `ResourceDeletion` remediation strategy uses
81+
* `self-node-remediation-node-deletion-template`, which the `NodeDeletion` remediation strategy uses
7682

7783
The `SelfNodeRemediationTemplate` CR resembles the following YAML file:
7884

@@ -81,15 +87,13 @@ The `SelfNodeRemediationTemplate` CR resembles the following YAML file:
8187
apiVersion: self-node-remediation.medik8s.io/v1alpha1
8288
kind: SelfNodeRemediationTemplate
8389
metadata:
84-
creationTimestamp: "2022-03-02T08:02:40Z"
85-
generation: 1
86-
name: self-node-remediation-default-template
87-
namespace: openshift-operators
88-
resourceVersion: "596469"
89-
uid: 5d29e437-c485-48fa-ba9e-0354649afd31
90-
spec:
91-
template:
90+
creationTimestamp: "2022-03-02T08:02:40Z"
91+
name: self-node-remediation-<remediation_object>-deletion-template <1>
92+
namespace: openshift-operators
9293
spec:
93-
remediationStrategy: NodeDeletion <1>
94+
template:
95+
spec:
96+
remediationStrategy: <remediation_strategy> <2>
9497
----
95-
<1> Specifies the remediation strategy. The default remediation strategy is `NodeDeletion`.
98+
<1> Specifies the type of remediation template based on the remediation strategy. Replace `<remediation_object>` with either `resource` or `node`, for example, `self-node-remediation-resource-deletion-template`.
99+
<2> Specifies the remediation strategy. The remediation strategy can either be `ResourceDeletion` or `NodeDeletion`.

0 commit comments

Comments
 (0)