This repository has been archived by the owner on Feb 24, 2020. It is now read-only.
app/add: Allow to define annotations for app from CLI #3814
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
iaguis
suggested changes
Sep 27, 2017
stage0/common.go
Outdated
| } | ||
| kAci, err := types.NewACIdentifier(k) | ||
| if err != nil { | ||
| return ra, err |
There was a problem hiding this comment.
Can we do
return errwrap.Wrap(fmt.Errorf("error parsing annotation key %q", k), err)I'd like to avoid confusing errors like these:
> sudo -E rkt --debug app add 64a8c4bf kinvolk.io/aci/busybox --annotation=FOO=BAR --name=buzyboxz
stage0: locking pod manifest
stage0: Loading image sha512-140375b2a2bd836559a7c978f36762b75b80a7665e5d922db055d1792d6a4182
stage0: Writing image manifest
add: error adding app to pod
└─ACIdentifier must contain only lower case alphanumeric characters plus "-._~/"
rkt/cli_apps.go
Outdated
| @@ -600,12 +600,49 @@ func (au *appName) Type() string { | |||
| return "appName" | |||
| } | |||
|
|
|||
| // appAnnotation is for --user-annotation flags in the form of: --user-annotation=NAME=VALUE. | |||
| // appAnnotation is for --annotation flags in the form of: --annotation=NAME=VALUE | |||
There was a problem hiding this comment.
Can we do --annotation=name=value since for annotations the key has to be an ACIdentifier and can't be upper case.
|
You could also add a functional test in https://github.com/rkt/rkt/blob/master/tests/rkt_metadata_service_test.go that starts pods with |
nhlfr
force-pushed
the
nhlfr/app-add-annotations-cli
branch
2 times, most recently
from
e3acbb3 to
b7904c2
Compare
nhlfr
changed the title
|
@iaguis done, PTAL |
iaguis
approved these changes
Sep 28, 2017
| }{ | ||
| { | ||
| args: []string{ | ||
| "--annotation=foo=bar", |
There was a problem hiding this comment.
can we use different key/value to differentiate from user annotations here?
Before this change, "app add" 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 directories for CRI-compatible logs). Defining annotations is allowed here by --annotation CLI option (i.e. --annotation=foo=bar). Ref rkt#3813
nhlfr
force-pushed
the
nhlfr/app-add-annotations-cli
branch
from
b7904c2 to
18f7624
Compare
This was referenced Oct 18, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before this change, "app add" 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 directories for CRI-compatible
logs).
Defining annotations is allowed here by --annotation
CLI option (i.e. --annotation=foo=bar).
Ref #3813
TODO: