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

app/sandbox: Allow to define annotations for sandbox from CLI #3816

Merged
merged 1 commit into from
Sep 29, 2017

Conversation

nhlfr
Copy link
Contributor

@nhlfr nhlfr commented Sep 29, 2017

Before this change, "app sandbox" CLI allowed only to define
user annotations. User annotations were designed mostly to
store annotations from Kubernetes API. At the same time, we
want to store some data related to rktlet which aren't k8s
annotations (i.e. log mode).

Defining annotations is allowed here by --annotation CLI
option (i.e. --annotation=foo=bar).

Ref #3813

@nhlfr nhlfr force-pushed the nhlfr/sandbox-annotations-cli branch from c00e255 to d4a8c68 Compare September 29, 2017 13:30
Copy link
Member

@iaguis iaguis left a comment

Choose a reason for hiding this comment

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

typo

func parseAnnotations(flagUserAnnotations *kvMap) types.UserAnnotations {
if flagUserAnnotations.IsEmpty() {
func parseUserAnnotations(flagUserAnnotations *kvMap) types.UserAnnotations {
if flagAnnotations.IsEmpty() {
Copy link
Member

Choose a reason for hiding this comment

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

This should be flagUserAnnotations

Before this change, "app sandbox" CLI allowed only to define
user annotations. User annotations were designed mostly to
store annotations from Kubernetes API. At the same time, we
want to store some data related to rktlet which aren't k8s
annotations (i.e. log mode).

Defining annotations is allowed here by --annotation CLI
option (i.e. --annotation=foo=bar).

Ref rkt#3813
Copy link
Member

@iaguis iaguis left a comment

Choose a reason for hiding this comment

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

lgtm

@iaguis iaguis merged commit f2f123c into rkt:master Sep 29, 2017
@iaguis iaguis mentioned this pull request Sep 29, 2017
@iaguis iaguis added this to the 1.29.0 milestone Sep 29, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants