Skip to content

add labels and annotations from buildrequest to resulting build#8405

Merged
openshift-bot merged 1 commit intoopenshift:masterfrom
bparees:annotations
Apr 26, 2016
Merged

add labels and annotations from buildrequest to resulting build#8405
openshift-bot merged 1 commit intoopenshift:masterfrom
bparees:annotations

Conversation

@bparees
Copy link
Copy Markdown
Contributor

@bparees bparees commented Apr 7, 2016

fixes #8352

return nil, err
}

// add labels and annotations
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

comment why the build annotations take priority

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

yeah just completed that comment, was a premature push. sorry.

@bparees
Copy link
Copy Markdown
Contributor Author

bparees commented Apr 7, 2016

@openshift/api-review ptal, i've chosen the approach of reusing the labels/annotations from the buildrequest, rather than adding new fields to the buildrequest struct. This seemed reasonable since the buildrequest itself is not a resource that gets stored/queried/etc, so its label/annotation fields serve no purpose.

@mfojtik ptal

@bparees bparees added this to the 1.2.x milestone Apr 7, 2016
@bparees bparees force-pushed the annotations branch 2 times, most recently from ae92176 to 92ecffb Compare April 7, 2016 21:01
@bparees
Copy link
Copy Markdown
Contributor Author

bparees commented Apr 7, 2016

[test]

@bparees
Copy link
Copy Markdown
Contributor Author

bparees commented Apr 11, 2016

@mfojtik @openshift/api-review bump

@smarterclayton
Copy link
Copy Markdown
Contributor

smarterclayton commented Apr 11, 2016 via email

@bparees
Copy link
Copy Markdown
Contributor Author

bparees commented Apr 11, 2016

@smarterclayton post 3.2.

return nil, err
}

// add labels and annotations from the buildrequest. existing label/annotations will take
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nit: capitalize 'Add' ;-)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

changed.

On Tue, Apr 12, 2016 at 3:49 AM, Michal Fojtik notifications@github.com
wrote:

In pkg/build/generator/generator.go
#8405 (comment):

@@ -235,6 +236,11 @@ func (g *BuildGenerator) Instantiate(ctx kapi.Context, request *buildapi.BuildRe
return nil, err
}

  • // add labels and annotations from the buildrequest. existing label/annotations will take

nit: capitalize 'Add' ;-)


You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub
https://github.com/openshift/origin/pull/8405/files/92ecffb3fe73de3f18a98486624aacf1c313df1b#r59333822

Ben Parees | OpenShift

@mfojtik
Copy link
Copy Markdown
Contributor

mfojtik commented Apr 12, 2016

LGTM

@openshift-bot
Copy link
Copy Markdown
Contributor

Evaluated for origin test up to efbbf67

@openshift-bot
Copy link
Copy Markdown
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/2923/)

@bparees
Copy link
Copy Markdown
Contributor Author

bparees commented Apr 26, 2016

[merge]

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 26, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/2923/) (Image: devenv-rhel7_4039)

@openshift-bot
Copy link
Copy Markdown
Contributor

Evaluated for origin merge up to efbbf67

@openshift-bot openshift-bot merged commit 25ae95e into openshift:master Apr 26, 2016
@bparees bparees deleted the annotations branch April 27, 2016 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Allow labels & annotations to be passed to Build via instantiate

5 participants