feat: generalize container tool usage in Makefile template #6932
+19
−8
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9c416f9 to
66a2529
Compare
There was a problem hiding this comment.
Hi @rhuss
Thank you for your contribution 🥇
I think that is OK because matches with the scaffold of kubebuilder: https://github.com/kubernetes-sigs/kubebuilder/blob/master/testdata/project-v4/Makefile
However, you need to run make install and make generate locally to ensure that those files are properly updated in the testdata.
Signed-off-by: Roland Huß <rhuss@redhat.com>
Signed-off-by: Roland Huß <rhuss@redhat.com>
9566ad4 to
1a11e7c
Compare
|
Thanks! Regenerated makefiles now. |
Signed-off-by: Roland Huß <rhuss@redhat.com>
df2d9c6 to
1228903
Compare
|
For non-go Makefiles the $CONTAINER_TOOL needs to be included in the fragment, vor go Makefiles it comes from kubebuilder. Adapted the template accordingly. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of the change:
This PR generalizes the container tool usage in the bundle build target to respect the
CONTAINER_TOOLvariable. The change replaces the hardcodeddockercommand with$(CONTAINER_TOOL)in thebundle-buildtarget of the Makefile template, making it consistent with other container-related targets in the operator-sdk.Motivation for the change:
Currently, the bundle build target hardcodes the use of
dockeras the container tool, which is inconsistent with other parts of the operator-sdk that respect theCONTAINER_TOOLvariable. This change:Checklist
If the pull request includes user-facing changes, extra documentation is required:
changelog/fragments(seechangelog/fragments/00-template.yaml)website/content/en/docs