From a92cfc1ffe5c15513e548ae24e544f3a1dc3e72e Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Tue, 21 Mar 2017 15:28:41 +0000 Subject: [PATCH 1/2] Added instructions for Kubernetes 1.6 changes --- site/kube-addon.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/site/kube-addon.md b/site/kube-addon.md index 4465acd2..0ba78907 100644 --- a/site/kube-addon.md +++ b/site/kube-addon.md @@ -22,6 +22,13 @@ with a single command: kubectl apply -f https://git.io/weave-kube ``` +**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 +``` + 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 network. @@ -51,11 +58,25 @@ 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 release. + +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. + ### Upgrading the Daemon Sets Kubernetes does not currently support rolling upgrades of daemon sets, From fbab5a72804c905f2d5bfebcc0887ef040b88b43 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 29 Mar 2017 08:37:28 +0000 Subject: [PATCH 2/2] 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)