Add DefaultContainerAnnotations runhcs option #1210
Merged
+872
−534
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
anmaxvl
force-pushed
the
lcow-runhcs-container-annotations-option
branch
from
e6212c5 to
3784904
Compare
anmaxvl
changed the title
anmaxvl
changed the title
|
Assigning to @kevpar, since it was his idea 😄 |
Signed-off-by: Maksim An <maksiman@microsoft.com>
Signed-off-by: Maksim An <maksiman@microsoft.com>
anmaxvl
force-pushed
the
lcow-runhcs-container-annotations-option
branch
from
3784904 to
c5f2a39
Compare
|
@anmaxvl Could you please add a description about why this is required? |
kevpar
reviewed
Nov 9, 2021
Signed-off-by: Maksim An <maksiman@microsoft.com>
anmaxvl
changed the title
kevpar
reviewed
Nov 10, 2021
| @@ -395,5 +395,11 @@ func UpdateSpecFromOptions(s specs.Spec, opts *runhcsopts.Options) specs.Spec { | |||
| s.Annotations[annotations.NetworkConfigProxy] = opts.NCProxyAddr | |||
| } | |||
|
|
|||
| for key, value := range opts.DefaultContainerAnnotations { | |||
There was a problem hiding this comment.
It's weird this code lives in uvm.go, given it is not at all specific to UVMs, or hv-isolation. Perhaps we can address that in a future change.
anmaxvl
pushed a commit
to anmaxvl/hcsshim
that referenced
this pull request
Nov 17, 2021
Related work items: microsoft#1067, microsoft#1097, microsoft#1119, microsoft#1170, microsoft#1176, microsoft#1180, microsoft#1181, microsoft#1182, microsoft#1183, microsoft#1184, microsoft#1185, microsoft#1186, microsoft#1187, microsoft#1188, microsoft#1189, microsoft#1191, microsoft#1193, microsoft#1194, microsoft#1195, microsoft#1196, microsoft#1197, microsoft#1200, microsoft#1201, microsoft#1202, microsoft#1203, microsoft#1204, microsoft#1205, microsoft#1206, microsoft#1207, microsoft#1209, microsoft#1210, microsoft#1211, microsoft#1218, microsoft#1219, microsoft#1220, microsoft#1223
princepereira
pushed a commit
to princepereira/hcsshim
that referenced
this pull request
Aug 29, 2024
protos: Add default_container_annotations to runhcs options protos Assign default container annotations from runhcs options to container spec Annotations, without overriding the ones that are explicitly passed Signed-off-by: Maksim An <maksiman@microsoft.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Add default_container_annotations to runhcs options protos
Set container spec Annotations from runhcs options
This PR adds support for a scenario, when we'd want to set default
annotations on all containers within a deployment, e.g.
/dev/shmsize,container's scratch size or any other setting controlled by annotations.
The default annotations don't override the ones passed explicitly in the
container spec.