Skip to content

AGENT-1431: Backport InternalReleaseImage support#5610

Merged
openshift-merge-bot[bot] merged 8 commits intoopenshift:release-4.21from
bfournie:backport-4.21-batch1
Feb 5, 2026
Merged

AGENT-1431: Backport InternalReleaseImage support#5610
openshift-merge-bot[bot] merged 8 commits intoopenshift:release-4.21from
bfournie:backport-4.21-batch1

Conversation

@bfournie
Copy link
Copy Markdown
Contributor

@bfournie bfournie commented Jan 29, 2026

- What I did
This is a backport to add support for the InternalReleaseImage.

The following PRs have been backported:
#5483
#5514
#5543
#5588
#5545 (note that this change also required minimal
changes included for the addition of ClusterVersion in #5476)
#5608
#5562

- Description for the changelog

Backport InternalReleaseImage support

AGENT-1391: Use TLS cert for the InternalReleaseImage registry
…vice

AGENT-1411: Preload the registry image when starting the iri-service
…y-file

AGENT-1411: fix IRI registry setup file
AGENT-1424: add initial e2e tests for the InternalReleaseImage controller
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 29, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Jan 29, 2026

@bfournie: This pull request references AGENT-1431 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.

Details

In response to this:

- What I did
This is a backport to add support for the InternalReleaseImage.

The following PRs have been backported:
#5483
#5514
#5543
#5588

- Description for the changelog

Backport InternalReleaseImage support

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 adds the minimal osimagestream.GetReleasePayloadImage() function
needed to support PR openshift#5545 (AGENT-1412 IRI deletion guard) without
requiring the full OSImageStream functionality from PR openshift#5476.

This is a targeted backport to release-4.21 to enable the IRI deletion
guard feature.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Jan 29, 2026

@bfournie: This pull request references AGENT-1431 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.

Details

In response to this:

- What I did
This is a backport to add support for the InternalReleaseImage.

The following PRs have been backported:
#5483
#5514
#5543
#5588
#5545 (note that this change also required minimal
changes included for the addition of ClusterVersion in #5476)

- Description for the changelog

Backport InternalReleaseImage support

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.

…on-guard

AGENT-1412: Prevent deletion of InternalReleaseImage when in use

Add ValidatingAdmissionPolicy to block deletion of the InternalReleaseImage
singleton resource if any of its release bundles are currently in use by the
cluster. This prevents accidental deletion of IRI while the cluster is running
a release version that is stored in the InternalReleaseImage resource.

The policy checks the ClusterVersion's current version against all release
bundle names in the IRI status. If a match is found, deletion is blocked
with a clear error message instructing the user to upgrade or downgrade
before deletion.

This is part of the NoRegistryClusterInstall feature, where deletion of IRI
is the default opt-out mechanism, and this guard ensures safe operation.

Backported from upstream main with minimal osimagestream package support.
@bfournie bfournie force-pushed the backport-4.21-batch1 branch from d09d108 to e25b74b Compare January 30, 2026 00:35
@bfournie
Copy link
Copy Markdown
Contributor Author

/retest-required
Looks like unrelated timeouts

@bfournie
Copy link
Copy Markdown
Contributor Author

/hold
Will add two more backports to this PR when ready, so holding from merge for now

@openshift-ci 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 31, 2026
@bfournie
Copy link
Copy Markdown
Contributor Author

bfournie commented Feb 2, 2026

/unhold

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 2, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Feb 2, 2026

@bfournie: This pull request references AGENT-1431 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.

Details

In response to this:

- What I did
This is a backport to add support for the InternalReleaseImage.

The following PRs have been backported:
#5483
#5514
#5543
#5588
#5545 (note that this change also required minimal
changes included for the addition of ClusterVersion in #5476)
#5608
#5562

- Description for the changelog

Backport InternalReleaseImage support

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.

@bfournie
Copy link
Copy Markdown
Contributor Author

bfournie commented Feb 2, 2026

Backports are complete

Copy link
Copy Markdown
Contributor

@yuqi-zhang yuqi-zhang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did a general pass and the backport seems clean to me. Did not cross-check each PR individually, but hopefully the test/validation can cover that.

Since this is a feature backport via SBAR, I think we may need explicitly acknowledgement and label overrides to get merged.

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 2, 2026
@bfournie
Copy link
Copy Markdown
Contributor Author

bfournie commented Feb 2, 2026

/retest-required

@pawanpinjarkar
Copy link
Copy Markdown

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Feb 3, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Feb 3, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bfournie, pawanpinjarkar, yuqi-zhang

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:

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

@bfournie
Copy link
Copy Markdown
Contributor Author

bfournie commented Feb 3, 2026

/retest-required

1 similar comment
@bfournie
Copy link
Copy Markdown
Contributor Author

bfournie commented Feb 4, 2026

/retest-required

@bfournie
Copy link
Copy Markdown
Contributor Author

bfournie commented Feb 4, 2026

/test e2e-hypershift
Failures appear unrelated and with a similar signature to failures on other PRs
This test has passed successfully previously on this PR

@bfournie
Copy link
Copy Markdown
Contributor Author

bfournie commented Feb 4, 2026

/verified later @bfournie

@openshift-ci-robot openshift-ci-robot added verified-later verified Signifies that the PR passed pre-merge verification criteria labels Feb 4, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@bfournie: This PR has been marked to be verified later by @bfournie.

Details

In response to this:

/verified later @bfournie

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.

@yuqi-zhang
Copy link
Copy Markdown
Contributor

/label backport-risk-assessed

Should be safe given it's behind a FG

@openshift-ci openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Feb 5, 2026
@zaneb
Copy link
Copy Markdown
Member

zaneb commented Feb 5, 2026

Manually setting jira/valid-bug as this is the subject of an approved SBAR

@zaneb zaneb added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Feb 5, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Feb 5, 2026

@bfournie: all tests passed!

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.

@openshift-merge-bot openshift-merge-bot Bot merged commit c3866b2 into openshift:release-4.21 Feb 5, 2026
16 checks passed
@bfournie bfournie deleted the backport-4.21-batch1 branch February 5, 2026 11:50
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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria verified-later

Projects

None yet

Development

Successfully merging this pull request may close these issues.