Skip to content

Commit bca8fce

Browse files
authored
Merge pull request #96902 from mburke5678/mco-ocl-one-mosc
OSDOCS 15252 MachineOSConfig name should match MachineConfigPool
2 parents d8b38aa + 4b9fee6 commit bca8fce

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ metadata:
3030
name: layered-image
3131
spec:
3232
machineConfigPool:
33-
name: worker
33+
name: layered-image
3434
containerFile:
3535
- containerfileArch: noarch
3636
content: |- <1>

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ To apply a custom layered image to your cluster by using the on-cluster build pr
1313
* where the final image should be pushed and pulled from
1414
* the push and pull secrets to use
1515
16+
You can create only one `MachineOSConfig` CR for each machine config pool.
17+
1618
.Prerequisites
1719

1820
* You have the pull secret in the `openshift-machine-config-operator` namespace that the Machine Config Operator (MCO) needs in order to pull the base operating system image from your repository. By default, the MCO uses the cluster global pull secret, which it synchronizes into the `openshift-machine-config-operator` namespace. You can add your pull secret to the {product-title} global pull secret or you can use a different pull secret. For information on modifying the global pull secret, see "Updating the global cluster pull secret".
@@ -44,7 +46,7 @@ metadata:
4446
name: layered-image <2>
4547
spec:
4648
machineConfigPool:
47-
name: layered <3>
49+
name: layered-image <3>
4850
containerFile: # <4>
4951
- containerfileArch: NoArch <5>
5052
content: |-
@@ -61,8 +63,8 @@ spec:
6163
name: builder-dockercfg-mtcl23
6264
----
6365
<1> Specifies the `machineconfiguration.openshift.io/v1` API that is required for `MachineConfig` CRs.
64-
<2> Specifies a name for the `MachineOSConfig` object. This name is used with other [image-mode-os-on-lower] resources. The examples in this documentation use the name `layered-image`.
65-
<3> Specifies the name of the machine config pool associated with the nodes where you want to deploy the custom layered image. The examples in this documentation use the `layered` machine config pool.
66+
<2> Specifies a name for the `MachineOSConfig` object. The name must match the name of the associated machine config pool. This name is used with other {image-mode-os-on-lower} resources. The examples in this documentation use the name `layered-image`.
67+
<3> Specifies the name of the machine config pool associated with the nodes where you want to deploy the custom layered image. The examples in this documentation use the `layered-image` machine config pool.
6668
<4> Specifies the Containerfile to configure the custom layered image.
6769
<5> Specifies the architecture this containerfile is to be built for: `ARM64`, `AMD64`, `PPC64LE`, `S390X`, or `NoArch`. The default is `NoArch`, which defines a Containerfile that can be applied to any architecture.
6870
<6> Specifies the name of the image builder to use. This must be `Job`, which is a reference to the `job` object that is managing the image build.

0 commit comments

Comments
 (0)