Skip to content

AGENT-1522: bump InternalReleaseImage to v1 (and simply version dependency)#6280

Open
andfasano wants to merge 4 commits into
openshift:mainfrom
andfasano:bump-iri-to-v1-and-simplify-version-dependency
Open

AGENT-1522: bump InternalReleaseImage to v1 (and simply version dependency)#6280
andfasano wants to merge 4 commits into
openshift:mainfrom
andfasano:bump-iri-to-v1-and-simplify-version-dependency

Conversation

@andfasano

@andfasano andfasano commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

This patch merges #6174 and @zaneb branch bootstrap-iri-v1.

Apart bumping the IRI version to v1, the main goal is to allow a smoother version transition, thus the changes in the Bootstrap command and Renderer (where essentially the IRI object wasn't used at all, only its presence was relevant)

Summary by CodeRabbit

  • New Features

    • Internal release image handling now uses the stable machineconfiguration/v1 API across controllers, daemon, operator, bootstrap, and tests.
    • Admission and status checks were updated to match the newer resource version.
  • Bug Fixes

    • Improved consistency in internal release image processing, including certificate rotation, secret merging, and node status updates.
  • Chores

    • Updated dependency versions in the module manifest.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

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

openshift-ci-robot commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

@andfasano: This pull request references AGENT-1522 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 "5.0.0" version, but no target version was set.

Details

In response to this:

This patch merges #6174 and @zaneb branch bootstrap-iri-v1.

Apart bumping the IRI version to v1, the main goal is to allow a smoother version transition, thus the changes in the Bootstrap command and Renderer (where essentially the IRI object wasn't used at all, only its presence was relevant)This patch merges #6174 and @zaneb branch bootstrap-iri-v1.

Apart bumping the IRI version to v1, the main goal is to allow a smoother version transition, thus the changes in the Bootstrap command and Renderer (where essentially the IRI object wasn't used at all, only its presence was relevant)

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.

@coderabbitai

coderabbitai Bot commented Jul 7, 2026

Copy link
Copy Markdown

Caution

Review failed

An error occurred during the review process. Please try again later.

Walkthrough

This PR migrates InternalReleaseImage API usage across the Machine Config Operator from machineconfiguration/v1alpha1 to machineconfiguration/v1. It updates controllers, daemon managers, the operator, bootstrap flow, renderer, and tests, replacing object-passing with a boolean presence flag in some cases, plus unrelated go.mod dependency bumps.

Changes

InternalReleaseImage v1 API migration

Layer / File(s) Summary
Renderer and secret merger drop IRI object
pkg/controller/internalreleaseimage/internalreleaseimage_renderer.go, pkg/controller/common/iri_secret_merger*.go
NewRendererByRole and NewIRISecretMergerFromObjects no longer take an IRI object pointer; secret merger uses a bool flag and v1 listers.
Bootstrap flow presence flag
pkg/controller/bootstrap/bootstrap.go, pkg/controller/internalreleaseimage/internalreleaseimage_bootstrap*.go
Bootstrap tracks IRI presence as a boolean instead of storing the object, and RunInternalReleaseImageBootstrap drops the IRI parameter.
Controller reconciliation switched to v1
pkg/controller/internalreleaseimage/internalreleaseimage_controller*.go, aggregation.go, internalreleaseimage_helpers_test.go
Event handlers, status aggregation, finalizers, and client calls use mcfgv1.InternalReleaseImage and MachineconfigurationV1().
Daemon manager switched to v1
pkg/daemon/internalreleaseimage/internalreleaseimage_manager*.go, internalreleaseimage_helpers_test.go
Daemon manager's informer, lister, event handlers, and MCN condition constants use mcfgv1.
Template controller and cert rotation
pkg/controller/template/template_controller*.go, pkg/controller/certrotation/*.go
Both controllers switch InternalReleaseImage informer/client usage to v1.
Operator and entrypoint wiring
pkg/operator/operator.go, cmd/machine-config-controller/start.go, cmd/machine-config-daemon/start.go, cmd/machine-config-operator/start.go
Operator and CLI entrypoints wire informers from Machineconfiguration().V1() instead of V1alpha1().
Admission policy and e2e tests
manifests/machineconfigcontroller/internalreleaseimage-deletion-guard-validatingadmissionpolicy.yaml, test/e2e-bootstrap/bootstrap_test.go, test/e2e-iri/iri_test.go
ValidatingAdmissionPolicy and e2e tests reference v1 API version and condition constants.

Dependency version updates

Layer / File(s) Summary
go.mod bumps
go.mod
Openshift, Kubernetes, and golang.org/x/* dependencies bumped; go-openapi/swag submodules added; josharian/intern and mailru/easyjson removed.

Estimated code review effort: 4 (Complex) | ~60 minutes

Sequence Diagram(s)

sequenceDiagram
  participant Bootstrap
  participant ManifestDecoder
  participant RunInternalReleaseImageBootstrap
  participant Renderer

  Bootstrap->>ManifestDecoder: decode cluster manifests
  ManifestDecoder-->>Bootstrap: set iri bool flag on match
  Bootstrap->>RunInternalReleaseImageBootstrap: call with iriSecret, iriRegistryCredentialsSecret, cconfig
  RunInternalReleaseImageBootstrap->>Renderer: NewRendererByRole(role, iriSecret, iriRegistryCredentialsSecret, cconfig)
  Renderer-->>RunInternalReleaseImageBootstrap: rendered MachineConfigs
Loading

Related issues: None specified.

Related PRs: None specified.

Suggested labels: api-migration, v1-api, dependencies

Suggested reviewers: machine-config-operator maintainers familiar with InternalReleaseImage controllers and API versioning.

🐰 A rabbit hops from alpha's den,
to v1's field, again, again,
informers swapped, a flag now true,
no more objects passing through,
the burrow's clean, the code renewed.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Warning

Tools execution failed with the following error:

Failed to run tools: 13 INTERNAL: Received RST_STREAM with code 2 (Internal server error)


Comment @coderabbitai help to get the list of available commands.

@andfasano

Copy link
Copy Markdown
Contributor Author

/test ?

@openshift-ci openshift-ci Bot requested review from pawanpinjarkar and proietfb July 7, 2026 11:24
@openshift-ci

openshift-ci Bot commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: andfasano
Once this PR has been reviewed and has the lgtm label, please assign isabella-janssen for approval. For more information see the Code Review Process.

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

Details 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

@andfasano

Copy link
Copy Markdown
Contributor Author

/test e2e-agent-compact-ipv4
/test e2e-agent-compact-ipv4-iso-no-registry

@andfasano

Copy link
Copy Markdown
Contributor Author

/test e2e-agent-compact-ipv4-iso-no-registry

1 similar comment
@andfasano

Copy link
Copy Markdown
Contributor Author

/test e2e-agent-compact-ipv4-iso-no-registry

@openshift-ci

openshift-ci Bot commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

@andfasano: 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-agent-compact-ipv4 1926ec7 link false /test e2e-agent-compact-ipv4
ci/prow/e2e-agent-compact-ipv4-iso-no-registry 1926ec7 link false /test e2e-agent-compact-ipv4-iso-no-registry
ci/prow/bootstrap-unit 1926ec7 link true /test bootstrap-unit
ci/prow/unit 1926ec7 link true /test unit
ci/prow/verify 1926ec7 link true /test verify
ci/prow/okd-scos-images 1926ec7 link true /test okd-scos-images
ci/prow/images 1926ec7 link true /test images

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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