Skip to content

Commit b4c89b1

Browse files
author
Michael Burke
committed
OSDOCS 17238 Update MCO to reflect API changes made for Status Reporting
1 parent 4a8255b commit b4c89b1

File tree

5 files changed

+76
-0
lines changed

5 files changed

+76
-0
lines changed

machine_configuration/index.adoc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@ include::modules/machine-config-drift-detection.adoc[leveloffset=+1]
4444

4545
include::modules/checking-mco-status.adoc[leveloffset=+1]
4646
include::modules/checking-mco-node-status.adoc[leveloffset=+1]
47+
48+
[role="_additional-resources"]
49+
.Additional resources
50+
51+
* xref:../machine_configuration/mco-coreos-layering.adoc#coreos-layering-configuring-on_mco-coreos-layering[About on-cluster image mode]
52+
* xref:../nodes/clusters/nodes-cluster-enabling-features.adoc#nodes-cluster-enabling[Enabling features using feature gates]
53+
4754
include::modules/checking-mco-node-status-configuring.adoc[leveloffset=+2]
4855

4956
[role="_additional-resources"]

machine_configuration/mco-coreos-layering.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@ include::modules/coreos-layering-configuring-on.adoc[leveloffset=+1]
186186
* xref:../machine_configuration/mco-coreos-layering.adoc#coreos-layering-configuring-on-rebuild_mco-coreos-layering[Rebuilding an on-cluster custom layered image]
187187
* xref:../machine_configuration/mco-coreos-layering.adoc#coreos-layering-configuring-on-revert_mco-coreos-layering[Reverting an on-cluster custom layered image]
188188
* xref:../machine_configuration/mco-coreos-layering.adoc#coreos-layering-configuring-on-modifying_mco-coreos-layering[Modifying a custom layered image]
189+
* xref:../machine_configuration/index.adoc#checking-mco-node-status_machine-config-overview[About checking machine config node status]
190+
* xref:../nodes/clusters/nodes-cluster-enabling-features.adoc#nodes-cluster-enabling[Enabling features using feature gates]
189191

190192
include::modules/coreos-layering-configuring-on-proc.adoc[leveloffset=+2]
191193

modules/checking-mco-node-status.adoc

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ The node update process consists of the following phases and subphases that are
2626
** *Uncordoned*
2727
* *Updated* The MCO completed a node update and the current config version of the node is equal to the desired updated version.
2828
* *Resumed*. The MCO restarted the config drift monitor process and the node returns to operational state.
29+
* *ImagePulledFromRegistry*. The MCO has pulled the desired custom layered image. This condition applies only to nodes on which on-cluster layering has been configured.
30+
+
31+
--
32+
:FeatureName: The `ImagePulledFromRegistry` condition
33+
include::snippets/technology-preview.adoc[]
34+
--
2935
3036
As the update moves through these phases, you can query the `MachineConfigNode` custom resource, which reports one of the following conditions for each phase:
3137

@@ -140,6 +146,7 @@ $ oc describe machineconfignode/<machine_config_node_name>
140146

141147
.Example output
142148
[source,text]
149+
----
143150
apiVersion: machineconfiguration.openshift.io/v1
144151
kind: MachineConfigNode
145152
metadata:
@@ -237,3 +244,10 @@ status:
237244
<1> The `MachineConfigNode` object name.
238245
<2> The new machine configuration. This field updates after the MCO validates the machine config in the `UPDATEPREPARED` phase, then the status adds the new configuration.
239246
<3> The current machine config on the node.
247+
248+
For clusters configured with {image-mode-os-on-lower}, the machine config node output also includes the name of the custom layered image that was applied to affected nodes.
249+
250+
include::snippets/mco-mcn-ocl-example.adoc[]
251+
252+
:FeatureName: This machine config node output
253+
include::snippets/technology-preview.adoc[]

modules/coreos-layering-configuring-on-proc.adoc

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,22 @@ layered-image-ad5a3cad36303c363cf458ab0524e7c0 False True False
178178
----
179179
<1> The `MachineOSBuild` is named in the `<MachineOSConfig_CR_name>-<hash>` format.
180180

181+
. Verify that the image has been applied to the nodes in the affected pool by running a command similar to the following:
182+
+
183+
[source,terminal]
184+
----
185+
$ oc describe machineconfignode/<machine_config_node_name>
186+
----
187+
+
188+
--
189+
include::snippets/mco-mcn-ocl-example.adoc[]
190+
--
191+
+
192+
--
193+
:FeatureName: This machine config node output
194+
include::snippets/technology-preview.adoc[]
195+
--
196+
181197
. Verify that the `MachineOSConfig` object contains a reference to the new custom layered image by running the following command:
182198
+
183199
[source,terminal]

snippets/mco-mcn-ocl-example.adoc

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Text snippet included in the following modules:
2+
//
3+
// * modules/coreos-layering-configuring-on
4+
// * modules/checking-mco-node-status
5+
6+
.Example machine config node output
7+
[source,terminal]
8+
----
9+
Name: ip-10-0-14-86.us-west-1.compute.internal
10+
API Version: machineconfiguration.openshift.io/v1
11+
Kind: MachineConfigNode
12+
# ...
13+
Spec:
14+
Config Image:
15+
Desired Image: image-registry.openshift-image-registry.svc:5000/openshift-machine-config-operator/ocb-image@sha256:b485378fd8f7963ed74f14ce64f4f1e511e1601d49302b3046b1b78a83f539e3 <1>
16+
Config Version:
17+
Desired: rendered-worker-d63c7736923b60b8b82492ae9a1eef40
18+
Node:
19+
Name: ip-10-0-14-86.us-west-1.compute.internal
20+
Pool:
21+
Name: worker
22+
# ...
23+
Status:
24+
Conditions:
25+
# ...
26+
Message: Action during update to image-registry.openshift-image-registry.svc:5000/openshift-machine-config-operator/ocb-image@sha256:b485378fd8f7963ed74f14ce64f4f1e511e1601d49302b3046b1b78a83f539e3: Successfully pulled OS image image-registry.openshift-image-registry.svc:5000/openshift-machine-config-operator/ocb-image@sha256:b485378fd8f7963ed74f14ce64f4f1e511e1601d49302b3046b1b78a83f539e3 from registry
27+
Reason: ImagePulledFromRegistry
28+
Status: False
29+
Type: ImagePulledFromRegistry
30+
# ...
31+
Config Image:
32+
Current Image: image-registry.openshift-image-registry.svc:5000/openshift-machine-config-operator/ocb-image@sha256:b485378fd8f7963ed74f14ce64f4f1e511e1601d49302b3046b1b78a83f539e3
33+
Desired Image: image-registry.openshift-image-registry.svc:5000/openshift-machine-config-operator/ocb-image@sha256:b485378fd8f7963ed74f14ce64f4f1e511e1601d49302b3046b1b78a83f539e3
34+
# ...
35+
----
36+
<1> Digested image pull spec for the new custom layered image.
37+

0 commit comments

Comments
 (0)