-
Notifications
You must be signed in to change notification settings - Fork 25
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Migrate code-gen to kube_codegen.sh #412
Conversation
edaf113
to
d3a22e0
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you alter the split into two commits like this:
- import new deps + update Makefile+any other tooling necessary
- regenerate everything (
make generate
) and commit the resulting changes
It is much easier for us to review (review first commit, skim through resulting changes in the second), much easier for you to rebase (just drop the tip-most commit, rerun make generate
the commit the changes) and much easier for me to test it on top of my tree (just cherry-pick for first commit with the tooling changes and run make generate
). With the current version, the last two of these will cause unavoidable conflicts because the relevant changes are not split from the side-effects.
Sure, I will do as you suggested here because I currently it is messed up :) |
d3a22e0
to
cc933d6
Compare
@klihub PTAL. Updated the commits. |
@fmuyassarov When I try a
|
cc933d6
to
e64033a
Compare
@fmuyassarov I still get the same failure with this latest version. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you test on your side with my proposed one-liner change ?
With that in place now make generate
works for me. I wonder if this then breaks for you, since the original version worked with $REPO_ROOT as the current working directory...
e64033a
to
0b69c07
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This really LGTM now. I have a few small nits. Some of the shell-quoting ones should be taken with a grain of salt though, especially if shellcheck disagrees with me.
I think this could be merged. Preferably with klihubs comments addressed. Now that I looked at this: just a general note that my personal feeling is that the Makefile is getting somewhat hairy'ish with all the phony rules and army of variables (like |
0b69c07
to
55d484a
Compare
This a valid point but I would prefer to do that clean up as a follow up. |
Yeah, was just a note, food for thought... And I'm not sure that everybody agrees... |
55d484a
to
8ee81a8
Compare
rebased.... |
- import new deps - update Makefile targets - introduce update_codegen.sh for code generation in a new format Signed-off-by: Feruzjon Muyassarov <[email protected]>
Signed-off-by: Feruzjon Muyassarov <[email protected]>
8ee81a8
to
94974e7
Compare
@klihub This is now rebased on top of your merged patches. |
Yes, as long as we think it through beforehand and make such changes so that 1) we can still pass the tooling version(s) to be used from the Makefile rule to the script, and 2) the script is smart enough to not re-clone and re-compile the tooling binaries if I run twice But maybe I'd prefer to let things settle now for a while and go with these changes before we start again touching this stuff... |
Migrate to kube_codegen.sh and bump k8s libraries along the way to the same version as
k8s.io/code-generator
.I decided to wait for #406 to land but it should not block you from giving review on this.