Skip to content

Conversation

isabella-janssen
Copy link
Member

@isabella-janssen isabella-janssen commented Sep 12, 2025

TODO:

  • Make sure updated flips on config image anno update
  • Make sure image pull condition shows in default condition list (if wanted)
  • Check on OCL disable clearing desired image
  • Check on TODO comments
  • On OCL enable make sure desired anno does not get get set to not yet set
  • Make sure current image is removed on OCL disable
  • Update the Action during update to rendered-worker-xyz to instead include the reference to the image anno update if its a layered image update.
  • Make sure desired image is removed from spec immediately
  • Question: ImagePulledFromRegistry is not removed on OCL disable currently. Do we want to remove it when OCL is disabled or keep it for history?

- Authors

- What I did

  1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.
$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor
  1. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.
    • Spec.ConfigImage.DesiredImage
    • Status.ConfigImage.CurrentImage
    • Status.ConfigImage.DesiredImage
    • Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

  1. Launch a 4.21 techpreview cluster with this PR included.
launch 4.21,openshift/machine-config-operator#5282 aws,techpreview
  1. Enable On Cluster Image Mode.
$ oc create -f - << EOF           
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineOSConfig
metadata:
  name: worker
spec:
  machineConfigPool:
    name: worker
  imageBuilder:
    imageBuilderType: Job
  renderedImagePushSecret:
    name: $(oc get -n openshift-machine-config-operator sa builder -ojsonpath='{.secrets[0].name}')
  renderedImagePushSpec: "image-registry.openshift-image-registry.svc:5000/openshift-machine-config-operator/ocb-image:latest"
EOF
  1. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.
    • The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB enablement.
    • The new MCN fields should be correctly populated.
      • During the OCB rollout, the desired image annotation should be set at the beginning of the node update before the current image annotation is set.
      • Once OCB is fully enabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be set appropriately.
  2. Disable On Cluster Image Mode.
oc delete machineosconfig/worker
  1. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.
    • The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB disabling process.
    • The new MCN fields should be correctly populated.
      • During the OCB disabling, the desired image annotation should be removed at the beginning of the node update before the current image annotation is removed.
      • Once OCB is fully disabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be removed in both the MCN Spec and Status.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 12, 2025
Copy link
Contributor

openshift-ci bot commented Sep 12, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

Copy link
Contributor

openshift-ci bot commented Sep 12, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: isabella-janssen

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 12, 2025
@isabella-janssen isabella-janssen changed the title bump(api): update api dependency to commit 2acafd4 MCO-1713: Update MCN flow to include image mode specific fields Sep 12, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 12, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 12, 2025

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

- What I did

  1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.
$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor
  1. Update MCN flows to add new image-mode specific fields.
  • Spec.ConfigImage.DesiredImage
  • Status.ConfigImage.CurrentImage
  • Status.ConfigImage.DesiredImage
  • Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

- Description for the changelog

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 12, 2025

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in #5177.

- What I did

  1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.
$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor
  1. Update MCN flows to add new image-mode specific fields.
  • Spec.ConfigImage.DesiredImage
  • Status.ConfigImage.CurrentImage
  • Status.ConfigImage.DesiredImage
  • Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

- Description for the changelog

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 12, 2025

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in #5177.

- What I did

  1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.
$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor
    • Assisted by cursor * Update MCN flows to add new image-mode specific fields.
  • Spec.ConfigImage.DesiredImage
  • Status.ConfigImage.CurrentImage
  • Status.ConfigImage.DesiredImage
  • Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

- Description for the changelog

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 12, 2025

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in #5177.

- What I did

  1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.
$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor
  1. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.
  • Spec.ConfigImage.DesiredImage
  • Status.ConfigImage.CurrentImage
  • Status.ConfigImage.DesiredImage
  • Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

- Description for the changelog

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 24, 2025

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in #5177.

- What I did

  1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.
$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor
  1. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.
  • Spec.ConfigImage.DesiredImage
  • Status.ConfigImage.CurrentImage
  • Status.ConfigImage.DesiredImage
  • Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

  1. Launch a 4.21 techpreview cluster with this PR included.
  2. Enable On Cluster Image Mode.
  3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

1 similar comment
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 24, 2025

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in #5177.

- What I did

  1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.
$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor
  1. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.
  • Spec.ConfigImage.DesiredImage
  • Status.ConfigImage.CurrentImage
  • Status.ConfigImage.DesiredImage
  • Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

  1. Launch a 4.21 techpreview cluster with this PR included.
  2. Enable On Cluster Image Mode.
  3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@isabella-janssen isabella-janssen changed the title MCO-1713: Update MCN flow to include image mode specific fields MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields Sep 24, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 25, 2025

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

TODO:

  • Make sure updated flips on config image anno update
  • Make sure image pull condition shows in default condition list (if wanted)
  • Check on OCL disable clearing desired image
  • Check on TODO comments

Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in #5177.

- What I did

  1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.
$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor
  1. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.
  • Spec.ConfigImage.DesiredImage
  • Status.ConfigImage.CurrentImage
  • Status.ConfigImage.DesiredImage
  • Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

  1. Launch a 4.21 techpreview cluster with this PR included.
  2. Enable On Cluster Image Mode.
  3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 25, 2025

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

TODO:

  • Make sure updated flips on config image anno update
  • Make sure image pull condition shows in default condition list (if wanted)
  • Check on OCL disable clearing desired image
  • Check on TODO comments
  • On OCL enable make sure desired anno does not get get set to not yet set

Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in #5177.

- What I did

  1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.
$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor
  1. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.
  • Spec.ConfigImage.DesiredImage
  • Status.ConfigImage.CurrentImage
  • Status.ConfigImage.DesiredImage
  • Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

  1. Launch a 4.21 techpreview cluster with this PR included.
  2. Enable On Cluster Image Mode.
  3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 25, 2025

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

TODO:

  • Make sure updated flips on config image anno update
  • Make sure image pull condition shows in default condition list (if wanted)
  • Check on OCL disable clearing desired image
  • Check on TODO comments
  • On OCL enable make sure desired anno does not get get set to not yet set
  • Make sure current image is removed on OCL disable

Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in #5177.

- What I did

  1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.
$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor
  1. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.
  • Spec.ConfigImage.DesiredImage
  • Status.ConfigImage.CurrentImage
  • Status.ConfigImage.DesiredImage
  • Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

  1. Launch a 4.21 techpreview cluster with this PR included.
  2. Enable On Cluster Image Mode.
  3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 25, 2025

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

TODO:

  • Make sure updated flips on config image anno update
  • Make sure image pull condition shows in default condition list (if wanted)
  • Check on OCL disable clearing desired image
  • Check on TODO comments
  • On OCL enable make sure desired anno does not get get set to not yet set
  • Make sure current image is removed on OCL disable
  • Update the Action during update to rendered-worker-xyz to instead include the reference to the image anno update if its a layered image update.

Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in #5177.

- What I did

  1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.
$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor
  1. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.
  • Spec.ConfigImage.DesiredImage
  • Status.ConfigImage.CurrentImage
  • Status.ConfigImage.DesiredImage
  • Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

  1. Launch a 4.21 techpreview cluster with this PR included.
  2. Enable On Cluster Image Mode.
  3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 25, 2025

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

TODO:

  • Make sure updated flips on config image anno update
  • Make sure image pull condition shows in default condition list (if wanted)
  • Check on OCL disable clearing desired image
  • Check on TODO comments
  • On OCL enable make sure desired anno does not get get set to not yet set
  • Make sure current image is removed on OCL disable
  • Update the Action during update to rendered-worker-xyz to instead include the reference to the image anno update if its a layered image update.

- Authors

- What I did

  1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.
$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor
  1. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.
  • Spec.ConfigImage.DesiredImage
  • Status.ConfigImage.CurrentImage
  • Status.ConfigImage.DesiredImage
  • Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

  1. Launch a 4.21 techpreview cluster with this PR included.
  2. Enable On Cluster Image Mode.
  3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 25, 2025

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

TODO:

  • Make sure updated flips on config image anno update
  • Make sure image pull condition shows in default condition list (if wanted)
  • Check on OCL disable clearing desired image
  • Check on TODO comments
  • On OCL enable make sure desired anno does not get get set to not yet set
  • Make sure current image is removed on OCL disable
  • Update the Action during update to rendered-worker-xyz to instead include the reference to the image anno update if its a layered image update.

- Authors

- What I did

  1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.
$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor
  1. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.
  • Spec.ConfigImage.DesiredImage
  • Status.ConfigImage.CurrentImage
  • Status.ConfigImage.DesiredImage
  • Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

  1. Launch a 4.21 techpreview cluster with this PR included.
  2. Enable On Cluster Image Mode.
  3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 26, 2025

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

TODO:

  • Make sure updated flips on config image anno update
  • Make sure image pull condition shows in default condition list (if wanted)
  • Check on OCL disable clearing desired image
  • Check on TODO comments
  • On OCL enable make sure desired anno does not get get set to not yet set
  • Make sure current image is removed on OCL disable
  • Update the Action during update to rendered-worker-xyz to instead include the reference to the image anno update if its a layered image update.

- Authors

- What I did

  1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.
$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor
  1. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.
  • Spec.ConfigImage.DesiredImage
  • Status.ConfigImage.CurrentImage
  • Status.ConfigImage.DesiredImage
  • Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

  1. Launch a 4.21 techpreview cluster with this PR included.
launch 4.21,openshift/machine-config-operator#5282 aws,techpreview
  1. Enable On Cluster Image Mode.
$ oc create -f - << EOF           
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineOSConfig
metadata:
 name: worker
spec:
 machineConfigPool:
   name: worker
 imageBuilder:
   imageBuilderType: Job
 renderedImagePushSecret:
   name: $(oc get -n openshift-machine-config-operator sa builder -ojsonpath='{.secrets[0].name}')
 renderedImagePushSpec: "image-registry.openshift-image-registry.svc:5000/openshift-machine-config-operator/ocb-image:latest"
EOF
  1. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.
  • The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB enablement.
  • The new MCN fields should be correctly populated.
    • During the OCB rollout, the desired image annotation should be set at the beginning of the node update before the current image annotation is set.
    • Once OCB is fully enabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be set appropriately.
  1. Disable On Cluster Image Mode.
oc delete machineosconfig/worker
  1. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.
  • The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB disabling process.
  • The new MCN fields should be correctly populated.
    • During the OCB disabling, the desired image annotation should be removed at the beginning of the node update before the current image annotation is removed.
    • Once OCB is fully disabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be removed in both the MCN Spec and Status.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

…ate flow to include image mode status reporting fields
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 29, 2025

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

TODO:

  • Make sure updated flips on config image anno update
  • Make sure image pull condition shows in default condition list (if wanted)
  • Check on OCL disable clearing desired image
  • Check on TODO comments
  • On OCL enable make sure desired anno does not get get set to not yet set
  • Make sure current image is removed on OCL disable
  • Update the Action during update to rendered-worker-xyz to instead include the reference to the image anno update if its a layered image update.
  • Make sure desired image is removed from spec immediately

- Authors

- What I did

  1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.
$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor
  1. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.
  • Spec.ConfigImage.DesiredImage
  • Status.ConfigImage.CurrentImage
  • Status.ConfigImage.DesiredImage
  • Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

  1. Launch a 4.21 techpreview cluster with this PR included.
launch 4.21,openshift/machine-config-operator#5282 aws,techpreview
  1. Enable On Cluster Image Mode.
$ oc create -f - << EOF           
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineOSConfig
metadata:
 name: worker
spec:
 machineConfigPool:
   name: worker
 imageBuilder:
   imageBuilderType: Job
 renderedImagePushSecret:
   name: $(oc get -n openshift-machine-config-operator sa builder -ojsonpath='{.secrets[0].name}')
 renderedImagePushSpec: "image-registry.openshift-image-registry.svc:5000/openshift-machine-config-operator/ocb-image:latest"
EOF
  1. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.
  • The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB enablement.
  • The new MCN fields should be correctly populated.
    • During the OCB rollout, the desired image annotation should be set at the beginning of the node update before the current image annotation is set.
    • Once OCB is fully enabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be set appropriately.
  1. Disable On Cluster Image Mode.
oc delete machineosconfig/worker
  1. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.
  • The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB disabling process.
  • The new MCN fields should be correctly populated.
    • During the OCB disabling, the desired image annotation should be removed at the beginning of the node update before the current image annotation is removed.
    • Once OCB is fully disabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be removed in both the MCN Spec and Status.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@isabella-janssen
Copy link
Member Author

/payload-job periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-1of3 periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-2of3 periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-3of3 payload-job periodic-ci-openshift-release-master-ci-4.21-e2e-gcp-ovn-techpreview-serial

Copy link
Contributor

openshift-ci bot commented Sep 29, 2025

@isabella-janssen: trigger 4 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-1of3
  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-2of3
  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-3of3
  • periodic-ci-openshift-release-master-ci-4.21-e2e-gcp-ovn-techpreview-serial

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/6020a8e0-9d6b-11f0-88e9-55df9f5437a6-0

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 30, 2025

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

TODO:

  • Make sure updated flips on config image anno update
  • Make sure image pull condition shows in default condition list (if wanted)
  • Check on OCL disable clearing desired image
  • Check on TODO comments
  • On OCL enable make sure desired anno does not get get set to not yet set
  • Make sure current image is removed on OCL disable
  • Update the Action during update to rendered-worker-xyz to instead include the reference to the image anno update if its a layered image update.
  • Make sure desired image is removed from spec immediately
  • Question: ImagePulledFromRegistry is not removed on OCL disable currently. Do we want to remove it when OCL is disabled or keep it for history?

- Authors

- What I did

  1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.
$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor
  1. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.
  • Spec.ConfigImage.DesiredImage
  • Status.ConfigImage.CurrentImage
  • Status.ConfigImage.DesiredImage
  • Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

  1. Launch a 4.21 techpreview cluster with this PR included.
launch 4.21,openshift/machine-config-operator#5282 aws,techpreview
  1. Enable On Cluster Image Mode.
$ oc create -f - << EOF           
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineOSConfig
metadata:
 name: worker
spec:
 machineConfigPool:
   name: worker
 imageBuilder:
   imageBuilderType: Job
 renderedImagePushSecret:
   name: $(oc get -n openshift-machine-config-operator sa builder -ojsonpath='{.secrets[0].name}')
 renderedImagePushSpec: "image-registry.openshift-image-registry.svc:5000/openshift-machine-config-operator/ocb-image:latest"
EOF
  1. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.
  • The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB enablement.
  • The new MCN fields should be correctly populated.
    • During the OCB rollout, the desired image annotation should be set at the beginning of the node update before the current image annotation is set.
    • Once OCB is fully enabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be set appropriately.
  1. Disable On Cluster Image Mode.
oc delete machineosconfig/worker
  1. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.
  • The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB disabling process.
  • The new MCN fields should be correctly populated.
    • During the OCB disabling, the desired image annotation should be removed at the beginning of the node update before the current image annotation is removed.
    • Once OCB is fully disabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be removed in both the MCN Spec and Status.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants