Skip to content

AGENT-1522: bump InternalReleaseImage to v1 (and simplify IRI version dependency) - #6279

Closed
andfasano wants to merge 4 commits into
openshift:mainfrom
zaneb:bootstrap-iri-v1
Closed

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

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

  • Bug Fixes
    • Internal release image handling now uses the stable API version throughout the platform.
    • Improved consistency for bootstrap, controller, daemon, and operator behavior when managing release images.
    • Updated deletion and status handling for internal release images to match the newer API, helping avoid mismatches and reconciliation issues.
    • Refreshed dependencies to newer releases for improved reliability and compatibility.

@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)

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 the InternalReleaseImage (IRI) resource from the machineconfiguration/v1alpha1 API to the v1 API across controllers, the daemon manager, the operator, bootstrap logic, and admission policy manifests. It also changes the bootstrap IRI tracking from an object reference to a boolean presence flag and bumps several unrelated go.mod dependencies.

Changes

InternalReleaseImage v1 API Migration

Layer / File(s) Summary
Core controller, aggregation, renderer, bootstrap
pkg/controller/internalreleaseimage/*.go
Controller, aggregation, renderer, and bootstrap logic switch informers, listers, clients, and status/condition types from v1alpha1 to v1; renderer and bootstrap no longer take the IRI object directly.
Controller/renderer tests
pkg/controller/internalreleaseimage/*_test.go
Test fixtures, verify callbacks, and informer wiring updated to build and assert against v1 types.
Daemon manager migration
pkg/daemon/internalreleaseimage/*.go
Manager struct, event handlers, and status condition updates switch to v1 informers/listers/types; tests updated accordingly.
IRI secret merger refactor
pkg/controller/common/iri_secret_merger*.go
Merger now uses v1 lister and replaces the object-based bootstrap IRI parameter with a boolean presence flag; tests updated.
Bootstrap flow & cert rotation
pkg/controller/bootstrap/bootstrap.go, pkg/controller/certrotation/*.go
Bootstrap tracks IRI presence as a boolean instead of storing the object; cert rotation queries the v1 client for IRI existence.
Startup wiring and manifests
cmd/machine-config-*/start.go, pkg/controller/template/*, pkg/operator/operator.go, manifests/.../*.yaml, test/e2e-bootstrap/bootstrap_test.go
Entry points wire v1 InternalReleaseImages informers; admission policy targets v1 API version.
e2e IRI tests
test/e2e-iri/iri_test.go
e2e assertions and client calls switch to v1 condition constants and the v1 client interface.

Estimated code review effort: 3 (Moderate) | ~30 minutes

Dependency Bumps

Layer / File(s) Summary
go.mod version updates
go.mod
Bumps OpenShift, pflag, x/net, k8s.io/utils, go-openapi/swag, structured-merge-diff, go-restful, and x/* toolchain versions; removes josharian/intern and mailru/easyjson.

Estimated code review effort: 1 (Trivial) | ~5 minutes

Related PRs: None identified.

Suggested labels: api-migration, dependencies

Suggested reviewers: None identified.

✨ 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.

@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 djoshy 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 ?

@openshift-ci

openshift-ci Bot commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

@andfasano: The following commands are available to trigger required jobs:

/test bootstrap-unit
/test e2e-aws-ovn
/test e2e-aws-ovn-upgrade
/test e2e-gcp-op-ocl-part1
/test e2e-gcp-op-ocl-part2
/test e2e-gcp-op-part1
/test e2e-gcp-op-part2
/test e2e-gcp-op-single-node
/test e2e-hypershift
/test images
/test okd-scos-images
/test unit
/test verify
/test verify-deps

The following commands are available to trigger optional jobs:

/test e2e-agent-compact-ipv4
/test e2e-agent-compact-ipv4-iso-no-registry
/test e2e-aws-disruptive
/test e2e-aws-mco-disruptive
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-fips-op
/test e2e-aws-ovn-ocb-techpreview
/test e2e-aws-ovn-serial-ipsec
/test e2e-aws-ovn-upgrade-ipsec
/test e2e-aws-ovn-upgrade-ocb-techpreview
/test e2e-aws-ovn-upgrade-out-of-change
/test e2e-aws-ovn-windows
/test e2e-aws-ovn-workers-rhel8
/test e2e-aws-proxy
/test e2e-aws-serial
/test e2e-aws-single-node
/test e2e-aws-upgrade-single-node
/test e2e-aws-workers-rhel8
/test e2e-azure
/test e2e-azure-ovn-multidisk-techpreview
/test e2e-azure-ovn-upgrade
/test e2e-azure-ovn-upgrade-out-of-change
/test e2e-azure-upgrade
/test e2e-gcp-mco-disruptive
/test e2e-gcp-op
/test e2e-gcp-op-techpreview
/test e2e-gcp-ovn-rt-upgrade
/test e2e-gcp-rt
/test e2e-gcp-rt-op
/test e2e-gcp-single-node
/test e2e-gcp-upgrade
/test e2e-hypershift-techpreview
/test e2e-metal-assisted
/test e2e-metal-ipi-ovn-dualstack
/test e2e-metal-ipi-ovn-ipv6
/test e2e-metal-ovn-two-node-arbiter
/test e2e-metal-ovn-two-node-fencing
/test e2e-openstack
/test e2e-openstack-dualstack
/test e2e-openstack-externallb
/test e2e-openstack-hypershift
/test e2e-openstack-parallel
/test e2e-openstack-singlestackv6
/test e2e-ovirt
/test e2e-ovirt-upgrade
/test e2e-ovn-step-registry
/test e2e-vsphere
/test e2e-vsphere-ovn-disk-setup-techpreview
/test e2e-vsphere-ovn-upi
/test e2e-vsphere-ovn-upi-zones
/test e2e-vsphere-ovn-zones
/test e2e-vsphere-upgrade
/test okd-scos-e2e-aws-ovn
/test security

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-machine-config-operator-main-bootstrap-unit
pull-ci-openshift-machine-config-operator-main-images
pull-ci-openshift-machine-config-operator-main-okd-scos-images
pull-ci-openshift-machine-config-operator-main-security
pull-ci-openshift-machine-config-operator-main-unit
pull-ci-openshift-machine-config-operator-main-verify
pull-ci-openshift-machine-config-operator-main-verify-deps
Details

In response to this:

/test ?

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.

@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/unit 117b41c link true /test unit
ci/prow/bootstrap-unit 117b41c link true /test bootstrap-unit
ci/prow/verify 117b41c link true /test verify

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.

@andfasano

Copy link
Copy Markdown
Contributor Author

Replaced by #6280

@andfasano andfasano closed this Jul 7, 2026
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.

3 participants