github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1593 from moolen/fix/add-nri-labels

Browse Source 
Add missing sandbox labels when invoking nri
This commit is contained in:
Michael Crosby 2020-10-07 13:17:06 -04:00 committed by GitHub
commit a0b3b4e4da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/server/container_start.go
View File

@ -127,6 +127,7 @@ func (c *criService) StartContainer(ctx context.Context, r *runtime.StartContain
if nric != nil { if nric != nil {
nriSB := &nri.Sandbox{ nriSB := &nri.Sandbox{
ID: sandboxID, ID: sandboxID,
Labels: sandbox.Config.Labels,
} }
if _, err := nric.InvokeWithSandbox(ctx, task, v1.Create, nriSB); err != nil { if _, err := nric.InvokeWithSandbox(ctx, task, v1.Create, nriSB); err != nil {
return nil, errors.Wrap(err, "nri invoke") return nil, errors.Wrap(err, "nri invoke")