diff --git a/docs/deploy.md b/docs/deploy.md index 8579a77e..925133c7 100644 --- a/docs/deploy.md +++ b/docs/deploy.md @@ -153,10 +153,11 @@ setenforce 0 yum install -y kubernetes-cni ``` -CNI networks should also be configured, note that +CNI networks should also be configured: -- frakti only supports **bridge** network plugin yet -- **subnets should be different on different nodes**, .e.g. `10.244.1.0/24` for the master and `10.244.2.0/24` for the first node +- Skip this section if you want to use existing CNI plugins like Fannel, Weave, Calico etc. +- Otherwise, you can use **bridge** network plugin, it's the simplest way. + - Subnets should be different on different nodes. e.g. `10.244.1.0/24` for the master and `10.244.2.0/24` for the first node ```sh mkdir -p /etc/cni/net.d @@ -219,6 +220,14 @@ systemctl daemon-reload kubeadm init --pod-network-cidr 10.244.0.0/16 --kubernetes-version stable ``` +Configure CNI network plugin (skip this step if you already configured simple bridge plugin) + +```sh +kubectl create -f https://github.com/coreos/flannel/raw/master/Documentation/kube-flannel.yml +``` + +For other plugins, please check [networking doc](./networking.md). + We prefer to use Linux container runtime to handle kube-dns since the default resource limit of hypervisor runtime is not enough. So let's annotate the Pod and let Kubernetes do the rolling update for you. diff --git a/docs/networking.md b/docs/networking.md index ee29499b..c240a3b5 100644 --- a/docs/networking.md +++ b/docs/networking.md @@ -67,7 +67,6 @@ rm -f /etc/cni/net.d/* Then setup flannel plugin by running: ```sh -kubectl create -f https://github.com/coreos/flannel/raw/master/Documentation/kube-flannel-rbac.yml kubectl create -f https://github.com/coreos/flannel/raw/master/Documentation/kube-flannel.yml ```