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.

Sign up for GitHub

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

Jump to bottom

Propagate annotations from BuildStrategy to TaskRun #539

Merged
merged 1 commit into from
Jan 21, 2021
Merged

Propagate annotations from BuildStrategy to TaskRun #539

merged 1 commit into from
Jan 21, 2021

Conversation

SaschaSchwarze0
Copy link
Member

@SaschaSchwarze0 SaschaSchwarze0 commented Jan 18, 2021 •
edited
Loading

This is the implementation of the enhancement proposal Propagating annotations from the build strategy to the pod.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 18, 2021
@SaschaSchwarze0 SaschaSchwarze0 force-pushed the sascha-520-propagate-strategy-annotations branch 4 times, most recently from a4452e5 to 8d96dda Compare January 19, 2021 15:51
@SaschaSchwarze0 SaschaSchwarze0 changed the title WIP: Propagate annotations from BuildStrategy to TaskRun Propagate annotations from BuildStrategy to TaskRun Jan 19, 2021
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 19, 2021
zhangtbj
zhangtbj reviewed Jan 20, 2021
View reviewed changes
Copy link
Contributor

@zhangtbj zhangtbj 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 the PR, Sascha.

Please review the comments.

docs/buildstrategies.md Outdated Show resolved Hide resolved
pkg/controller/buildrun/generate_taskrun.go Outdated Show resolved Hide resolved
pkg/controller/buildrun/generate_taskrun.go Outdated Show resolved Hide resolved
test/integration/buildstrategy_to_taskruns_test.go Outdated Show resolved Hide resolved
test/integration/clusterbuildstrategy_to_taskruns_test.go Outdated Show resolved Hide resolved
@SaschaSchwarze0 SaschaSchwarze0 force-pushed the sascha-520-propagate-strategy-annotations branch from 8d96dda to b1bf0b0 Compare January 20, 2021 07:27
@SaschaSchwarze0
Copy link
Member Author

Thanks for the PR, Sascha.

Please review the comments.

Done. Thank you @zhangtbj

@zhangtbj
Copy link
Contributor

I don't know what is the official process to review the PR with multiple reviewers.

It looks good to me now.

But I cannot approve it now because it will be merged automatically once other people add /lgtm later.

@SaschaSchwarze0
Copy link
Member Author

I don't know what is the official process to review the PR with multiple reviewers.

It looks good to me now.

But I cannot approve it now because it will be merged automatically once other people add /lgtm later.

You can give your approval through the usual GitHub mechanism, this does not trigger any labels being added, I think.

@zhangtbj
Copy link
Contributor

Yes, there is no approved label, but I remember last time, I did that, just approved by myself then you add /lgtm label, then CIBot adds approved label automatically, you can see the history in the PR: #515

  • zhangtbj approved these changes on Dec 16, 2020
  • SaschaSchwarze0 approved these changes on Dec 17, 2020
  • You add /lgtm then openshift-ci-robot added the lgtm label on Dec 17, 2020
  • openshift-ci-robot added the approved label on Dec 17, 2020
  • PR is merged directly... :(

Let me approve this PR and let us see.

@zhangtbj zhangtbj self-requested a review January 21, 2021 08:52
@zhangtbj
Copy link
Contributor

After I approve the PR, the status of this PR is:

  • 1 approval
  • zhangtbj approved these changes

@SaschaSchwarze0
Copy link
Member Author

After I approve the PR, the status of this PR is:

* 1 approval

* `zhangtbj approved these changes`

Right, and no labels have been added. That's what the bot is looking for.

@zhangtbj
Copy link
Contributor

We can have a try later, if we all agree on the PR, let one reviewer add /lgtm, I think the PR will be merged automatically even without the approved label (it is not what we desired).

@SaschaSchwarze0
Copy link
Member Author

We can have a try later, if we all agree on the PR, let one reviewer add /lgtm, I think the PR will be merged automatically even without the approved label (it is not what we desired).

I think that's how it behaved but this has been re-configured. Somebody can try, I think when I recently tried /lgtm, only the lgtm label was added.

@qu1queee qu1queee removed their request for review January 21, 2021 12:30
HeavyWombat
HeavyWombat requested changes Jan 21, 2021
View reviewed changes
pkg/controller/buildrun/generate_taskrun.go Outdated Show resolved Hide resolved
test/build_samples.go Outdated Show resolved Hide resolved
@SaschaSchwarze0 SaschaSchwarze0 force-pushed the sascha-520-propagate-strategy-annotations branch from b1bf0b0 to 3da6b2d Compare January 21, 2021 15:10
HeavyWombat
HeavyWombat approved these changes Jan 21, 2021
View reviewed changes
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 checking out that we still can have constants even with the string concatenations.

@HeavyWombat
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 21, 2021
@HeavyWombat
Copy link
Contributor

/approve

@HeavyWombat
Copy link
Contributor

/assign @SaschaSchwarze0

@HeavyWombat HeavyWombat added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 21, 2021
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

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-merge-robot openshift-merge-robot merged commit 750087f into shipwright-io:master Jan 21, 2021
@SaschaSchwarze0 SaschaSchwarze0 deleted the sascha-520-propagate-strategy-annotations branch January 22, 2021 08:44
@SaschaSchwarze0 SaschaSchwarze0 mentioned this pull request Feb 26, 2021
Closed
@gabemontero gabemontero mentioned this pull request Apr 23, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zhangtbj zhangtbj zhangtbj approved these changes

@HeavyWombat HeavyWombat HeavyWombat approved these changes

@gabemontero gabemontero Awaiting requested review from gabemontero

@sbose78 sbose78 Awaiting requested review from sbose78

Assignees

@HeavyWombat HeavyWombat

@SaschaSchwarze0 SaschaSchwarze0

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@SaschaSchwarze0 @zhangtbj @HeavyWombat @openshift-ci-robot @openshift-merge-robot