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

CRI: Comment cleanup/misc fixes

Browse Source 
Comments in initPlatform for Windows states that the options were
Linux specific. Additionally properly wrap an error after trying
to setup CDI on Linux.

Signed-off-by: Danny Canter <danny@dcantah.dev>
This commit is contained in:
Danny Canter 2023-01-02 18:55:31 -08:00
parent 9a7c264d25
commit 3f0edb249b
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cri/server/service_linux.go
View File

@ -92,7 +92,7 @@ func (c *criService) initPlatform() (err error) {
reg := cdi.GetRegistry() reg := cdi.GetRegistry()
err = reg.Configure(cdi.WithSpecDirs(c.config.CDISpecDirs...)) err = reg.Configure(cdi.WithSpecDirs(c.config.CDISpecDirs...))
if err != nil { if err != nil {
return fmt.Errorf("failed to configure CDI registry") return fmt.Errorf("failed to configure CDI registry: %w", err)
} }
} }

5
pkg/cri/server/service_other.go
View File

@ -22,12 +22,13 @@ import (
cni "github.com/containerd/go-cni" cni "github.com/containerd/go-cni"
) )
// initPlatform handles linux specific initialization for the CRI service. // initPlatform handles initialization for the CRI service on non-Windows and non-Linux
// platforms.
func (c *criService) initPlatform() error { func (c *criService) initPlatform() error {
return nil return nil
} }
// cniLoadOptions returns cni load options for the linux. // cniLoadOptions returns cni load options for non-Windows and non-Linux platforms.
func (c *criService) cniLoadOptions() []cni.Opt { func (c *criService) cniLoadOptions() []cni.Opt {
return []cni.Opt{} return []cni.Opt{}
} }

2
pkg/cri/server/service_windows.go
View File

@ -26,7 +26,7 @@ import (
// attaches to // attaches to
const windowsNetworkAttachCount = 1 const windowsNetworkAttachCount = 1
// initPlatform handles linux specific initialization for the CRI service. // initPlatform handles Windows specific initialization for the CRI service.
func (c *criService) initPlatform() error { func (c *criService) initPlatform() error {
pluginDirs := map[string]string{ pluginDirs := map[string]string{
defaultNetworkPlugin: c.config.NetworkPluginConfDir, defaultNetworkPlugin: c.config.NetworkPluginConfDir,