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

config: DRY up labels with annotations reference #639

Merged
merged 1 commit into from
Apr 6, 2017

Conversation

vbatts
Copy link
Member

@vbatts vbatts commented Apr 5, 2017

from
#635 (comment)
it was clear that all the rules for Labels are the same as
annotations, so let's DRY that up a bit.

Signed-off-by: Vincent Batts vbatts@hashbangbash.com

from
opencontainers#635 (comment)
it was clear that all the rules for `Labels` are the same as
annotations, so let's DRY that up a bit.

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
@vbatts
Copy link
Member Author

vbatts commented Apr 5, 2017

cc @stevvooe how's this?

@jonboulle
Copy link
Contributor

oh, hmm, seems reasonable enough

Keys using the `org.opencontainers.image` namespace are reserved and MUST NOT be used by subsequent specifications.
If there are no labels then this property MAY either be absent or an empty map.
Implementations that are reading/processing this configuration file MUST NOT generate an error if they encounter an unknown labels key.
This OPTIONAL property MUST use the [annotation rules](annotations.md#rules).
Copy link
Contributor

Choose a reason for hiding this comment

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

While the other annotations references (e.g. here) use the “This OPTIONAL property…” pattern, config.md puts the OPTIONAL/REQUIRED-ness in the same line as the property name (while manifest.md does not). My preferred larger fix would be to follow runtime-spec and consistently declare OPTIONAL/REQUIRED-ness in the same line as the property name, but if that's too big to bite off here, I'd rather reword this line to not repeat OPTIONAL. Something like:

This property MUST use the annotation rules.

would be fine.

Copy link
Contributor

Choose a reason for hiding this comment

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

follow up?

Copy link
Contributor

Choose a reason for hiding this comment

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

follow up?

Filed as #642.

@stevvooe
Copy link
Contributor

stevvooe commented Apr 5, 2017

LGTM

Approved with PullApprove

@jonboulle
Copy link
Contributor

jonboulle commented Apr 6, 2017

lgtm

Approved with PullApprove

@jonboulle jonboulle merged commit 5c74099 into opencontainers:master Apr 6, 2017
@vbatts vbatts mentioned this pull request May 19, 2017
@vbatts vbatts deleted the label-to-annotation-ref branch July 19, 2017 17:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants