MCO-1590: Add explicit opt-out & status field for boot image update configuration #2223

djoshy · 2025-03-10T14:53:30Z

This PR adds:

a new "None" enum to specifically exclude machine resources from boot image updates
a status field for ManagedBootImages that will reflect the spec.ManagedBootImages. If unspecified, it will display the cluster defaults

Scenario: No admin configuration and the current release does not opt-in by default:

apiVersion: operator.openshift.io/v1
kind: MachineConfiguration
spec:
status:
  managedBootImagesStatus:
    machineManagers:
    - resource: machinesets
      apiGroup: machine.openshift.io
      selection:
         mode: None

Scenario: No admin configuration and the current release does opt-in by default:

apiVersion: operator.openshift.io/v1
kind: MachineConfiguration
spec:
status:
  managedBootImagesStatus:
    machineManagers:
    - resource: machinesets
      apiGroup: machine.openshift.io
      selection:
         mode: All

Regardless of the default-on behavior of the release, if the admin were to add a configuration, the status must reflect that in the next update.

apiVersion: operator.openshift.io/v1
kind: MachineConfiguration
spec:
  managedBootImages:
    machineManagers:
    - resource: machinesets
      apiGroup: machine.openshift.io
      selection:
         mode: Partial
         partial:
           machineResourceSelector:
             matchLabels: {}
status:
  managedBootImagesStatus:
    machineManagers:
    - resource: machinesets
      apiGroup: machine.openshift.io
      selection:
         mode: Partial
         partial:
           machineResourceSelector:
             matchLabels: {}

openshift-ci · 2025-03-10T14:53:38Z

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

openshift-ci · 2025-03-10T14:53:47Z

Hello @djoshy! Some important instructions when contributing to openshift/api:
API design plays an important part in the user experience of OpenShift and as such API PRs are subject to a high level of scrutiny to ensure they follow our best practices. If you haven't already done so, please review the OpenShift API Conventions and ensure that your proposed changes are compliant. Following these conventions will help expedite the api review process for your PR.

openshift-ci-robot · 2025-03-11T19:18:46Z

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

In response to this:

Added for testing

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 · 2025-03-11T19:28:11Z

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

In response to this:

This PR adds:

a new "None" enum to specifically exclude machine resources from boot image updates

a status field for ManagedBootImages that will reflect the spec.ManagedBootImages. If unspecified, it will display the cluster defaults

Scenario: No admin configuration and the current release does not opt-in by default:
apiVersion: operator.openshift.io/v1
kind: MachineConfiguration
spec:
status:
 managedBootImagesStatus:
   machineManagers: []
Scenario: No admin configuration and the current release does opt-in by default:
apiVersion: operator.openshift.io/v1
kind: MachineConfiguration
spec:
status:
 managedBootImagesStatus:
   machineManagers:
   - resource: machinesets
     apiGroup: machine.openshift.io
     selection:
        mode: All
Regardless of the default-on behavior of the release, if the admin were to add a configuration, the status must reflect that in the next update.
apiVersion: operator.openshift.io/v1
kind: MachineConfiguration
spec:
 managedBootImages:
   machineManagers:
   - resource: machinesets
     apiGroup: machine.openshift.io
     selection:
        mode: Partial
        partial:
          machineResourceSelector:
            matchLabels: {}
status:
 managedBootImagesStatus:
   machineManagers:
   - resource: machinesets
     apiGroup: machine.openshift.io
     selection:
        mode: Partial
        partial:
          machineResourceSelector:
            matchLabels: {}

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 · 2025-03-11T20:33:56Z

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

In response to this:

This PR adds:

a new "None" enum to specifically exclude machine resources from boot image updates

a status field for ManagedBootImages that will reflect the spec.ManagedBootImages. If unspecified, it will display the cluster defaults

Scenario: No admin configuration and the current release does not opt-in by default:
apiVersion: operator.openshift.io/v1
kind: MachineConfiguration
spec:
status:
 managedBootImagesStatus:
   - resource: machinesets
     apiGroup: machine.openshift.io
     selection:
        mode: None
Scenario: No admin configuration and the current release does opt-in by default:
apiVersion: operator.openshift.io/v1
kind: MachineConfiguration
spec:
status:
 managedBootImagesStatus:
   machineManagers:
   - resource: machinesets
     apiGroup: machine.openshift.io
     selection:
        mode: All
Regardless of the default-on behavior of the release, if the admin were to add a configuration, the status must reflect that in the next update.
apiVersion: operator.openshift.io/v1
kind: MachineConfiguration
spec:
 managedBootImages:
   machineManagers:
   - resource: machinesets
     apiGroup: machine.openshift.io
     selection:
        mode: Partial
        partial:
          machineResourceSelector:
            matchLabels: {}
status:
 managedBootImagesStatus:
   machineManagers:
   - resource: machinesets
     apiGroup: machine.openshift.io
     selection:
        mode: Partial
        partial:
          machineResourceSelector:
            matchLabels: {}

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 · 2025-03-11T20:35:00Z

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

In response to this:

This PR adds:

a new "None" enum to specifically exclude machine resources from boot image updates

a status field for ManagedBootImages that will reflect the spec.ManagedBootImages. If unspecified, it will display the cluster defaults

Scenario: No admin configuration and the current release does not opt-in by default:
apiVersion: operator.openshift.io/v1
kind: MachineConfiguration
spec:
status:
 managedBootImagesStatus:
   machineManagers:
   - resource: machinesets
     apiGroup: machine.openshift.io
     selection:
        mode: None
Scenario: No admin configuration and the current release does opt-in by default:
apiVersion: operator.openshift.io/v1
kind: MachineConfiguration
spec:
status:
 managedBootImagesStatus:
   machineManagers:
   - resource: machinesets
     apiGroup: machine.openshift.io
     selection:
        mode: All
Regardless of the default-on behavior of the release, if the admin were to add a configuration, the status must reflect that in the next update.
apiVersion: operator.openshift.io/v1
kind: MachineConfiguration
spec:
 managedBootImages:
   machineManagers:
   - resource: machinesets
     apiGroup: machine.openshift.io
     selection:
        mode: Partial
        partial:
          machineResourceSelector:
            matchLabels: {}
status:
 managedBootImagesStatus:
   machineManagers:
   - resource: machinesets
     apiGroup: machine.openshift.io
     selection:
        mode: Partial
        partial:
          machineResourceSelector:
            matchLabels: {}

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.

JoelSpeed

One doc nit but otherwise LGTM

JoelSpeed · 2025-03-12T09:35:18Z

operator/v1/types_machineconfiguration.go

-	// always boot with the current cluster version's boot image. When omitted, no boot images
-	// will be updated.
+	// always boot with the current cluster version's boot image. When omitted, the MCO will
+	// will use cluster defaults, which may vary between releases.


We have a particular way of wording this

Suggested change

// will use cluster defaults, which may vary between releases.

// When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time.

// The default is ...

Updated in last push!

djoshy · 2025-03-12T14:24:36Z

Seeing failures from verify-crd-schema locally:

error running generator schemacheck on group operator.openshift.io: 
        could not run schemacheck generator for group/version operator.openshift.io/v1: 
                NoMaps: 
                        crd/machineconfigurations.operator.openshift.io version/v1 field/^.status.managedBootImagesStatus.machineManagers[*].selection.partial.machineResourceSelector.matchLabels may not be a map
                NoMaps: 
                        crd/machineconfigurations.operator.openshift.io version/v1 field/^.status.managedBootImagesStatus.machineManagers[*].selection.partial.machineResourceSelector.matchLabels may not be a map

I assume these are safe to ignore because managedBootImagesStatus is a new field?

JoelSpeed · 2025-03-12T15:58:36Z

/override ci/prow/verify-crd-schema
/lgtm

openshift-ci · 2025-03-12T15:59:16Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: djoshy, JoelSpeed

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:

~~OWNERS~~ [JoelSpeed]

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

openshift-ci · 2025-03-12T15:59:18Z

@JoelSpeed: Overrode contexts on behalf of JoelSpeed: ci/prow/verify-crd-schema

In response to this:

/override ci/prow/verify-crd-schema
/lgtm

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.

djoshy · 2025-03-12T16:56:05Z

/retest-required

openshift-ci-robot · 2025-03-12T17:15:07Z

/retest-required

Remaining retests: 0 against base HEAD 14a17c7 and 2 for PR HEAD 378e9d7 in total

openshift-ci-robot · 2025-03-12T19:31:47Z

/retest-required

Remaining retests: 0 against base HEAD 14a17c7 and 2 for PR HEAD 378e9d7 in total

openshift-ci-robot · 2025-03-12T23:41:15Z

/retest-required

Remaining retests: 0 against base HEAD 14a17c7 and 2 for PR HEAD 378e9d7 in total

djoshy · 2025-03-13T09:37:47Z

/retest-required

openshift-ci · 2025-03-13T13:36:59Z

@djoshy: The following tests 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-azure	`378e9d7`	link	false	`/test e2e-azure`
ci/prow/e2e-gcp	`378e9d7`	link	false	`/test e2e-gcp`

Full PR test history. Your PR dashboard.

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.

openshift-bot · 2025-03-13T16:43:13Z

[ART PR BUILD NOTIFIER]

Distgit: ose-cluster-config-api
This PR has been included in build ose-cluster-config-api-container-v4.19.0-202503131541.p0.g8a7efbf.assembly.stream.el9.
All builds following this will include this PR.

add explicit opt-out for boot image update

cedb279

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 Mar 10, 2025

openshift-ci bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 10, 2025

djoshy changed the title ~~[DNM] Add explicit opt-out for boot image update~~ MCO-1590: Add explicit opt-out & status field for boot image update configuration Mar 11, 2025

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

djoshy marked this pull request as ready for review March 11, 2025 19:21

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 11, 2025

openshift-ci bot requested review from deads2k and knobunc March 11, 2025 19:22

JoelSpeed reviewed Mar 12, 2025

View reviewed changes

machine_config: add ManagedBootImages status

378e9d7

djoshy force-pushed the add-opt-out branch from e52b545 to 378e9d7 Compare March 12, 2025 14:22

openshift-ci bot assigned JoelSpeed Mar 12, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 12, 2025

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 12, 2025

openshift-merge-bot bot merged commit 8a7efbf into openshift:master Mar 13, 2025
21 of 23 checks passed

djoshy mentioned this pull request Mar 13, 2025

NO-ISSUE: API bump for ManagedBootImageStatus openshift/client-go#312

Merged

djoshy mentioned this pull request May 1, 2025

MCO-1663: add explicit opt-out for boot image update in 4.18 #2303

Closed

	// will use cluster defaults, which may vary between releases.
	// When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time.
	// The default is ...

MCO-1590: Add explicit opt-out & status field for boot image update configuration #2223

MCO-1590: Add explicit opt-out & status field for boot image update configuration #2223

Uh oh!

Conversation

djoshy commented Mar 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Mar 10, 2025

Uh oh!

openshift-ci bot commented Mar 10, 2025

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

JoelSpeed left a comment

Choose a reason for hiding this comment

Uh oh!

JoelSpeed Mar 12, 2025

Choose a reason for hiding this comment

Uh oh!

djoshy Mar 12, 2025

Choose a reason for hiding this comment

Uh oh!

djoshy commented Mar 12, 2025

Uh oh!

JoelSpeed commented Mar 12, 2025

Uh oh!

openshift-ci bot commented Mar 12, 2025

Uh oh!

openshift-ci bot commented Mar 12, 2025

Uh oh!

djoshy commented Mar 12, 2025

Uh oh!

openshift-ci-robot commented Mar 12, 2025

Uh oh!

openshift-ci-robot commented Mar 12, 2025

Uh oh!

openshift-ci-robot commented Mar 12, 2025

Uh oh!

djoshy commented Mar 13, 2025

Uh oh!

openshift-ci bot commented Mar 13, 2025

Uh oh!

Uh oh!

openshift-bot commented Mar 13, 2025

Uh oh!

Uh oh!

djoshy commented Mar 10, 2025 •

edited

Loading

openshift-ci-robot commented Mar 11, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Mar 11, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Mar 11, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Mar 11, 2025 •

edited by openshift-ci bot

Loading