diff --git a/README.md b/README.md index c9a760949..8ddc15655 100644 --- a/README.md +++ b/README.md @@ -32,13 +32,6 @@ We apply these files as such: $ cat ./images/{multus-daemonset.yml,flannel-daemonset.yml} | kubectl apply -f - ``` -Note: For crio runtime use multus-crio-daemonset.yml (crio uses /usr/libexec/cni as default path for plugin directory). Before deploying daemonsets,delete all default network plugin configuration files under /etc/cni/net.d -If the runtime is cri-o, then apply these files. - -``` -$ cat ./images/{multus-crio-daemonset.yml,flannel-daemonset.yml} | kubectl apply -f - -``` - This will configure your systems to be ready to use Multus CNI, but, to get started with adding additional interfaces to your pods, refer to our complete [quick-start guide](doc/quickstart.md) ## Additional installation Options diff --git a/doc/quickstart.md b/doc/quickstart.md index 4c8734d13..6c75b5a37 100644 --- a/doc/quickstart.md +++ b/doc/quickstart.md @@ -27,6 +27,12 @@ We'll apply files to `kubectl` from this repo. The files we're applying here spe $ cat ./images/{multus-daemonset.yml,flannel-daemonset.yml} | kubectl apply -f - ``` +Note: For crio runtime use multus-crio-daemonset.yml (crio uses /usr/libexec/cni as default path for plugin directory). Before deploying daemonsets,delete all default network plugin configuration files under /etc/cni/net.d +If the runtime is cri-o, then apply these files. + +``` +$ cat ./images/{multus-crio-daemonset.yml,flannel-daemonset.yml} | kubectl apply -f - +``` ### Validating your installation Generally, the first step in validating your installation is to look at the `STATUS` field of your nodes, you can check it out by looking at: diff --git a/images/README.md b/images/README.md index 1288ca882..706268365 100644 --- a/images/README.md +++ b/images/README.md @@ -17,10 +17,6 @@ You may wish to deploy Multus as a daemonset, you can do so by starting with the ``` $ kubectl create -f ./images/multus-daemonset.yml ``` -Note: For crio runtime use multus-crio-daemonset.yml (crio uses /usr/libexec/cni as default path for plugin directory). Before deploying daemonsets,delete all default network plugin configuration files under /etc/cni/net.d -``` -$ kubectl create -f ./images/multus-crio-daemonset.yml -``` Note: The likely best practice here is to build your own image given the Dockerfile, and then push it to your preferred registry, and change the `image` fields in the Daemonset YAML to reference that image.