Skip to content

OCPBUGS-89352: build(operator): drop hypershift-no-cgo from operator container images - #8756

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:release-4.22from
yiraeChristineKim:cherry-pick-no-cgo-4.22
Jun 22, 2026
Merged

OCPBUGS-89352: build(operator): drop hypershift-no-cgo from operator container images#8756
openshift-merge-bot[bot] merged 1 commit into
openshift:release-4.22from
yiraeChristineKim:cherry-pick-no-cgo-4.22

Conversation

@yiraeChristineKim

Copy link
Copy Markdown
Contributor

This is a cherry-pick of PR #8601 onto release-4.22.

What this PR does / why we need it

Remove the hypershift-no-cgo statically compiled binary from Containerfile.operator. The non-FIPS binary causes Enterprise Contract FIPS violations in Konflux builds for MCE.

Fixes: OCPBUGS-89352
Upstream: #8601

Checklist

  • Subject and description added to both commit and PR
  • Relevant issues have been referenced

Made with Cursor

Remove the hypershift-no-cgo statically compiled binary and the hcp
product CLI from Containerfile.operator, as these are only required
in the Konflux build pipeline and not in the operator image itself.
Non-Konflux Dockerfiles (Dockerfile, Dockerfile.dev) are unchanged and
continue to include hypershift-no-cgo and hcp.

Signed-off-by: yiraeChristineKim <yikim@redhat.com>
Commit-Message-Assisted-by: Claude (via Claude Code)
Co-authored-by: Cursor <cursoragent@cursor.com>
@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 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 Jun 17, 2026
@openshift-ci

openshift-ci Bot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

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-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 17, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@yiraeChristineKim: This pull request references Jira Issue OCPBUGS-89352, which is invalid:

  • expected the bug to target the "4.22.0" version, but no target version was set
  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
  • expected dependent Jira Issue OCPBUGS-89338 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is New instead
  • expected dependent Jira Issue OCPBUGS-89338 to target a version in 5.0.0, but no target version was set

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:

This is a cherry-pick of PR #8601 onto release-4.22.

What this PR does / why we need it

Remove the hypershift-no-cgo statically compiled binary from Containerfile.operator. The non-FIPS binary causes Enterprise Contract FIPS violations in Konflux builds for MCE.

Fixes: OCPBUGS-89352
Upstream: #8601

Checklist

  • Subject and description added to both commit and PR
  • Relevant issues have been referenced

Made with Cursor

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 Jun 17, 2026

Copy link
Copy Markdown
Contributor

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 YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 59482427-d525-4ea3-8bb7-68a7f72d4a3b

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
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@yiraeChristineKim
yiraeChristineKim marked this pull request as ready for review June 17, 2026 16:11
@openshift-ci 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 Jun 17, 2026
@openshift-ci
openshift-ci Bot requested review from devguyio and jparrill June 17, 2026 16:11
@codecov

codecov Bot commented Jun 17, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 35.45%. Comparing base (2371dc8) to head (5a84196).
⚠️ Report is 106 commits behind head on release-4.22.

Additional details and impacted files
@@               Coverage Diff                @@
##           release-4.22    #8756      +/-   ##
================================================
+ Coverage         32.17%   35.45%   +3.27%     
================================================
  Files               766      768       +2     
  Lines             91968    93726    +1758     
================================================
+ Hits              29592    33226    +3634     
+ Misses            59843    57787    -2056     
- Partials           2533     2713     +180     

see 72 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@yiraeChristineKim

Copy link
Copy Markdown
Contributor Author

/ok-to-test

@openshift-ci openshift-ci Bot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Jun 17, 2026
@yiraeChristineKim

Copy link
Copy Markdown
Contributor Author

/test all

@yiraeChristineKim

Copy link
Copy Markdown
Contributor Author

/jira refresh

@openshift-ci-robot

Copy link
Copy Markdown

@yiraeChristineKim: This pull request references Jira Issue OCPBUGS-89352, which is invalid:

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.

Details

In response to this:

/jira refresh

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.

@yiraeChristineKim

Copy link
Copy Markdown
Contributor Author

/jira refresh

@openshift-ci-robot

Copy link
Copy Markdown

@yiraeChristineKim: This pull request references Jira Issue OCPBUGS-89352, which is invalid:

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.

Details

In response to this:

/jira refresh

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.

@yiraeChristineKim

Copy link
Copy Markdown
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 17, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@yiraeChristineKim: This pull request references Jira Issue OCPBUGS-89352, 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 (4.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-89338 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-89338 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
  • bug has dependents
Details

In response to this:

/jira refresh

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.

@yiraeChristineKim

Copy link
Copy Markdown
Contributor Author

/test all

@yiraeChristineKim

Copy link
Copy Markdown
Contributor Author

/cc @bryan-cox

@openshift-ci
openshift-ci Bot requested a review from bryan-cox June 18, 2026 00:39
@yiraeChristineKim

Copy link
Copy Markdown
Contributor Author

/cc @csrwng

@openshift-ci
openshift-ci Bot requested a review from csrwng June 18, 2026 00:39

@bryan-cox bryan-cox left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/area ci-tooling

@openshift-ci openshift-ci Bot added area/ci-tooling Indicates the PR includes changes for CI or tooling and removed do-not-merge/needs-area labels Jun 18, 2026
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 18, 2026
@openshift-ci

openshift-ci Bot commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bryan-cox, yiraeChristineKim

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

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aks
/test e2e-aws
/test e2e-aws-upgrade-hypershift-operator
/test e2e-azure-self-managed
/test e2e-kubevirt-aws-ovn-reduced
/test e2e-v2-aws

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 18, 2026
@yiraeChristineKim

Copy link
Copy Markdown
Contributor Author

/test e2e-aws-upgrade-hypershift-operator

@yiraeChristineKim

Copy link
Copy Markdown
Contributor Author

/test e2e-aws

@yiraeChristineKim

Copy link
Copy Markdown
Contributor Author

/test e2e-kubevirt-aws-ovn-reduced

@yiraeChristineKim

Copy link
Copy Markdown
Contributor Author

/test e2e-aws-upgrade-hypershift-operator

2 similar comments
@yiraeChristineKim

Copy link
Copy Markdown
Contributor Author

/test e2e-aws-upgrade-hypershift-operator

@yiraeChristineKim

Copy link
Copy Markdown
Contributor Author

/test e2e-aws-upgrade-hypershift-operator

@bryan-cox

Copy link
Copy Markdown
Member

@yiraeChristineKim the test is broke. This PR is blocked at the moment.

I would encourage you not to just hit /retest. We recently put up a flowchart to help folks figure out if a test is broken on their side or its an infra thing - https://hypershift.pages.dev/how-to/ci/triage/presubmit-failures/

@yiraeChristineKim

Copy link
Copy Markdown
Contributor Author

@bryan-cox Can we override this? We're in a hurry for the z-stream release.

@yiraeChristineKim

Copy link
Copy Markdown
Contributor Author

Summary: This is a pre-existing flaky failure on the release-4.22 branch, NOT caused by PR #8756's changes.
The PR only modifies Containerfile.operator (removing the hypershift-no-cgo binary) — it touches zero Go
code or controller logic. The test's Consistently assertion (5-minute window, 1s poll) expects
MachineDeployment generations to stay unchanged after the HyperShift operator upgrade, but something on the
release-4.22 branch tip (BaseSHA 5cb8735) is causing a spurious generation bump on one of the
MachineDeployments (us-east-1a). The same failure reproduces on at least two other unrelated PRs (#8692 and
#8746) targeting release-4.22 with the same base SHA.

@yiraeChristineKim

Copy link
Copy Markdown
Contributor Author

/test e2e-aws-upgrade-hypershift-operator

@celebdor

Copy link
Copy Markdown
Collaborator

/override "ci/prow/e2e-aws-upgrade-hypershift-operator"

@openshift-ci

openshift-ci Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

@celebdor: Overrode contexts on behalf of celebdor: ci/prow/e2e-aws-upgrade-hypershift-operator

Details

In response to this:

/override "ci/prow/e2e-aws-upgrade-hypershift-operator"

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 Jun 22, 2026

Copy link
Copy Markdown
Contributor

@yiraeChristineKim: 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.

@enxebre enxebre added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jun 22, 2026
@celebdor

Copy link
Copy Markdown
Collaborator

/verified by celebdor

📦[claudi@claude43 hypershift]$ podman run --rm  -ti --entrypoint /bin/sh quay.io/redhat-user-workloads/crt-redhat-acm-tenant/hypershift-release-mce-217:on-pr-5a84196d0f34721a13adfff9f988dce84b9df140 -c "stat /usr/bin/hypershift"
"
  File: /usr/bin/hypershift
  Size: 221302456       Blocks: 432232     IO Block: 4096   regular file
Device: 60h/96d Inode: 59337267    Links: 1
Access: (0755/-rwxr-xr-x)  Uid: ( 1001/ UNKNOWN)   Gid: (    0/    root)
Access: 2026-06-17 17:20:38.000000000 +0000
Modify: 2026-06-17 17:20:38.000000000 +0000
Change: 2026-06-22 13:25:47.670519442 +0000
 Birth: 2026-06-22 13:25:46.922968014 +0000
bash: unexpected EOF while looking for matching `"'
[ble: exit 2]
📦[claudi@claude43 hypershift]$ podman run --rm  -ti --entrypoint /bin/sh quay.io/redhat-user-workloads/crt-redhat-acm-tenant/hypershift-release-mce-217:on-pr-5a84196d0f34721a13adfff9f988dce84b9df140 -c "stat /usr/bin/hypershift-no-cgo"
stat: cannot statx '/usr/bin/hypershift-no-cgo': No such file or directory
[ble: exit 1]
📦[claudi@claude43 hypershift]$ podman run --rm  -ti --entrypoint /bin/sh quay.io/redhat-user-workloads/crt-redhat-acm-tenant/hypershift-release-mce-217:on-pr-5a84196d0f34721a13adfff9f988dce84b9df140 -c "stat /usr/bin/hcp"
stat: cannot statx '/usr/bin/hcp': No such file or directory
[ble: exit 1]
📦[claudi@claude43 hypershift]$

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jun 22, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@celebdor: This PR has been marked as verified by celebdor.

Details

In response to this:

/verified by celebdor

📦[claudi@claude43 hypershift]$ podman run --rm  -ti --entrypoint /bin/sh quay.io/redhat-user-workloads/crt-redhat-acm-tenant/hypershift-release-mce-217:on-pr-5a84196d0f34721a13adfff9f988dce84b9df140 -c "stat /usr/bin/hypershift"
"
 File: /usr/bin/hypershift
 Size: 221302456       Blocks: 432232     IO Block: 4096   regular file
Device: 60h/96d Inode: 59337267    Links: 1
Access: (0755/-rwxr-xr-x)  Uid: ( 1001/ UNKNOWN)   Gid: (    0/    root)
Access: 2026-06-17 17:20:38.000000000 +0000
Modify: 2026-06-17 17:20:38.000000000 +0000
Change: 2026-06-22 13:25:47.670519442 +0000
Birth: 2026-06-22 13:25:46.922968014 +0000
bash: unexpected EOF while looking for matching `"'
[ble: exit 2]
📦[claudi@claude43 hypershift]$ podman run --rm  -ti --entrypoint /bin/sh quay.io/redhat-user-workloads/crt-redhat-acm-tenant/hypershift-release-mce-217:on-pr-5a84196d0f34721a13adfff9f988dce84b9df140 -c "stat /usr/bin/hypershift-no-cgo"
stat: cannot statx '/usr/bin/hypershift-no-cgo': No such file or directory
[ble: exit 1]
📦[claudi@claude43 hypershift]$ podman run --rm  -ti --entrypoint /bin/sh quay.io/redhat-user-workloads/crt-redhat-acm-tenant/hypershift-release-mce-217:on-pr-5a84196d0f34721a13adfff9f988dce84b9df140 -c "stat /usr/bin/hcp"
stat: cannot statx '/usr/bin/hcp': No such file or directory
[ble: exit 1]
📦[claudi@claude43 hypershift]$

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
openshift-merge-bot Bot merged commit e3ad989 into openshift:release-4.22 Jun 22, 2026
21 checks passed
@openshift-ci-robot

Copy link
Copy Markdown

@yiraeChristineKim: Jira Issue Verification Checks: Jira Issue OCPBUGS-89352
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-89352 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

This is a cherry-pick of PR #8601 onto release-4.22.

What this PR does / why we need it

Remove the hypershift-no-cgo statically compiled binary from Containerfile.operator. The non-FIPS binary causes Enterprise Contract FIPS violations in Konflux builds for MCE.

Fixes: OCPBUGS-89352
Upstream: #8601

Checklist

  • Subject and description added to both commit and PR
  • Relevant issues have been referenced

Made with Cursor

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.

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. area/ci-tooling Indicates the PR includes changes for CI or tooling 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants