From ec5fd6c923db160a462541bd7903ff918d4aad9c Mon Sep 17 00:00:00 2001 From: dougbtv Date: Thu, 7 May 2020 16:11:31 -0400 Subject: [PATCH] Move pre-1.16 Kubernetes assets to a deprecated folder (to later remove) --- doc/quickstart.md | 11 +++-------- .../multus-daemonset-crio-pre1.16.yml | 0 .../multus-daemonset-gke-pre-1.16.yml | 0 images/{ => deprecated}/multus-daemonset-pre-1.16.yml | 0 4 files changed, 3 insertions(+), 8 deletions(-) rename images/{ => deprecated}/multus-daemonset-crio-pre1.16.yml (100%) rename images/{ => deprecated}/multus-daemonset-gke-pre-1.16.yml (100%) rename images/{ => deprecated}/multus-daemonset-pre-1.16.yml (100%) diff --git a/doc/quickstart.md b/doc/quickstart.md index b273bb876..ee45b58e8 100644 --- a/doc/quickstart.md +++ b/doc/quickstart.md @@ -15,6 +15,8 @@ Two things we'll refer to a number of times through this document are: Our installation method requires that you first have installed Kubernetes and have configured a default network -- that is, a CNI plugin that's used for your pod-to-pod connectivity. +We recommend Kubernetes 1.16 or later. + To install Kubernetes, you may decide to use [kubeadm](https://kubernetes.io/docs/setup/independent/create-cluster-kubeadm/), or potentially [kubespray](https://github.com/kubernetes-sigs/kubespray). After installing Kubernetes, you must install a default network CNI plugin. If you're using kubeadm, refer to the "[Installing a pod network add-on](https://kubernetes.io/docs/setup/independent/create-cluster-kubeadm/#pod-network)" section in the kubeadm documentation. If it's your first time, we generally recommend using Flannel for the sake of simplicity. @@ -39,19 +41,12 @@ Firstly, clone this GitHub repository. git clone https://github.com/intel/multus-cni.git && cd multus-cni ``` -If you're using Kubernetes 1.16+, we'll apply a YAML file with `kubectl` from this repo. +We'll apply a YAML file with `kubectl` from this repo. ``` $ cat ./images/multus-daemonset.yml | kubectl apply -f - ``` -Or, for Kubernetes versions < 1.16, use the prior version yaml: - -``` -$ cat ./images/multus-daemonset-pre-1.16.yml | kubectl apply -f - -``` - - ### What the Multus daemonset does * Starts a Multus daemonset, this runs a pod on each node which places a Multus binary on each node in `/opt/cni/bin` diff --git a/images/multus-daemonset-crio-pre1.16.yml b/images/deprecated/multus-daemonset-crio-pre1.16.yml similarity index 100% rename from images/multus-daemonset-crio-pre1.16.yml rename to images/deprecated/multus-daemonset-crio-pre1.16.yml diff --git a/images/multus-daemonset-gke-pre-1.16.yml b/images/deprecated/multus-daemonset-gke-pre-1.16.yml similarity index 100% rename from images/multus-daemonset-gke-pre-1.16.yml rename to images/deprecated/multus-daemonset-gke-pre-1.16.yml diff --git a/images/multus-daemonset-pre-1.16.yml b/images/deprecated/multus-daemonset-pre-1.16.yml similarity index 100% rename from images/multus-daemonset-pre-1.16.yml rename to images/deprecated/multus-daemonset-pre-1.16.yml