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

Merge pull request #11 from redhat-nfvpe/dev/default_network

Browse Source 
[npwg] Prototype for default network
This commit is contained in:
Doug Smith
2018-04-06 13:11:58 -04:00
committed by GitHub
parent 20676c5d22 dc111cbdac
commit ceef90f8b6
2 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
README.md
View File

@@ -451,6 +451,23 @@ Given the following network configuration:
EOF EOF
``` ```
### Further options for CNI configuration file.
One may also specify `always_use_default` as a boolean value. This option requires that you're using the CRD method (and therefore requires that you must also specify both the `kubeconfig` and the `delegates` option as well, or Multus will present an error message). In the case that `always_use_default` is true, the `delegates` network will always be applied, along with those specified in the annotations.
For example, a valid configuration using the `always_use_default` may look like:
```
{
"name": "multus-cni-network",
"type": "multus",
"delegates": [{"type": "flannel", "isDefaultGateway": true, "masterplugin": true}],
"always_use_default": true,
"kubeconfig": "/etc/kubernetes/kubelet.conf"
}
```
## Testing the Multus CNI ## ## Testing the Multus CNI ##
### Multiple Flannel Network ### Multiple Flannel Network
Github user [YYGCui](https://github.com/YYGCui) has used Multiple flannel network to work with Multus CNI plugin. Please refer this [closed issue](https://github.com/Intel-Corp/multus-cni/issues/7) for Multiple overlay network support with Multus CNI. Github user [YYGCui](https://github.com/YYGCui) has used Multiple flannel network to work with Multus CNI plugin. Please refer this [closed issue](https://github.com/Intel-Corp/multus-cni/issues/7) for Multiple overlay network support with Multus CNI.

35
multus/multus.go
View File

@@ -49,6 +49,7 @@ type NetConf struct {
CNIDir string `json:"cniDir"` CNIDir string `json:"cniDir"`
Delegates []map[string]interface{} `json:"delegates"` Delegates []map[string]interface{} `json:"delegates"`
Kubeconfig string `json:"kubeconfig"` Kubeconfig string `json:"kubeconfig"`
UseDefault bool `json:"always_use_default"`
} }
type netplugin struct { type netplugin struct {
@@ -88,7 +89,14 @@ func loadNetConf(bytes []byte) (*NetConf, error) {
defaultcninetwork = true defaultcninetwork = true
} }
if netconf.Kubeconfig != "" && !defaultcninetwork { if netconf.UseDefault {
if netconf.Kubeconfig == "" || !defaultcninetwork {
return nil, fmt.Errorf(`If you have set always_use_default, you must also set the delegates & the kubeconfig, refer to the README`)
}
return netconf, nil
}
if !netconf.UseDefault && (netconf.Kubeconfig != "" && !defaultcninetwork) {
return netconf, nil return netconf, nil
} }
@@ -541,8 +549,20 @@ func cmdAdd(args *skel.CmdArgs) error {
} }
} }
// If it's empty just leave it as the netconfig states (e.g. just default)
if len(podDelegate) != 0 { if len(podDelegate) != 0 {
n.Delegates = podDelegate if n.UseDefault {
// In the case that we force the default
// We add the found configs from CRD
for _, eachDelegate := range podDelegate {
eachDelegate["masterplugin"] = false
n.Delegates = append(n.Delegates,eachDelegate)
}
} else {
// Otherwise, only the CRD delegates are used.
n.Delegates = podDelegate
}
} }
} }
@@ -609,7 +629,16 @@ func cmdDel(args *skel.CmdArgs) error {
} }
if len(podDelegate) != 0 { if len(podDelegate) != 0 {
in.Delegates = podDelegate if in.UseDefault {
// In the case that we force the default
// We add the found configs from CRD (in reverse order)
for i := len(podDelegate)-1; i >= 0; i-- {
podDelegate[i]["masterplugin"] = false
in.Delegates = append(in.Delegates,podDelegate[i])
}
} else {
in.Delegates = podDelegate
}
} }
} }