Skip to content

UPSTREAM: <drop>: regenerate code #14594

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

Merged
merged 2 commits into from
Jun 15, 2017

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Jun 12, 2017

Requires openshift/kubernetes#31 .

This is needed or status changes don't take affect

@deads2k
Copy link
Contributor Author

deads2k commented Jun 12, 2017

[test]

@@ -1,4 +1,20 @@
// +build !ignore_autogenerated_openshift
// +build !ignore_autogenerated
Copy link
Contributor

Choose a reason for hiding this comment

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

why do we get the boilerplate now? Didn't we remove that before?

@@ -65,8 +65,10 @@ func DeepCopy_wardle_FlunderList(in interface{}, out interface{}, c *conversion.
in, out := &in.Items, &out.Items
*out = make([]Flunder, len(*in))
for i := range *in {
if err := DeepCopy_wardle_Flunder(&(*in)[i], &(*out)[i], c); err != nil {
if newVal, err := c.DeepCopy(&(*in)[i]); err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

Interersting that we now go through the schema. Any idea why?

Copy link
Contributor

Choose a reason for hiding this comment

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

we have the same upstream. Maybe a regression there, not critical, just slow.

@deads2k
Copy link
Contributor Author

deads2k commented Jun 12, 2017

I just re-ran the build in openshift/kubernetes and it produced this, which I then picked here. I didn't investigate what the generator did

@sttts
Copy link
Contributor

sttts commented Jun 12, 2017

I was of the impression that we drop the boilerplate somewhere, but cannot find it. @stevekuznetsov do you remember?

Other than that, lgtm.

@deads2k
Copy link
Contributor Author

deads2k commented Jun 12, 2017

I was of the impression that we drop the boilerplate somewhere, but cannot find it. @stevekuznetsov do you remember?

Well @sttts, I found it, but it won't make you happy. Looks like we have our own, separate, openshift generator too. Regenerated the regenerated code. This is nuts and its not even consistent between deep copy and conversion

@@ -16090,16 +16090,19 @@ func (x *ISCSIVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) {
} else {
yysep2 := !z.EncBinary()
yy2arr2 := z.EncBasicHandle().StructToArray
var yyq2 [7]bool
var yyq2 [10]bool
Copy link
Contributor

Choose a reason for hiding this comment

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

wow, this was scary

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have no idea what that is doing.

Copy link
Contributor

Choose a reason for hiding this comment

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

#14112 picked in API changes without regenerating files.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

And now I do and I wish I didn't. Ouch.

Copy link
Contributor

Choose a reason for hiding this comment

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

And we have no verify-generated-code job in CI :-/

Copy link
Contributor

Choose a reason for hiding this comment

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

I thought we did for the bits we expected to generate (proto, deep copy, conversion, etc). Previously, we removed generated ugorji in origin, and so we didn't care about generating it.

@stevekuznetsov
Copy link
Contributor

I was of the impression that we drop the boilerplate somewhere, but cannot find it.

I found it, but it won't make you happy. Looks like we have our own, separate, openshift generator too.

@deads2k @sttts I am going to need a little more background to answer this one

@deads2k
Copy link
Contributor Author

deads2k commented Jun 12, 2017

[merge][severity:blocker] to unstick @DirectXMan12

re[test]

(edited by liggitt to add blocker)

@liggitt
Copy link
Contributor

liggitt commented Jun 12, 2017

this LGTM, though we need a follow-up to remove all the types.generated.go files throughout the tree... those came in accidentally with the rebase

@openshift-bot
Copy link
Contributor

openshift-bot commented Jun 12, 2017

continuous-integration/openshift-jenkins/merge Waiting: You are in the build queue at position: 1

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to e5d76df

@deads2k deads2k added the lgtm Indicates that a PR is ready to be merged. label Jun 14, 2017
@openshift-bot
Copy link
Contributor

Evaluated for origin test up to e5d76df

@liggitt liggitt added this to the 3.6.0 milestone Jun 14, 2017
@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/2235/) (Base Commit: ee9f436)

@smarterclayton smarterclayton merged commit 2df56bd into openshift:master Jun 15, 2017
@deads2k deads2k deleted the agg-06-status-2 branch August 3, 2017 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants