OCPBUGS-89360: NO-JIRA: build(operator): drop hypershift-no-cgo from operator container images - #8601
Conversation
|
Pipeline controller notification For optional jobs, comment This repository is configured in: LGTM mode |
|
Skipping CI for Draft Pull Request. |
📝 WalkthroughWalkthroughThis PR modifies Important Pre-merge checks failedPlease resolve all errors before merging. Addressing warnings is optional. ❌ Failed checks (1 error)
✅ Passed checks (10 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #8601 +/- ##
==========================================
+ Coverage 40.61% 41.54% +0.93%
==========================================
Files 755 758 +3
Lines 93227 93838 +611
==========================================
+ Hits 37864 38986 +1122
+ Misses 52640 52107 -533
- Partials 2723 2745 +22 see 66 files with indirect coverage changes
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
|
/pipeline required |
|
Scheduling tests matching the |
|
/test all |
Test Resultse2e-aws
e2e-aks
|
|
/test all |
|
/test e2e-aks |
a7008a0 to
9505671
Compare
|
/test images |
9505671 to
c3e2327
Compare
| RUN make hypershift \ | ||
| && make hypershift-no-cgo \ | ||
| && make hypershift-operator \ | ||
| && make product-cli \ |
There was a problem hiding this comment.
Why removing product-cli? Are we supposed to remove only hypershift-no-cgo ?
There was a problem hiding this comment.
We build product-cli using https://github.com/openshift/hypershift/blob/main/Containerfile.cli
There was a problem hiding this comment.
I'm sorry but I don't understand. Can you shed more light on this? The fact that you build product-cli using that container file doesn't explain to me why you're removing make product-cli.
There was a problem hiding this comment.
I mean. This looks like completely unrelated to hypershift-no-cgo. I don't see any relation. So maybe this should be sent as a separate PR with a better description?
There was a problem hiding this comment.
@mgencur Removing the product-cli seems unrelated but this PR is about removing non-FIPS compliant binaries that are not necessary to run the hypershift operator from the container image and the product-cli is another non-FIPS compliant binary. We deliver the product-cli in a separate CLI download container image and make it available from the cluster for users to download and use.
| FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1777857961 | ||
| COPY --from=builder /hypershift/bin/hypershift \ | ||
| /hypershift/bin/hypershift-no-cgo \ | ||
| /hypershift/bin/hcp \ |
There was a problem hiding this comment.
Why remove hcp ? Are we supposed to remove only hypershift-no-cgo ?
There was a problem hiding this comment.
We build product-cli using https://github.com/openshift/hypershift/blob/main/Containerfile.cli
| RUN make hypershift \ | ||
| && make hypershift-no-cgo \ | ||
| && make hypershift-operator \ | ||
| && make product-cli \ |
There was a problem hiding this comment.
Why product-cli ? Are we supposed to remove only hypershift-no-cgo ?
There was a problem hiding this comment.
We build product-cli using https://github.com/openshift/hypershift/blob/main/Containerfile.cli
|
|
||
| FROM registry.access.redhat.com/ubi9:latest | ||
| COPY --from=builder /hypershift/bin/hypershift \ | ||
| /hypershift/bin/hcp \ |
There was a problem hiding this comment.
Are we supposed to remove only hypershift-no-cgo ?
There was a problem hiding this comment.
We build product-cli using https://github.com/openshift/hypershift/blob/main/Containerfile.cli
| FROM registry.access.redhat.com/ubi9:latest | ||
| COPY --from=builder /hypershift/bin/hypershift \ | ||
| /hypershift/bin/hypershift-no-cgo \ | ||
| /hypershift/bin/hcp \ |
There was a problem hiding this comment.
Are we supposed to remove only hypershift-no-cgo ?
There was a problem hiding this comment.
We build product-cli using https://github.com/openshift/hypershift/blob/main/Containerfile.cli
|
@yiraeChristineKim @rokej do we need to remove the statically compiled binary from all images? My understanding is that we'd only need to do it for the Containerfile(s) built in konflux. |
We are only using the CLI binary built from Containerfile.cli. Are you using a CLI binary built from any container file other than Containerfile.cli? |
|
@csrwng I missed it. Yes, the binaries should be removed only from the konflux container file which is |
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>
c3e2327 to
5b2e110
Compare
|
/cherrypick release-4.22 |
|
/cherrypick release-4.21 |
|
/cherrypick release-4.20 |
|
/cherrypick release-4.19 |
|
@yiraeChristineKim: #8601 failed to apply on top of branch "release-4.22": DetailsIn response to 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 kubernetes-sigs/prow repository. |
|
@yiraeChristineKim: new pull request created: #8753 DetailsIn response to 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 kubernetes-sigs/prow repository. |
|
@yiraeChristineKim: #8601 failed to apply on top of branch "release-4.20": DetailsIn response to 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 kubernetes-sigs/prow repository. |
|
@yiraeChristineKim: #8601 failed to apply on top of branch "release-4.19": DetailsIn response to 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 kubernetes-sigs/prow repository. |
|
/jira backport release-4.22,release-4.21,release-4.20,release-4.19,release-4.18,release-4.17,release-4.16 |
|
@yiraeChristineKim: The following backport issues have been created: Queuing cherrypicks to the requested branches to be created after this PR merges: DetailsIn response to 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-ci-robot: #8601 failed to apply on top of branch "release-4.16": DetailsIn response to 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 kubernetes-sigs/prow repository. |
|
@openshift-ci-robot: #8601 failed to apply on top of branch "release-4.17": DetailsIn response to 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 kubernetes-sigs/prow repository. |
|
@openshift-ci-robot: #8601 failed to apply on top of branch "release-4.18": DetailsIn response to 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 kubernetes-sigs/prow repository. |
|
@openshift-ci-robot: #8601 failed to apply on top of branch "release-4.19": DetailsIn response to 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 kubernetes-sigs/prow repository. |
|
@openshift-ci-robot: #8601 failed to apply on top of branch "release-4.20": DetailsIn response to 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 kubernetes-sigs/prow repository. |
|
@openshift-ci-robot: new pull request could not be created: failed to create pull request against openshift/hypershift#release-4.21 from head openshift-cherrypick-robot:cherry-pick-8601-to-release-4.21: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"A pull request already exists for openshift-cherrypick-robot:cherry-pick-8601-to-release-4.21."}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#create-a-pull-request","status":"422"} DetailsIn response to 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 kubernetes-sigs/prow repository. |
|
@openshift-ci-robot: new pull request created: #8755 DetailsIn response to 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 kubernetes-sigs/prow repository. |
|
/jira cherrypick OCPBUGS-89338 |
|
@yiraeChristineKim: Jira Issue OCPBUGS-89338 has been cloned as Jira Issue OCPBUGS-89360. Will retitle bug to link to clone. DetailsIn response to 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. |
|
@yiraeChristineKim: Jira Issue OCPBUGS-89360: All pull requests linked via external trackers have merged: This pull request has the DetailsIn response to 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. |
What this PR does / why we need it:
Remove the QE-only non-CGO hypershift CLI from production operator images built via Containerfile.operator and Dockerfile. The non-FIPS hypershift-no-cgo binary causes Enterprise Contract FIPS violations in Konflux builds for MCE.
The FIPS-compliant hypershift binary (CGO_ENABLED=1) remains as the shipped CLI. Also remove the hypershift-no-cgo Makefile target and update the build-ho-image skill docs to match.
Conversation
Ref: https://redhat-internal.slack.com/archives/C058TF9K37Z/p1779803011756959
Which issue(s) this PR fixes:
Fixes
Special notes for your reviewer:
Checklist:
Summary by CodeRabbit