Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion cni.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,16 @@ func (c *libcni) Status() error {
if err := c.ready(); err != nil {
return err
}

// STATUS is only called for CNI Version 1.1.0 or greater. It is ignored for previous versions.
for _, v := range c.networks {
err := c.cniConfig.GetStatusNetworkList(context.Background(), v.config)
err := checkPluginExists(c, v.config)

if err != nil {
return err
}

err = c.cniConfig.GetStatusNetworkList(context.Background(), v.config)

if err != nil {
return err
Expand Down
35 changes: 35 additions & 0 deletions opts.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package cni
import (
"fmt"
"os"
"path/filepath"
"sort"
"strings"

Expand Down Expand Up @@ -270,3 +271,37 @@ func loadFromConfDir(c *libcni, maxConfigs int) error {
c.networks = append(c.networks, networks...)
return nil
}

func checkPluginExists(c *libcni, confList *cnilibrary.NetworkConfigList) error {
missing := make(map[string]interface{})
for _, plug := range confList.Plugins {
plugin := plug.Network.Type
for _, dir := range c.pluginDirs {
if !fileExistsInDir(dir, plugin) {
missing[plugin] = plugin
} else {
delete(missing, plugin)
break
}
}
}

if len(missing) > 0 {
var plugins []string
for k := range missing {
plugins = append(plugins, k)
}

return fmt.Errorf("unable to find cni plugins %s in directories %s: %v",
strings.Join(plugins, ", "), strings.Join(c.pluginDirs, ", "), ErrInvalidConfig)
}

return nil
}

// FileExistsInDir checks if a file exists in a specific directory
func fileExistsInDir(directory, filename string) bool {
filePath := filepath.Join(directory, filename)
_, err := os.Stat(filePath)
return !os.IsExist(err)
}
Loading