Skip to content

Commit f591911

Browse files
spell fixes
1 parent 5e3431d commit f591911

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Diff for: enhancements/machine-config/machine-config-node.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ superseded-by:
2222

2323
<!--
2424
General TODO List:
25-
- Reference PIS enhancment (https://github.com/openshift/enhancements/blob/master/enhancements/machine-config/pin-and-pre-load-images.md) for PIS related fields
25+
- Reference PIS enhancement (https://github.com/openshift/enhancements/blob/master/enhancements/machine-config/pin-and-pre-load-images.md) for PIS related fields
2626
- Add information on node degraded field
2727
-->
2828

@@ -184,9 +184,9 @@ There are two levels of conditions in MachineConfigNode: the parent and the chil
184184

185185
<!-- TODO:
186186
- Update with what the `oc get` and `oc get .. wide` columns are updated to be; the "child" showing for the same command does not really make sense?
187-
- Decide if PIS statuses should be included in -o wide output. If not, change "will additionally reveal all parent and child phases" phrasing to highlight it does nto include PIS statuses.
187+
- Decide if PIS statuses should be included in -o wide output. If not, change "will additionally reveal all parent and child phases" phrasing to highlight it does not include PIS statuses.
188188
-->
189-
The information shown in `oc get machineconfignodes` includes the Node's name, associated MachineConfigPool, current and desired config versions, and updated status. Using `oc describe machineconfignodes -o wide` will additionally reveal all parent and child phases. Within each parent phase there can be 0+ child phases that customers can use to see upgrade progression. The upgrade flow can be seen in the following diagram and in the subsequent example ouputs.
189+
The information shown in `oc get machineconfignodes` includes the Node's name, associated MachineConfigPool, current and desired config versions, and updated status. Using `oc describe machineconfignodes -o wide` will additionally reveal all parent and child phases. Within each parent phase there can be 0+ child phases that customers can use to see upgrade progression. The upgrade flow can be seen in the following diagram and in the subsequent example outputs.
190190

191191
```mermaid
192192
block-beta
@@ -363,7 +363,7 @@ ip-10-0-65-65.ec2.internal worker rendered-worker-f77322e2feead61600f41c9
363363
ip-10-0-73-121.ec2.internal master rendered-master-6c320f722eb9ce8bfbd80750dbf70d2e rendered-master-6c320f722eb9ce8bfbd80750dbf70d2e True False False False False False False False False False False
364364
```
365365

366-
In general, a state (and its respective child states) will transition from False -> Unknown -> True -> False. The states are mostly in the past tense. This is because processes like `Drained` are primarily defined by completion, not the progress. So a user will have `UpdateExecuted` == Unknown and `Drained` == Unknown until the Drain actually completes. However, the unknown phase will be accompanied by a message for how the drain is currently going or if an error has occured with during the drain.
366+
In general, a state (and its respective child states) will transition from False -> Unknown -> True -> False. The states are mostly in the past tense. This is because processes like `Drained` are primarily defined by completion, not the progress. So a user will have `UpdateExecuted` == Unknown and `Drained` == Unknown until the Drain actually completes. However, the unknown phase will be accompanied by a message for how the drain is currently going or if an error has occurred during the drain.
367367

368368
Once Updated == True is the case, the update process is considered complete, all previous states are set to False, and the condition details will show that the message is from the previous update cycle.
369369

@@ -539,7 +539,7 @@ Also add support for the following features
539539

540540
### Upgrade / Downgrade Strategy
541541

542-
Between upgrades, this feature should not have a large impact. It will preform as it usually does and it will track node processes in both upgrades and downgrades. If a node is added or removed, the MachineConfigNode object will not report on it until the node is acknowledged by the MCO.
542+
Between upgrades, this feature should not have a large impact. It will perform as it usually does and it will track node processes in both upgrades and downgrades. If a node is added or removed, the MachineConfigNode object will not report on it until the node is acknowledged by the MCO.
543543

544544
### Version Skew Strategy
545545

@@ -575,7 +575,7 @@ Using a separate controller allows for information consolidation and furthers th
575575
- An improper actor could potentially modify information on the node such that the MachinestateController thinks an upgrade event is going on but in reality it is not.
576576
- Nothing "consumes" the MCN data type in this design. However, this is still a future concern and one that has been voiced by many teams.
577577
2) Unnecessary level of abstraction
578-
- The MCD is the source of the data so it should "own" the updating process of the MCN. This is true and fits into the idomatic processes of kubernetes. However, the goal of the MCO was to consolidate all state and metric reporting into a single location. It is a question of prioritizing data efficiency.
578+
- The MCD is the source of the data so it should "own" the updating process of the MCN. This is true and fits into the idiomatic processes of kubernetes. However, the goal of the MCO was to consolidate all state and metric reporting into a single location. It is a question of prioritizing data efficiency.
579579

580580
The summary of the two alternatives is as follows:
581581

0 commit comments

Comments
 (0)