From 920bba2ffd9ce7a51598d64eeca14bf0ee3243ef Mon Sep 17 00:00:00 2001 From: Marc CARRE Date: Thu, 29 Jun 2017 14:23:46 +0100 Subject: [PATCH] Fix doc regarding git.io short URLs. GitHub only allows git.io to point to content hosted under github.com, therefore it was not possible to have the short URLs point to Weave Cloud's Launch Generator. --- site/kube-addon.md | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/site/kube-addon.md b/site/kube-addon.md index ed13eda2..fda5254e 100644 --- a/site/kube-addon.md +++ b/site/kube-addon.md @@ -55,20 +55,17 @@ Shut down Kubernetes, and _on all nodes_ perform the following: Then relaunch Kubernetes and install the addon as described above. -**Note:** The URLs: +**Note:** We also maintain the URLs: - [https://git.io/weave-kube](https://git.io/weave-kube), and - [https://git.io/weave-kube-1.6](https://git.io/weave-kube-1.6) -point to: - -- [https://cloud.weave.works/k8s/v1.5/net](https://cloud.weave.works/k8s/v1.5/net), and -- [https://cloud.weave.works/k8s/v1.6/net](https://cloud.weave.works/k8s/v1.6/net). - -In the past, these URLs pointed to the static YAML files for the [latest release](https://github.com/weaveworks/weave/releases/tag/latest_release) of the Weave Net addon, respectively: +which point to the static YAML files for the [latest release](https://github.com/weaveworks/weave/releases/tag/latest_release) of the Weave Net addon, respectively: - [`latest_release/weave-daemonset.yaml`](https://github.com/weaveworks/weave/releases/download/latest_release/weave-daemonset.yaml) and -- [`latest_release/weave-daemonset-k8s-1.6.yaml`](https://github.com/weaveworks/weave/releases/download/latest_release/weave-daemonset-k8s-1.6.yaml). +- [`latest_release/weave-daemonset-k8s-1.6.yaml`](https://github.com/weaveworks/weave/releases/download/latest_release/weave-daemonset-k8s-1.6.yaml), + +and can be used with `kubectl apply -f` as well. ## Upgrading Kubernetes to version 1.6