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

cni: pass in the cgroupPath capability argument

Browse Source 
There is a new CNI capability argument, cgroupPath, where runtimes can
pass cgroup paths to CNI plugins.

Implement that.

Signed-off-by: Casey Callendrello <cdc@isovalent.com>
This commit is contained in:
Casey Callendrello 2023-02-08 15:57:30 +01:00
parent d14758b605
commit 0166783c79
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cri/sbserver/sandbox_run.go
View File

@ -396,6 +396,10 @@ func cniNamespaceOpts(id string, config *runtime.PodSandboxConfig) ([]cni.Namesp
opts = append(opts, cni.WithCapabilityDNS(*dns)) opts = append(opts, cni.WithCapabilityDNS(*dns))
} }
if cgroup := config.GetLinux().GetCgroupParent(); cgroup != "" {
opts = append(opts, cni.WithCapabilityCgroupPath(cgroup))
}
return opts, nil return opts, nil
} }

4
pkg/cri/server/sandbox_run.go
View File

@ -597,6 +597,10 @@ func cniNamespaceOpts(id string, config *runtime.PodSandboxConfig) ([]cni.Namesp
opts = append(opts, cni.WithCapabilityDNS(*dns)) opts = append(opts, cni.WithCapabilityDNS(*dns))
} }
if cgroup := config.GetLinux().GetCgroupParent(); cgroup != "" {
opts = append(opts, cni.WithCapabilityCgroupPath(cgroup))
}
return opts, nil return opts, nil
} }