Merge remote-tracking branch 'origin/1.9'

site/kube-addon.md

@@ -18,9 +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:
+
+    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
@@ -51,11 +55,26 @@ Shut down Kubernetes, and _on all nodes_ perform the following:
 Then relaunch Kubernetes and install the addon as described
 above.
 
-The URL [https://git.io/weave-kube](https://git.io/weave-kube) points
+The URLs https://git.io/weave-kube and https://git.io/weave-kube-1.6 point
 to the YAML file for the latest release of the Weave Net addon.
 Historic versions are archived on our [GitHub release
 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 [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)
+required to let Weave Net run on master nodes has moved from an
+annotation to a field on the DaemonSet spec object.
+
+If you have edited the Weave Net DaemonSet from a previous release,
+you will need to re-make your changes against the new version.
+
 ###<a name="daemon-sets"></a> Upgrading the Daemon Sets
 
 Kubernetes does not currently support rolling upgrades of daemon sets,