mirror of
https://github.com/k8snetworkplumbingwg/multus-cni.git
synced 2025-10-21 23:48:25 +00:00
Refine multus config file (masterplugin and always_use_default)
This fix removes 'masterplugin' and 'always_use_default' from multus config file. default network, defined in /etc/cni/net.d/*conf should be master and this network should be used as default from network plumbing working group draft.
This commit is contained in:
committed by
Kuralamudhan Ramakrishnan
parent
600ca0824b
commit
215ddb5a1d
21
README.md
21
README.md
@@ -54,7 +54,6 @@ Go 1.5 users will need to set `GO15VENDOREXPERIMENT=1` to get vendored dependenc
|
||||
* `type` (string, required): "multus"
|
||||
* `kubeconfig` (string, optional): kubeconfig file for the out of cluster communication with kube-apiserver, Refer the doc
|
||||
* `delegates` (([]map,required): number of delegate details in the Multus, ignored in case kubeconfig is added.
|
||||
* `masterplugin` (bool,required): master plugin to report back the IP address and DNS to the container
|
||||
|
||||
## Usage with Kubernetes CRD/TPR based Network Objects
|
||||
|
||||
@@ -303,8 +302,7 @@ sriov-conf Network.v1.kubernetes-network.cni.cncf.io
|
||||
"kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml",
|
||||
"delegates": [{
|
||||
"type": "weave-net",
|
||||
"hairpinMode": true,
|
||||
"masterplugin": true
|
||||
"hairpinMode": true
|
||||
}]
|
||||
}
|
||||
```
|
||||
@@ -443,7 +441,6 @@ Given the following network configuration:
|
||||
},
|
||||
{
|
||||
"type": "flannel",
|
||||
"masterplugin": true,
|
||||
"delegate": {
|
||||
"isDefaultGateway": true
|
||||
}
|
||||
@@ -454,22 +451,6 @@ 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 ##
|
||||
### 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.
|
||||
|
Reference in New Issue
Block a user