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

Fix the git link for main branch #667

Merged
merged 1 commit into from
Mar 16, 2021
Merged

Fix the git link for main branch #667

merged 1 commit into from
Mar 16, 2021

Conversation

zhangtbj
Copy link
Contributor

@zhangtbj zhangtbj commented Mar 16, 2021

Changes

Fix for issue: #666

  • Fixed some wrong repo link (after switch to main branch)
  • Fixed several Tekton related document link
  • Change the Revision comment from Ref is a git reference. Optional. "master" is used by default. to Ref is a git reference. Optional. If not defined, it will fallback to the git repository default branch.
  • Re-generate the crds by using the make generate-crds then change to the correct name and yaml format by using our agreed new controller-gen way.

/kind documentation

Submitter Checklist

  • Includes tests if functionality changed/was added
  • Includes docs if changes are user-facing
  • Set a kind label on this PR
  • 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 openshift-ci-robot added the kind/documentation Categorizes issue or PR as related to documentation. label Mar 16, 2021
@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 16, 2021
@zhangtbj zhangtbj added release-note-none Label for when a PR does not need a release note and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Mar 16, 2021
@@ -1,6 +1,11 @@

Copy link
Contributor

Choose a reason for hiding this comment

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

why the name change? we already change this twice.

Copy link
Member

@SaschaSchwarze0 SaschaSchwarze0 Mar 16, 2021

Choose a reason for hiding this comment

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

Was also confused, but based on Jordan's comment

Re-generate the crds by using the make generate-crds then change to the correct name and yaml format by using our agreed new controller-gen way.

this is how they are generated. I just ran make generare-crds locally and for me the files are also generated with the names that Jordan has in his commit.

Copy link
Member

Choose a reason for hiding this comment

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

Interestingly, my generated files still contain the line breaks which I like more than the very long lines in Jordan's commit. Hm. @zhangtbj I got controller-gen installed via the hack/install-controller-gen.sh script. Do you maybe run a different version of the tool?

Copy link
Contributor Author

@zhangtbj zhangtbj Mar 16, 2021

Choose a reason for hiding this comment

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

Yes, I use the official make generare-crds command by following our doc.

The version I am using is (On Mac):

✘-1 $ ./controller-gen --version
Version: v0.4.1

Same as the version which is defined here: https://github.com/shipwright-io/build/blob/master/hack/install-controller-gen.sh#L14

Copy link
Member

Choose a reason for hiding this comment

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

Funny detail. I just read newline discrepancy in CRDs generated by controller-gen #514 three times. They describe it the other way around. There, Mac output has line breaks, but Ubuntu not. You're on Mac while I am on Ubuntu and we observe it vice versa. They suggest to pipe through yq to prevent large git diffs, but that is not really nice as well. Honestly, this is one of these kinds of things where I wonder how the hack must the code look that produces such a discrepancy. lol

I think I approve, may the second reviewer decide if we can live with this.

Copy link
Contributor

Choose a reason for hiding this comment

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

@zhangtbj but you are also adding new fields on the CRDS, might be an explanation on why will not hurt?

Copy link
Contributor

Choose a reason for hiding this comment

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

I double check this. Its fine for me to keep the new names, code wise it make sense. I had a different opinion before, but I was on the wrong path.

Copy link
Member

@SaschaSchwarze0 SaschaSchwarze0 left a comment

Choose a reason for hiding this comment

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

/approve

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: SaschaSchwarze0

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 16, 2021
@qu1queee qu1queee self-requested a review March 16, 2021 11:18
Copy link
Contributor

@qu1queee qu1queee left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 16, 2021
@openshift-merge-robot openshift-merge-robot merged commit 07f2390 into shipwright-io:master Mar 16, 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/documentation Categorizes issue or PR as related to documentation. 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