github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-20 00:52:58 +00:00
Code Issues Projects Releases Wiki Activity

adding config and json CNI file support

Browse Source 
check #63

Change-Id: I1dbed42dce356a18e365d0f6a8138c8522ab32d5
Co-authored-by: Doug Smith <dougbtv@users.noreply.github.com>
Co-authored-by: Tomofumi Hayashi <s1061123@users.noreply.github.com>
Co-authored-by: Dan Williams <dcbw@users.noreply.github.com>
This commit is contained in:
kuralamudhan ramakrishnan
2018-04-27 19:43:20 +01:00
committed by Kuralamudhan Ramakrishnan
parent c6a02c4705
commit 9daa880aec
1 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
k8sclient/k8sclient.go
View File

@@ -25,10 +25,15 @@ import (
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
"github.com/Intel-Corp/multus-cni/types" "github.com/Intel-Corp/multus-cni/types"
"github.com/containernetworking/cni/libcni"
"github.com/containernetworking/cni/pkg/skel" "github.com/containernetworking/cni/pkg/skel"
cnitypes "github.com/containernetworking/cni/pkg/types" cnitypes "github.com/containernetworking/cni/pkg/types"
) )
const (
DefaultConfDir = "/etc/cni/net.d"
)
// NoK8sNetworkError indicates error, no network in kubernetes // NoK8sNetworkError indicates error, no network in kubernetes
type NoK8sNetworkError struct { type NoK8sNetworkError struct {
message string message string
@@ -120,13 +125,43 @@ func parsePodNetworkObject(podnetwork string) ([]map[string]interface{}, error)
} }
func getCNIConfig(name string, primary bool, ifname string) (string, error) { func getCNIConfig(name string, primary bool, ifname string) (string, error) {
//Todo
// In the absence of valid keys in a Spec, the runtime (or // In the absence of valid keys in a Spec, the runtime (or
// meta-plugin) should load and execute a CNI .configlist // meta-plugin) should load and execute a CNI .configlist
// or .config (in that order) file on-disk whose JSON // or .config (in that order) file on-disk whose JSON
// “name” key matches this Network object’s name. // “name” key matches this Network object’s name.
return "", nil
//Todo
// support conflist for chaining mechanism
// In part, adapted from K8s pkg/kubelet/dockershim/network/cni/cni.go#getDefaultCNINetwork
confDir := DefaultConfDir
files, err := libcni.ConfFiles(confDir, []string{".conf", ".json"})
switch {
case err != nil:
fmt.Errorf("No networks found in %s", confDir)
case len(files) == 0:
fmt.Errorf("No networks found in %s", confDir)
}
for _, confFile := range files {
conf, err := libcni.ConfFromFile(confFile)
if err != nil {
return "", fmt.Errorf("Error loading CNI config file %s: %v", confFile, err)
}
if conf.Network.Name == name {
// Ensure the config has a "type" so we know what plugin to run.
// Also catches the case where somebody put a conflist into a conf file.
if conf.Network.Type == "" {
return "", fmt.Errorf("Error loading CNI config file %s: no 'type'; perhaps this is a .conflist?", confFile)
}
return getConfig(string(conf.Bytes[:]), primary, ifname), nil
}
}
return "", fmt.Errorf("no network available in the name %s in cni dir %s", name, confDir)
} }
func getPlugin(plugin string, name string, primary bool, ifname string) string { func getPlugin(plugin string, name string, primary bool, ifname string) string {
@@ -144,7 +179,7 @@ func getPlugin(plugin string, name string, primary bool, ifname string) string {
tmpconfig = append(tmpconfig, "}") tmpconfig = append(tmpconfig, "}")
return strings.Join(tmpconfig,"") return strings.Join(tmpconfig, "")
} }
@@ -163,7 +198,7 @@ func getConfig(config string, primary bool, ifname string) string {
tmpconfig = append(tmpconfig, config[1:]) tmpconfig = append(tmpconfig, config[1:])
return strings.Join(tmpconfig,"") return strings.Join(tmpconfig, "")
} }