Skip to content

Add DefaultContainerAnnotations runhcs option #1210

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.

Sign up for GitHub

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

Merged
anmaxvl merged 3 commits into from
Nov 10, 2021
Merged

Add DefaultContainerAnnotations runhcs option #1210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f753fe
protos: Add global_container_annotations to runhcs options protos
anmaxvl Oct 28, 2021
c5f2a39
Set container spec Annotations from runhcs options
anmaxvl Oct 28, 2021
e1d85dc
Update field name to DefaultContainerAnnotations
anmaxvl Nov 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
694 changes: 427 additions & 267 deletions cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions cmd/containerd-shim-runhcs-v1/options/runhcs.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ message Options {
// The typical example is if Containerd has restarted but is expected to come back online. A 0 for this field is interpreted as an infinite
// timeout.
int32 io_retry_timeout_in_sec = 17;

// default_container_annotations specifies a set of annotations that should be set for every workload container
map<string, string> default_container_annotations = 18;
}

// ProcessDetails contains additional information about a process. This is the additional
Expand Down
6 changes: 6 additions & 0 deletions internal/oci/uvm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Copy link
Copy Markdown
Member

@kevpar kevpar Nov 10, 2021

Choose a reason for hiding this comment

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

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.

// Make sure not to override any annotations which are set explicitly
if _, ok := s.Annotations[key]; !ok {
s.Annotations[key] = value
}
}
return s
}
Loading