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

Adds support for specifying image labels and annotation in buildrun #944

Merged
merged 1 commit into from
Nov 22, 2021

Conversation

sm43
Copy link
Contributor

@sm43 sm43 commented Nov 15, 2021

This adds support for specifying image labels and annotations in
buildrun. While generating the taskrun spec, the labels annotation
will merged with the ones specified in build object. Values in
buildrun will task precedence over in build.

Part of #922

Signed-off-by: Shivam Mukhade smukhade@redhat.com

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

Users can now specify output image labels and annotation in BuildRun which will be merged with Build's before adding to the image.

@openshift-ci openshift-ci bot added release-note Label for when a PR has specified a release note do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Nov 15, 2021
@openshift-ci openshift-ci bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. and removed release-note Label for when a PR has specified a release note labels Nov 15, 2021
@sm43
Copy link
Contributor Author

sm43 commented Nov 15, 2021

/kind feature

@openshift-ci openshift-ci bot added the kind/feature Categorizes issue or PR as related to a new feature. label Nov 15, 2021
@sm43
Copy link
Contributor Author

sm43 commented Nov 16, 2021

@SaschaSchwarze0 Could you please take a look if the approach looks good? and
where else adding a test would be good? :)

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.

Nice work. Suggesting a few changes.

pkg/reconciler/buildrun/resources/taskrun.go Outdated Show resolved Hide resolved
pkg/reconciler/buildrun/resources/taskrun.go Outdated Show resolved Hide resolved
pkg/reconciler/buildrun/resources/taskrun_test.go Outdated Show resolved Hide resolved
@openshift-ci openshift-ci bot added release-note Label for when a PR has specified 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 Nov 18, 2021
This adds support for specifying image labels and annotations in
buildrun. While generating the taskrun spec, the labels annotation
will merged with the ones specified in build object. Values in
buildrun will task precedence over in build.

Signed-off-by: Shivam Mukhade <smukhade@redhat.com>
@sm43 sm43 changed the title [WIP] Adds support for specifying image labels and annotation in buildrun Adds support for specifying image labels and annotation in buildrun Nov 21, 2021
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 21, 2021
@sm43 sm43 requested a review from SaschaSchwarze0 November 22, 2021 04:18
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.

Thank you. Nice work @sm43.

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 22, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 22, 2021

[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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 22, 2021
@openshift-merge-robot openshift-merge-robot merged commit c720a27 into shipwright-io:main Nov 22, 2021
@sm43 sm43 deleted the buildrun-image branch November 22, 2021 11:04
@SaschaSchwarze0 SaschaSchwarze0 added this to the release-v0.7.0 milestone Dec 9, 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/feature Categorizes issue or PR as related to a new feature. lgtm Indicates that a PR is ready to be merged. release-note Label for when a PR has specified a release note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants