[release-5.0] OCPBUGS-113615: Azure confidential clusters should be flagged by skew enforcement

[djoshy]

- What I did
Manual cherry-picks of bug fixes from #6404.

- How to verify it
Azure bootimage updates e2es and related units can be used to verify this.

[openshift-merge-bot]

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

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 90a18911-bc3b-4db2-8860-d834e45adffd

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

---

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

[djoshy]

/jira cherry-pick OCPBUGS-109746

[openshift-ci-robot]

@djoshy: Jira Issue OCPBUGS-109746 has been cloned as Jira Issue OCPBUGS-113615. Will retitle bug to link to clone.
/retitle OCPBUGS-113615: [release-5.0] Azure confidential clusters should be flagged by skew enforcement

Details

In response to this:

/jira cherry-pick OCPBUGS-109746

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]

@djoshy: This pull request references Jira Issue OCPBUGS-113615, which is invalid:

• expected dependent Jira Issue OCPBUGS-109746 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is POST instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

- What I did
Manual cherry-picks of bug fixes from #6404.

- How to verify it
Azure bootimage updates e2es and related units can be used to verify this.

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]

/jira refresh

/retest-required

[openshift-ci-robot]

@djoshy: This pull request references Jira Issue OCPBUGS-113615, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (5.0.0) matches configured target version for branch (5.0.0)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
• release note type set to "Release Note Not Required"
• dependent bug Jira Issue OCPBUGS-109746 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
• dependent Jira Issue OCPBUGS-109746 targets the "5.1.0" version, which is one of the valid target versions: 5.1.0
• bug has dependents

Details

In response to this:

/jira refresh

/retest-required

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]

/cherry-pick release-4.22

[openshift-cherrypick-robot]

@djoshy: once the present PR merges, I will cherry-pick it on top of release-4.22 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-4.22

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.

[isabella-janssen]

/lgtm
/label backport-risk-assessed

[openshift-merge-bot]

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/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 tls-pqc-readiness

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: djoshy, isabella-janssen

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,isabella-janssen]

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

[djoshy]

/verified later @ptalgulk01

[openshift-ci-robot]

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

Details

In response to this:

/verified later @ptalgulk01

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-merge-bot]

/retest-required

Remaining retests: 0 against base HEAD d20efd9 and 2 for PR HEAD eee8cd5 in total

[djoshy]

/override ci/prow/e2e-gcp-op-part1

Looks like it passed the tests, just ran into infra issues during the depro: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_machine-config-operator/6448/pull-ci-openshift-machine-config-operator-release-5.0-e2e-gcp-op-part1/2092263245942362112

[openshift-ci]

@djoshy: Overrode contexts on behalf of djoshy: ci/prow/e2e-gcp-op-part1

Details

In response to this:

/override ci/prow/e2e-gcp-op-part1

Looks like it passed the tests, just ran into infra issues during the depro: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_machine-config-operator/6448/pull-ci-openshift-machine-config-operator-release-5.0-e2e-gcp-op-part1/2092263245942362112

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]

@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/perfscale-control-plane-6nodes	eee8cd5	link	false	/test perfscale-control-plane-6nodes
ci/prow/e2e-gcp-op-part1	eee8cd5	link	true	/test e2e-gcp-op-part1

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-ci-robot]

@djoshy: Jira Issue OCPBUGS-113615: All pull requests linked via external trackers have merged:

• openshift/machine-config-operator#6448

This pull request has the verified-later tag and will need to be manually moved to VERIFIED after testing. Jira Issue OCPBUGS-113615 has been moved to the MODIFIED state.

Details

In response to this:

- What I did
Manual cherry-picks of bug fixes from #6404.

- How to verify it
Azure bootimage updates e2es and related units can be used to verify this.

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-cherrypick-robot]

@djoshy: #6448 failed to apply on top of branch "release-4.22":

Applying: bootimage: fix Confidential Cluster skip
Using index info to reconstruct a base tree...
M	pkg/controller/bootimage/platform_helpers.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/bootimage/platform_helpers.go
CONFLICT (content): Merge conflict in pkg/controller/bootimage/platform_helpers.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 bootimage: fix Confidential Cluster skip

Details

In response to this:

/cherry-pick release-4.22

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-merge-robot]

Fix included in release 5.0.0-0.nightly-2026-08-26-064344