MCO-2036: Enable boot image updates by default for vsphere and Azure by djoshy · Pull Request #5583 · openshift/machine-config-operator

djoshy · 2026-01-20T16:14:07Z

- What I did
This PR enables boot image updates by default for Azure and vsphere, and adjusts any test behavior to account for this. This PR is based on the skew enforcement MVP(#5428) and should only merge after that PR has landed.

- How to verify it
An installation on this PR should show the managedBootImageStatus MachineConfiguration object set to All for MAPI MachineSet objects:

  spec:
    logLevel: Normal
    managementState: Managed
    operatorLogLevel: Normal
  status:
 ...
    managedBootImagesStatus:
      machineManagers:
      - apiGroup: machine.openshift.io
        resource: machinesets
        selection:
          mode: All

As a result, boot image updates should took place automatically without a spec.managedBootImages field defined. Any edits to the boot images defined in the MachineSet will be stomped back to the reference defined by the coreos-bootimages configmap.

openshift-ci-robot · 2026-01-20T16:14:12Z

@djoshy: This pull request references MCO-2036 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.22.0" version, but no target version was set.

Details

In response to this:

- What I did
This PR enables boot image updates by default for Azure and vsphere, and adjusts any test behavior to account for this.

- How to verify it
Boot image updates should take place by default on these platforms when the user hasn't provided an opinion.

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 · 2026-01-20T16:21:12Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: djoshy

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [djoshy]

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

openshift-ci-robot · 2026-01-20T17:57:03Z

@djoshy: This pull request references MCO-2036 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.22.0" version, but no target version was set.

Details

In response to this:

- What I did
This PR enables boot image updates by default for Azure and vsphere, and adjusts any test behavior to account for this.

- How to verify it
An installation on this PR should show the managedBootImageStatus MachineConfiguration object set to All for MAPI MachineSet objects:
 spec:
   logLevel: Normal
   managementState: Managed
   operatorLogLevel: Normal
 status:
...
   managedBootImagesStatus:
     machineManagers:
     - apiGroup: machine.openshift.io
       resource: machinesets
       selection:
         mode: All
As a result, boot image updates should took place automatically without a spec.managedBootImages field defined. Any edits to the boot images defined in the MachineSet will be stomped back to the reference defined by the coreos-bootimages configmap.

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.

djoshy · 2026-01-20T19:34:06Z

/payload-job periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-vsphere-mco-disruptive periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-gcp-mco-disruptive periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-aws-mco-disruptive

openshift-ci · 2026-01-20T19:34:11Z

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

periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-vsphere-mco-disruptive
periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive
periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-gcp-mco-disruptive
periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-aws-mco-disruptive

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/fcd17e20-f636-11f0-9b60-3c66bfc66382-0

djoshy · 2026-01-22T18:57:07Z

/hold

we also need to reconcile the disruptive boot image tests when we enable these platforms by default, similar to openshift/origin#30712

djoshy · 2026-01-23T15:59:20Z

/payload-job-with-prs periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive-techpreview-1of2 #5583

openshift-ci · 2026-01-23T15:59:25Z

@djoshy: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive-techpreview-1of2

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/7b688eb0-f874-11f0-804b-b09532f7bee8-0

openshift-ci · 2026-01-23T15:59:26Z

@djoshy: This PR was included in a payload test run from #5583
trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive-techpreview-1of2

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/7b688eb0-f874-11f0-804b-b09532f7bee8-0

djoshy · 2026-01-23T15:59:45Z

/payload-abort

openshift-ci · 2026-01-23T15:59:51Z

@djoshy: aborted 1 active payload job(s) for pull request #5583

djoshy · 2026-01-23T16:00:51Z

/payload-job-with-prs periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive-techpreview-1of2 #5428

openshift-ci · 2026-01-23T16:00:56Z

@djoshy: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive-techpreview-1of2

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/b1a46080-f874-11f0-9b01-9954da0d5f2e-0

djoshy · 2026-01-23T16:00:57Z

/payload-job-with-prs periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive-techpreview-2of2 #5428

openshift-ci · 2026-01-23T16:01:02Z

@djoshy: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive-techpreview-2of2

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/b51b37c0-f874-11f0-8ef4-e8cbff9ca2ef-0

djoshy · 2026-01-23T16:01:17Z

/payload-job-with-prs periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-vsphere-mco-disruptive-techpreview-1of2 #5428

djoshy · 2026-01-23T16:01:22Z

/payload-job-with-prs periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-vsphere-mco-disruptive-techpreview-2of2 #5428

openshift-ci · 2026-01-23T16:01:23Z

@djoshy: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-vsphere-mco-disruptive-techpreview-1of2

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/c0bf6970-f874-11f0-9e49-5df462546e97-0

openshift-ci · 2026-01-23T16:01:27Z

@djoshy: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-vsphere-mco-disruptive-techpreview-2of2

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/c3f7b110-f874-11f0-9f8c-7baaab3813ed-0

djoshy · 2026-01-23T16:02:08Z

/payload-abort

openshift-ci · 2026-01-23T16:02:12Z

@djoshy: no active payload jobs found to abort for pull request #5583

openshift-ci · 2026-01-23T18:07:41Z

@djoshy: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-hypershift	`4812e55`	link	true	`/test e2e-hypershift`

Full PR test history. Your PR dashboard.

Details

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 kubernetes-sigs/prow repository. I understand the commands that are listed here.

djoshy · 2026-01-23T18:10:29Z

/payload-job periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive-techpreview-1of2 periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive-techpreview-2of2 periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-vsphere-mco-disruptive-techpreview-1of2 periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-vsphere-mco-disruptive-techpreview-2of2

openshift-ci · 2026-01-23T18:10:35Z

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

periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive-techpreview-1of2
periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive-techpreview-2of2
periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-vsphere-mco-disruptive-techpreview-1of2
periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-vsphere-mco-disruptive-techpreview-2of2

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/cd9efc20-f886-11f0-8155-2ad31ce2de83-0

djoshy · 2026-01-26T14:11:54Z

/payload-job periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive-techpreview-1of2 periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive-techpreview-2of2

openshift-ci · 2026-01-26T14:12:01Z

@djoshy: trigger 2 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive-techpreview-1of2
periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive-techpreview-2of2

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/f82ed910-fac0-11f0-8f83-481c4b491350-0

openshift-ci-robot · 2026-01-26T15:40:55Z

@djoshy: This pull request references MCO-2036 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.22.0" version, but no target version was set.

Details

In response to this:

- What I did
This PR enables boot image updates by default for Azure and vsphere, and adjusts any test behavior to account for this. This PR is based on the skew enforcement MVP(#5428) and should only merge after that PR has landed.

- How to verify it
An installation on this PR should show the managedBootImageStatus MachineConfiguration object set to All for MAPI MachineSet objects:
 spec:
   logLevel: Normal
   managementState: Managed
   operatorLogLevel: Normal
 status:
...
   managedBootImagesStatus:
     machineManagers:
     - apiGroup: machine.openshift.io
       resource: machinesets
       selection:
         mode: All
As a result, boot image updates should took place automatically without a spec.managedBootImages field defined. Any edits to the boot images defined in the MachineSet will be stomped back to the reference defined by the coreos-bootimages configmap.

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.

This change adds logic to populate the BootImageSkewEnforcementStatus field in the MachineConfiguration status based on spec configuration, platform support, and cluster version information.

This adds new unit tests for TestSyncMachineConfiguration to test the BootImageSkewEnforcementStatus sync logic added in the previous commit.

This commit updates the machine-set-boot-image controller to track and update the BootImageSkewEnforcementStatus when in Automatic mode.

This commit implements upgrade blocking when boot image version skew exceeds acceptable limits, via the ClusterOperator Upgradeable condition.

This commit adds unit tests for the new Upgradeable guards added in the previous commit.

This commit ensures that the boot image controller state is acceptable before checking the skew. This check is only done in Automatic mode.

djoshy · 2026-01-30T19:23:23Z

Putting this in draft so pushes don't run CI

djoshy · 2026-01-30T19:26:19Z

/test unit

djoshy · 2026-01-30T19:33:42Z

/payload-job-with-prs periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive-techpreview-1of2 #5428

openshift-ci · 2026-01-30T19:33:48Z

@djoshy: An error was encountered. No known errors were detected, please see the full error message for details.

Full error message.


unable to get additional pr info from string: #5428: string: #5428 doesn't match expected format: org/repo#number

Please contact an administrator to resolve this issue.

djoshy · 2026-01-30T19:34:15Z

/payload-abort

openshift-ci · 2026-01-30T19:34:17Z

@djoshy: no active payload jobs found to abort for pull request #5583

djoshy · 2026-01-30T19:34:27Z

/payload-job periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive-techpreview-1of2 periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive-techpreview-2of2 periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-vsphere-mco-disruptive-techpreview-1of2 periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-vsphere-mco-disruptive-techpreview-2of2

openshift-ci · 2026-01-30T19:34:35Z

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

periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive-techpreview-1of2
periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-azure-mco-disruptive-techpreview-2of2
periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-vsphere-mco-disruptive-techpreview-1of2
periodic-ci-openshift-machine-config-operator-release-4.22-periodics-e2e-vsphere-mco-disruptive-techpreview-2of2

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/b11d76d0-fe12-11f0-9e3c-4a79235e6424-0

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 20, 2026

openshift-ci bot requested review from isabella-janssen and pablintino January 20, 2026 16:20

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 20, 2026

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 22, 2026

openshift-ci bot mentioned this pull request Jan 23, 2026

MCO-1877: MCO-1879: MCO-1882: MCO-1884: Implement boot image skew enforcement MVP #5428

Merged

djoshy force-pushed the azure-vsphere-opt-out branch from 4812e55 to 64a18b3 Compare January 23, 2026 18:07

djoshy force-pushed the azure-vsphere-opt-out branch from 64a18b3 to 1a3bcbf Compare January 26, 2026 14:11

djoshy mentioned this pull request Jan 26, 2026

MCO-1984: Add Component Readiness tests for boot image skew enforcement #5547

Open

djoshy added 6 commits January 30, 2026 14:21

operator: populate skew enforcement status

62becfc

This change adds logic to populate the BootImageSkewEnforcementStatus field in the MachineConfiguration status based on spec configuration, platform support, and cluster version information.

operator: add skew enforcement status unit tests

985f299

This adds new unit tests for TestSyncMachineConfiguration to test the BootImageSkewEnforcementStatus sync logic added in the previous commit.

bootimage: update skew enforcement status

c82370a

This commit updates the machine-set-boot-image controller to track and update the BootImageSkewEnforcementStatus when in Automatic mode.

operator: block upgrades on skew violation

e2b09f2

This commit implements upgrade blocking when boot image version skew exceeds acceptable limits, via the ClusterOperator Upgradeable condition.

operator: add upgrade block unit tests

a16d81c

This commit adds unit tests for the new Upgradeable guards added in the previous commit.

operator: verify boot image controller state

2277bea

This commit ensures that the boot image controller state is acceptable before checking the skew. This check is only done in Automatic mode.

djoshy marked this pull request as draft January 30, 2026 19:23

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 Jan 30, 2026

bootimage: enable opt-out for azure and vsphere

fcb63ec

djoshy force-pushed the azure-vsphere-opt-out branch from 1a3bcbf to b1a79c0 Compare January 30, 2026 19:25

e2e: disable skew enforcement for boot image tests

17e92e2

djoshy force-pushed the azure-vsphere-opt-out branch from b1a79c0 to 17e92e2 Compare January 30, 2026 19:33

Conversation

djoshy commented Jan 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Jan 20, 2026 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Jan 20, 2026

Uh oh!

openshift-ci-robot commented Jan 20, 2026 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

djoshy commented Jan 20, 2026

Uh oh!

openshift-ci bot commented Jan 20, 2026

Uh oh!

djoshy commented Jan 22, 2026

Uh oh!

djoshy commented Jan 23, 2026

Uh oh!

openshift-ci bot commented Jan 23, 2026

Uh oh!

openshift-ci bot commented Jan 23, 2026

Uh oh!

djoshy commented Jan 23, 2026

Uh oh!

openshift-ci bot commented Jan 23, 2026

Uh oh!

djoshy commented Jan 23, 2026

Uh oh!

openshift-ci bot commented Jan 23, 2026

Uh oh!

djoshy commented Jan 23, 2026

Uh oh!

openshift-ci bot commented Jan 23, 2026

Uh oh!

djoshy commented Jan 23, 2026

Uh oh!

djoshy commented Jan 23, 2026

Uh oh!

openshift-ci bot commented Jan 23, 2026

Uh oh!

openshift-ci bot commented Jan 23, 2026

Uh oh!

djoshy commented Jan 23, 2026

Uh oh!

openshift-ci bot commented Jan 23, 2026

Uh oh!

openshift-ci bot commented Jan 23, 2026

Uh oh!

djoshy commented Jan 23, 2026

Uh oh!

openshift-ci bot commented Jan 23, 2026

Uh oh!

djoshy commented Jan 26, 2026

Uh oh!

openshift-ci bot commented Jan 26, 2026

Uh oh!

openshift-ci-robot commented Jan 26, 2026 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

djoshy commented Jan 30, 2026

Uh oh!

djoshy commented Jan 30, 2026

Uh oh!

djoshy commented Jan 30, 2026

Uh oh!

openshift-ci bot commented Jan 30, 2026

Uh oh!

djoshy commented Jan 30, 2026

Uh oh!

openshift-ci bot commented Jan 30, 2026

Uh oh!

djoshy commented Jan 30, 2026

Uh oh!

openshift-ci bot commented Jan 30, 2026

Uh oh!

Reviewers

Assignees

Labels

djoshy commented Jan 20, 2026 •

edited

Loading

openshift-ci-robot commented Jan 20, 2026 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jan 20, 2026 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jan 26, 2026 •

edited by openshift-ci bot

Loading