From fbab5a72804c905f2d5bfebcc0887ef040b88b43 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 29 Mar 2017 08:37:28 +0000 Subject: [PATCH] Review feedback --- site/kube-addon.md | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/site/kube-addon.md b/site/kube-addon.md index 0ba78907..7ba2dd6a 100644 --- a/site/kube-addon.md +++ b/site/kube-addon.md @@ -18,16 +18,13 @@ The following topics are discussed: Weave Net can be installed onto your CNI-enabled Kubernetes cluster with a single command: -``` -kubectl apply -f https://git.io/weave-kube -``` +* Kubernetes versions `1.6` and above: -**Note:** If you are using Kubernetes 1.6 or later, please use this - command instead: + kubectl apply -f https://git.io/weave-kube-1.6 -``` -kubectl apply -f https://git.io/weave-kube-1.6 -``` +* Kubernetes versions up to `1.5`: + + kubectl apply -f https://git.io/weave-kube After a few seconds, a Weave Net pod should be running on each Node and any further pods you create will be automatically attached to the Weave @@ -66,8 +63,9 @@ page](https://github.com/weaveworks/weave/releases). ## Upgrading Kubernetes to version 1.6 In version 1.6, Kubernetes has increased security, so we need to -create a special service account to run Weave Net. This is done in -the file `weave-daemonset-k8s-1.6.yaml` attached to the release. +create a special service account to run Weave Net. This is done in +the file `weave-daemonset-k8s-1.6.yaml` attached to the [Weave Net +release](https://github.com/weaveworks/weave/releases/latest). Also, the [toleration](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/taint-toleration-dedicated.md)