Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Containerfile.operator
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,11 @@ WORKDIR /hypershift
COPY --chown=default . .

RUN make hypershift \
&& make hypershift-no-cgo \
&& make hypershift-operator \
&& make product-cli \

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why removing product-cli? Are we supposed to remove only hypershift-no-cgo ?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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

&& make karpenter-operator

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 \

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why remove hcp ? Are we supposed to remove only hypershift-no-cgo ?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

/hypershift/bin/hypershift-operator \
/hypershift/bin/karpenter-operator \
/usr/bin/
Expand Down