Skip to content
This repository has been archived by the owner on Jun 20, 2024. It is now read-only.

Commit

Permalink
TO SQUASH: Address PR's comments/feedback points.
Browse files Browse the repository at this point in the history
  • Loading branch information
marccarre committed May 23, 2017
1 parent 889dfb5 commit ba74c7d
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions site/kube-addon.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,17 @@ Shut down Kubernetes, and _on all nodes_ perform the following:
Then relaunch Kubernetes and install the addon as described
above.

**Note:** URLs:
**Note:** 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 respectively to:
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 were pointing to static YAML files for the [latest release](https://github.com/weaveworks/weave/releases/tag/latest_release) of the Weave Net addon, respectively:
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:

- [`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).
Expand Down Expand Up @@ -209,7 +209,7 @@ UDP connection from 10.32.0.7:56648 to 10.32.0.11:80 blocked by Weave NPC.

#### Using `cloud.weave.works`

If you are getting your YAML file from `cloud.weave.works` as described above, then you can customise it by passing some of Weave Net's options, arguments and environment variables as query parameters:
If the YAML file is from `cloud.weave.works` as described above, then you can customise it by passing some of Weave Net's options, arguments and environment variables as query parameters:

- `version`: Weave Net's version. Default: `latest`, i.e. latest release. *WARNING*: Backward compatibility of the YAML is not guaranteed. If you lock Weave Net's version using something else than `latest` for this query parameter, please make sure you do so with the latest release, save a copy of the YAML and use this copy instead of downloading it every time from `cloud.weave.works`.
- `known-peers`: comma-separated list of hosts. Default: empty.
Expand Down Expand Up @@ -263,7 +263,7 @@ $ curl -fsSLo weave-daemonset.yaml "https://cloud.weave.works/k8s/net?k8s-versio

#### Manually editing the YAML file

Whether you saved the YAML file served at `cloud.weave.works` or downloaded a static YAML file from our [releases page](https://github.com/weaveworks/weave/releases), you can manually edit it to suit your needs.
Whether you saved the YAML file served from `cloud.weave.works` or downloaded a static YAML file from our [releases page](https://github.com/weaveworks/weave/releases), you can manually edit it to suit your needs.

For example,
- additional arguments may be supplied to the Weave router process by adding them to the `command:` array in the YAML file,
Expand Down

0 comments on commit ba74c7d

Please sign in to comment.