Pass in index annotations from builds on multiple nodes #2546
Conversation
treuherz
force-pushed
the
multinode-annotations
branch
from
3371dbd
to
7443fbd
Compare
build/build.go
Outdated
| @@ -607,7 +608,15 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s | |||
| } | |||
| } | |||
|
|
|||
| dt, desc, err := itpull.Combine(ctx, srcs, nil, false) | |||
| filteredAnnotations := map[exptypes.AnnotationKey]string{} | |||
There was a problem hiding this comment.
Could you move this to helper function filterManifestIndexAnnotations() (ignore if #2546 (comment))
build/build.go
Outdated
| @@ -61,6 +61,7 @@ type Options struct { | |||
|
|
|||
| Ref string | |||
| Allow []entitlements.Entitlement | |||
| Annotations map[exptypes.AnnotationKey]string | |||
There was a problem hiding this comment.
The annotations should already exist in the Exports array. Can we make a helper function to extract it from there instead of new field.
There was a problem hiding this comment.
I'm not sure about this. In Exports they've all had their keys stringified into e.g. annotation-index to fit into the Attrs map, so we'd need to re-parse those keys if we wanted to pull them back out. I agree the duplication doesn't feel great but at least this way it's the same parsing function twice from the same source, rather than parsing once, serialising and parsing agian.
There was a problem hiding this comment.
I think it is correct though. The serialized format is the format the builder accepts and this multi-node merge case is a special case where we are doing part of the build ourself. If/when buildkit supported multiple nodes then we would not do the client side and only sent the Exports to buildkit. Maybe some part of the parsing code from BuildKit can be reused in here to reduce code.
There was a problem hiding this comment.
Ok, I see what you mean. I'll take care of it
treuherz
force-pushed
the
multinode-annotations
branch
from
7443fbd
to
b26d08a
Compare
|
TIL GitHub doesn't handle force-pushes to PRs the way I expected. Hope this isn't a problem, will use follow-up commits next time 😬 |
Fixes docker#2540 Signed-off-by: Eli Treuherz <[email protected]>
Signed-off-by: Eli Treuherz <[email protected]>
treuherz
force-pushed
the
multinode-annotations
branch
from
7f3ba3c
to
6f45b0e
Compare
I've tried to put together the smallest possible change that I think should solve #2540, but I'm not sure where or if to add a good test.
Fixes #2540