Skip to content

Commit 9d44d1a

Browse files
committed
updates to documentation
1 parent 6aec27b commit 9d44d1a

10 files changed

+18
-19
lines changed

machineconfiguration/v1/tests/machineconfignodes.machineconfiguration.openshift.io/ImageModeStatusReporting.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,4 +185,3 @@ tests:
185185
configImage:
186186
currentImage: image-registry.openshift-image-registry.svc:5000/openshift-machine-config-operator/ocb-image@sha256:c47856f56e1fdb7c9d10a1658e4ea85fbea44d71fb0e82898d152b47e0f894c6
187187
desiredImage: image-registry.openshift-image-registry.svc:5000/openshift-machine-config-operator/ocb-image@sha256:7a539f562d8d5d3b6bd7338ac014e34dabc9626cf344d30e412ef98a55cc1bf6
188-

machineconfiguration/v1/types_machineconfignode.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ type MachineConfigNodeSpec struct {
9999
// +required
100100
ConfigVersion MachineConfigNodeSpecMachineConfigVersion `json:"configVersion"`
101101

102-
// configImage is an optional field for configuring the image in the referenced node.
102+
// configImage is an optional field for configuring the OS image to be used for this node. This field will only exist if the node belongs to a pool opted into on-cluster image builds, and will override any MachineConfig referenced OSImageURL fields
103103
// When omitted, Image Mode is not be enabled and the node will follow the standard update process of creating a rendered MachineConfig and updating to its specifications.
104104
// When specified, Image Mode is enabled and will attempt to update the node to use the desired image. Following this, the node will follow the standard update process of creating a rendered MachineConfig and updating to its specifications.
105105
// +openshift:enable:FeatureGate=ImageModeStatusReporting
@@ -129,7 +129,7 @@ type MachineConfigNodeStatus struct {
129129
// configVersion describes the current and desired machine config version for this node.
130130
// +optional
131131
ConfigVersion *MachineConfigNodeStatusMachineConfigVersion `json:"configVersion,omitempty"`
132-
// configImage is an optional field that reflects the current state of the image used by the node.
132+
// configImage is an optional field for configuring the OS image to be used for this node. This field will only exist if the node belongs to a pool opted into on-cluster image builds, and will override any MachineConfig referenced OSImageURL fields.
133133
// When omitted, this means that the Image Mode feature is not being used and the node will be up to date with the specific current rendered config version for the nodes MachinePool.
134134
// When specified, the Image Mode feature is enabled and the contents of this field show the observed state of the node image.
135135
// When Image Mode is enabled and a new MachineConfig is applied such that a new OS image build is not created, only the configVersion field will change.

machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-CustomNoUpgrade.crd.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ spec:
101101
properties:
102102
configImage:
103103
description: |-
104-
configImage is an optional field for configuring the image in the referenced node.
104+
configImage is an optional field for configuring the OS image to be used for this node. This field will only exist if the node belongs to a pool opted into on-cluster image builds, and will override any MachineConfig referenced OSImageURL fields
105105
When omitted, Image Mode is not be enabled and the node will follow the standard update process of creating a rendered MachineConfig and updating to its specifications.
106106
When specified, Image Mode is enabled and will attempt to update the node to use the desired image. Following this, the node will follow the standard update process of creating a rendered MachineConfig and updating to its specifications.
107107
properties:
@@ -269,7 +269,7 @@ spec:
269269
x-kubernetes-list-type: map
270270
configImage:
271271
description: |-
272-
configImage is an optional field that reflects the current state of the image used by the node.
272+
configImage is an optional field for configuring the OS image to be used for this node. This field will only exist if the node belongs to a pool opted into on-cluster image builds, and will override any MachineConfig referenced OSImageURL fields
273273
When omitted, this means that the Image Mode feature is not being used and the node will be up to date with the specific current rendered config version for the nodes MachinePool.
274274
When specified, the Image Mode feature is enabled and the contents of this field show the observed state of the node image.
275275
When Image Mode is enabled and a new MachineConfig is applied such that a new OS image build is not created, only the configVersion field will change.

machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-DevPreviewNoUpgrade.crd.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ spec:
101101
properties:
102102
configImage:
103103
description: |-
104-
configImage is an optional field for configuring the image in the referenced node.
104+
configImage is an optional field for configuring the OS image to be used for this node. This field will only exist if the node belongs to a pool opted into on-cluster image builds, and will override any MachineConfig referenced OSImageURL fields
105105
When omitted, Image Mode is not be enabled and the node will follow the standard update process of creating a rendered MachineConfig and updating to its specifications.
106106
When specified, Image Mode is enabled and will attempt to update the node to use the desired image. Following this, the node will follow the standard update process of creating a rendered MachineConfig and updating to its specifications.
107107
properties:
@@ -269,7 +269,7 @@ spec:
269269
x-kubernetes-list-type: map
270270
configImage:
271271
description: |-
272-
configImage is an optional field that reflects the current state of the image used by the node.
272+
configImage is an optional field for configuring the OS image to be used for this node. This field will only exist if the node belongs to a pool opted into on-cluster image builds, and will override any MachineConfig referenced OSImageURL fields
273273
When omitted, this means that the Image Mode feature is not being used and the node will be up to date with the specific current rendered config version for the nodes MachinePool.
274274
When specified, the Image Mode feature is enabled and the contents of this field show the observed state of the node image.
275275
When Image Mode is enabled and a new MachineConfig is applied such that a new OS image build is not created, only the configVersion field will change.

machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ spec:
101101
properties:
102102
configImage:
103103
description: |-
104-
configImage is an optional field for configuring the image in the referenced node.
104+
configImage is an optional field for configuring the OS image to be used for this node. This field will only exist if the node belongs to a pool opted into on-cluster image builds, and will override any MachineConfig referenced OSImageURL fields
105105
When omitted, Image Mode is not be enabled and the node will follow the standard update process of creating a rendered MachineConfig and updating to its specifications.
106106
When specified, Image Mode is enabled and will attempt to update the node to use the desired image. Following this, the node will follow the standard update process of creating a rendered MachineConfig and updating to its specifications.
107107
properties:
@@ -269,7 +269,7 @@ spec:
269269
x-kubernetes-list-type: map
270270
configImage:
271271
description: |-
272-
configImage is an optional field that reflects the current state of the image used by the node.
272+
configImage is an optional field for configuring the OS image to be used for this node. This field will only exist if the node belongs to a pool opted into on-cluster image builds, and will override any MachineConfig referenced OSImageURL fields
273273
When omitted, this means that the Image Mode feature is not being used and the node will be up to date with the specific current rendered config version for the nodes MachinePool.
274274
When specified, the Image Mode feature is enabled and the contents of this field show the observed state of the node image.
275275
When Image Mode is enabled and a new MachineConfig is applied such that a new OS image build is not created, only the configVersion field will change.

machineconfiguration/v1/zz_generated.featuregated-crd-manifests/machineconfignodes.machineconfiguration.openshift.io/ImageModeStatusReporting.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ spec:
101101
properties:
102102
configImage:
103103
description: |-
104-
configImage is an optional field for configuring the image in the referenced node.
104+
configImage is an optional field for configuring the OS image to be used for this node. This field will only exist if the node belongs to a pool opted into on-cluster image builds, and will override any MachineConfig referenced OSImageURL fields
105105
When omitted, Image Mode is not be enabled and the node will follow the standard update process of creating a rendered MachineConfig and updating to its specifications.
106106
When specified, Image Mode is enabled and will attempt to update the node to use the desired image. Following this, the node will follow the standard update process of creating a rendered MachineConfig and updating to its specifications.
107107
properties:
@@ -269,7 +269,7 @@ spec:
269269
x-kubernetes-list-type: map
270270
configImage:
271271
description: |-
272-
configImage is an optional field that reflects the current state of the image used by the node.
272+
configImage is an optional field for configuring the OS image to be used for this node. This field will only exist if the node belongs to a pool opted into on-cluster image builds, and will override any MachineConfig referenced OSImageURL fields
273273
When omitted, this means that the Image Mode feature is not being used and the node will be up to date with the specific current rendered config version for the nodes MachinePool.
274274
When specified, the Image Mode feature is enabled and the contents of this field show the observed state of the node image.
275275
When Image Mode is enabled and a new MachineConfig is applied such that a new OS image build is not created, only the configVersion field will change.

machineconfiguration/v1/zz_generated.swagger_doc_generated.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-CustomNoUpgrade.crd.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ spec:
101101
properties:
102102
configImage:
103103
description: |-
104-
configImage is an optional field for configuring the image in the referenced node.
104+
configImage is an optional field for configuring the OS image to be used for this node. This field will only exist if the node belongs to a pool opted into on-cluster image builds, and will override any MachineConfig referenced OSImageURL fields
105105
When omitted, Image Mode is not be enabled and the node will follow the standard update process of creating a rendered MachineConfig and updating to its specifications.
106106
When specified, Image Mode is enabled and will attempt to update the node to use the desired image. Following this, the node will follow the standard update process of creating a rendered MachineConfig and updating to its specifications.
107107
properties:
@@ -269,7 +269,7 @@ spec:
269269
x-kubernetes-list-type: map
270270
configImage:
271271
description: |-
272-
configImage is an optional field that reflects the current state of the image used by the node.
272+
configImage is an optional field for configuring the OS image to be used for this node. This field will only exist if the node belongs to a pool opted into on-cluster image builds, and will override any MachineConfig referenced OSImageURL fields
273273
When omitted, this means that the Image Mode feature is not being used and the node will be up to date with the specific current rendered config version for the nodes MachinePool.
274274
When specified, the Image Mode feature is enabled and the contents of this field show the observed state of the node image.
275275
When Image Mode is enabled and a new MachineConfig is applied such that a new OS image build is not created, only the configVersion field will change.

payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-DevPreviewNoUpgrade.crd.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ spec:
101101
properties:
102102
configImage:
103103
description: |-
104-
configImage is an optional field for configuring the image in the referenced node.
104+
configImage is an optional field for configuring the OS image to be used for this node. This field will only exist if the node belongs to a pool opted into on-cluster image builds, and will override any MachineConfig referenced OSImageURL fields
105105
When omitted, Image Mode is not be enabled and the node will follow the standard update process of creating a rendered MachineConfig and updating to its specifications.
106106
When specified, Image Mode is enabled and will attempt to update the node to use the desired image. Following this, the node will follow the standard update process of creating a rendered MachineConfig and updating to its specifications.
107107
properties:
@@ -269,7 +269,7 @@ spec:
269269
x-kubernetes-list-type: map
270270
configImage:
271271
description: |-
272-
configImage is an optional field that reflects the current state of the image used by the node.
272+
configImage is an optional field for configuring the OS image to be used for this node. This field will only exist if the node belongs to a pool opted into on-cluster image builds, and will override any MachineConfig referenced OSImageURL fields
273273
When omitted, this means that the Image Mode feature is not being used and the node will be up to date with the specific current rendered config version for the nodes MachinePool.
274274
When specified, the Image Mode feature is enabled and the contents of this field show the observed state of the node image.
275275
When Image Mode is enabled and a new MachineConfig is applied such that a new OS image build is not created, only the configVersion field will change.

0 commit comments

Comments
 (0)