Skip to content
This repository has been archived by the owner on Aug 14, 2020. It is now read-only.

ace validator: fix app annotations validation. #649

Merged

Conversation

sgotti
Copy link
Member

@sgotti sgotti commented Aug 19, 2016

The runtimeApp annotations were merged over themself and not over the image
manifest annotations.

// with PodManifest overrides
expectedAnnots := app.Annotations
expectedAnnots := img.Annotations
a := pm.Apps.Get(app.Name)
Copy link
Contributor

Choose a reason for hiding this comment

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

Great catch, although this raises another point of confusion for me - isn't this line just the same as app??

Copy link
Member Author

Choose a reason for hiding this comment

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

@jonboulle you're right! I removed that code part.

The runtimeApp annotations were merged over themself and not over the image
manifest annotations.
@sgotti sgotti force-pushed the fix_ace_validator_validate_app_annotations branch from d183e7b to 2cd8535 Compare August 19, 2016 20:12
@jonboulle
Copy link
Contributor

LGTM

@jonboulle jonboulle merged commit f4cc07e into appc:master Aug 22, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants