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

Re-generate the crds by using line breaking #670

Merged
merged 1 commit into from
Mar 17, 2021
Merged

Re-generate the crds by using line breaking #670

merged 1 commit into from
Mar 17, 2021

Conversation

zhangtbj
Copy link
Contributor

Changes

This is a fix PR for the PR: #667

I also asked Matt and Zoe to verify, they also generate normally WITH line-breaking, but I tried several ways, all didn't work..... Finally, I gave up, I don't know why there is no line-breaking when I ran the make generate-crds in my local Mac.

Maybe because my Mac is more powerful than other ones. :(

Below is what I tried:

  • Ask Matt and Zoe help, they can generate with line-breaking normally on the Mac
  • I tried on Ubuntu, can also generate with line-breaking
  • Then I tried to upgrade my Golang to 1.15, upgrade/downgrade, my controller-gen, change GOPATH, etc... they all didn't work

Because it is ONLY my Mac problem, so I provide this PR to change to the NORMAL format with line-breaking in this PR.

And I will follow the issue kubernetes-sigs/controller-tools#514 (comment) to see how to solve in future.

Thanks!

/kind misc

Submitter Checklist

  • [ n ] Includes tests if functionality changed/was added
  • [ n ] Includes docs if changes are user-facing
  • [ y ] Set a kind label on this PR
  • [ n ] Release notes block has been filled in, or marked NONE

See the contributor guide
for details on coding conventions, github and prow interactions, and the code review process.

Release Notes

None

@openshift-ci-robot
Copy link

@zhangtbj: The label(s) kind/misc cannot be applied, because the repository doesn't have them.

In response to this:

Changes

This is a fix PR for the PR: #667

I also asked Matt and Zoe to verify, they also generate normally WITH line-breaking, but I tried several ways, all didn't work..... Finally, I gave up, I don't know why there is no line-breaking when I ran the make generate-crds in my local Mac.

Maybe because my Mac is more powerful than other ones. :(

Below is what I tried:

  • Ask Matt and Zoe help, they can generate with line-breaking normally on the Mac
  • I tried on Ubuntu, can also generate with line-breaking
  • Then I tried to upgrade my Golang to 1.15, upgrade/downgrade, my controller-gen, change GOPATH, etc... they all didn't work

Because it is ONLY my Mac problem, so I provide this PR to change to the NORMAL format with line-breaking in this PR.

And I will follow the issue kubernetes-sigs/controller-tools#514 (comment) to see how to solve in future.

Thanks!

/kind misc

Submitter Checklist

  • [ n ] Includes tests if functionality changed/was added
  • [ n ] Includes docs if changes are user-facing
  • [ y ] Set a kind label on this PR
  • [ n ] Release notes block has been filled in, or marked NONE

See the contributor guide
for details on coding conventions, github and prow interactions, and the code review process.

Release Notes

None

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Mar 17, 2021
@zhangtbj
Copy link
Contributor Author

/kind misc

@openshift-ci-robot
Copy link

@zhangtbj: The label(s) kind/misc cannot be applied, because the repository doesn't have them.

In response to this:

/kind misc

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@zhangtbj zhangtbj added the release-note-none Label for when a PR does not need a release note label Mar 17, 2021
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Mar 17, 2021
@zhangtbj
Copy link
Contributor Author

/kind cleanup

@openshift-ci-robot openshift-ci-robot added the kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. label Mar 17, 2021
@qu1queee qu1queee self-requested a review March 17, 2021 09:14
@qu1queee
Copy link
Contributor

Thanks, I would like to see what @HeavyWombat thinks on this issue, before approving. PR looks good to me.

Copy link
Contributor

@HeavyWombat HeavyWombat left a comment

Choose a reason for hiding this comment

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

Thanks for looking into this.

To be honest, I was a bit confused at first and it was hard to tell whether the changes here are only whitespace changes. So I checked two things:

  • from your branch, I ran make generate-crd and could confirm that on my system the created files match the ones in this branch
  • used dyff to perform a whitespace independent diff on the YAMLs, which was also fine

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 17, 2021
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: HeavyWombat

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 17, 2021
@openshift-merge-robot openshift-merge-robot merged commit 7a02198 into shipwright-io:master Mar 17, 2021
@adambkaplan adambkaplan added this to the release-v0.4.0 milestone Mar 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm Indicates that a PR is ready to be merged. release-note-none Label for when a PR does not need a release note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants