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

Add leading dashes to please controller-gen. #1239

Merged
merged 1 commit into from
Jan 7, 2020
Merged

Conversation

porridge
Copy link
Member

@porridge porridge commented Jan 2, 2020

What this PR does / why we need it:

This is a workaround for bug kubernetes-sigs/controller-tools#377 in controller-gen
which insists on prepending --- lines when they are unnecessary. A proper fix
for that bug is pending in kubernetes-sigs/controller-tools#378 but will likely take some time to be incorporated.

This is another baby step towards #862

Signed-off-by: Marcin Owsiany marcin@owsiany.pl

Signed-off-by: Marcin Owsiany <marcin@owsiany.pl>
Copy link
Member

@kensipe kensipe left a comment

Choose a reason for hiding this comment

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

I'm not against making controller-gen happy. This seems pretty simple and innocuous. The issue here is that this seems to complete with #1240 where these files become auto-gen'ed. Is this the auto-gen output? or?

@porridge
Copy link
Member Author

porridge commented Jan 2, 2020

this seems to complete with #1240

@kensipe, did you mean compete?

This is a requirement for #1240 - otherwise the integration test would report diffs.

Copy link
Contributor

@alenkacz alenkacz left a comment

Choose a reason for hiding this comment

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

LGTM :) I'll try to push for that PR being merged. Unfortunately everyone is probably still on vacation :(

@porridge
Copy link
Member Author

porridge commented Jan 3, 2020

friendly ping @kensipe

@kensipe kensipe merged commit f5e963b into master Jan 7, 2020
ANeumann82 pushed a commit that referenced this pull request Feb 13, 2020
Signed-off-by: Marcin Owsiany <marcin@owsiany.pl>
Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants