Skip to content
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

Prep for not checking in generated, part 2/2 #28579

Merged

Conversation

thockin
Copy link
Member

@thockin thockin commented Jul 7, 2016

This PR is extracted from #25978 and build on #28578 - it is just the conversion related parts. All the Makefile stuff is excluded.

@wojtek-t this is literally branched, a bunch of commits deleted, and a very small number of manual fixups applied. If you think this is easier to review (and if it passes CI) you can feel free to go over it again. I will follow this with a conversion-related PR to build on this.

Or if you prefer, just close this and let the mega-PR ride.

@lavalamp

@k8s-github-robot k8s-github-robot added kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. release-note-label-needed labels Jul 7, 2016
@k8s-bot
Copy link

k8s-bot commented Jul 7, 2016

GCE e2e build/test passed for commit 00ec4fd4a2599d783efdcfe51b67cb244ac34414.

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 7, 2016
@thockin thockin added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Jul 7, 2016
@thockin thockin force-pushed the dont-checkin-generated-code-prep-2 branch from 00ec4fd to 8708f59 Compare July 7, 2016 06:21
@thockin thockin removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 7, 2016
@k8s-bot
Copy link

k8s-bot commented Jul 7, 2016

GCE e2e build/test passed for commit 8708f5954c3c3c35993f3329fc736410c5a2d8f5.

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 8, 2016
@wojtek-t
Copy link
Member

wojtek-t commented Jul 8, 2016

@thockin - an you please rebase?

thockin added 9 commits July 7, 2016 22:09
This is just comment clarity.
This was causing us to process packages we didn't really want, which was only
visible when debugging was enabled.
This is to clarify the intent of the code for new readers (me).
This is to clarify the code.  No actual effect at the moment, but I manually
verified this in the case of identical types.
This is used subsequently to simplify the conversion generation, so each
package can declare what peer-packages it uses, and have those imported
dynamically, rather than having one mega list of packages to import and not
really being clear why, for any given list item.
This drives conversion generation from file tags like:
  // +conversion-gen=k8s.io/my/internal/version
.. rather than hardcoded lists of packages.

The only net change in generated code can be explained as correct.  Previously
it didn't know that conversion was available.
There are ample opportunities to optimize and streamline here.  For example,
there's no reason to have a function to convert IntStr to IntStr. Removing the
function does generate the right assignment, but it is unclear whether the
registered function is needed or not.  I opted to leave it alone for now.
Another example is Convert_Slice_byte_To_Slice_byte, which just seems silly.
This fixes PodSpec to generate cleanly.  No other types only half-generate (so
now we Fatalf), though several fail to generate at all (only Errorf for now).
@thockin thockin force-pushed the dont-checkin-generated-code-prep-2 branch from 8708f59 to a892b26 Compare July 8, 2016 05:09
@thockin
Copy link
Member Author

thockin commented Jul 8, 2016

@wojtek-t part 1 is in, this is now rebased onto it.

@thockin thockin removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 8, 2016
@k8s-github-robot k8s-github-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 8, 2016
@wojtek-t
Copy link
Member

wojtek-t commented Jul 8, 2016

Yes - I've seen part 1 is in. Will look into this one in few minutes.

@thockin
Copy link
Member Author

thockin commented Jul 8, 2016

You're awesome! I owe you a drink or a meal or something :)

On Thu, Jul 7, 2016 at 10:14 PM, Wojciech Tyczynski <
notifications@github.com> wrote:

Yes - I've seen part 1 is in. Will look into this one in few minutes.


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#28579 (comment),
or mute the thread
https://github.com/notifications/unsubscribe/AFVgVIpWdHT_BqnwgmsJ79-UPMaI-9D_ks5qTdyygaJpZM4JGvXr
.

@k8s-bot
Copy link

k8s-bot commented Jul 8, 2016

GCE e2e build/test passed for commit a892b26.

@wojtek-t
Copy link
Member

wojtek-t commented Jul 8, 2016

LGTM

@wojtek-t wojtek-t added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 8, 2016
@thockin thockin added the priority/backlog Higher priority than priority/awaiting-more-evidence. label Jul 8, 2016
@thockin
Copy link
Member Author

thockin commented Jul 8, 2016

rebased twice in 24 hours. Making p2.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Jul 8, 2016

GCE e2e build/test passed for commit a892b26.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit dbab1a8 into kubernetes:master Jul 8, 2016
@thockin thockin deleted the dont-checkin-generated-code-prep-2 branch November 2, 2016 06:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/backlog Higher priority than priority/awaiting-more-evidence. release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants