Update install docs #2257

errordeveloper · 2017-02-17T14:06:35Z

site/installing.md

@@ -240,14 +240,40 @@ Allowable parameters for the launcher URL:

 To download and read the Scope manifest run:

-    curl --silent -L --remote-name https://cloud.weave.works/launch/k8s/weavescope.yaml
+    curl --silent --remote-name https://cloud.weave.works/k8s/scope.yaml


2opremio · 2017-02-17T14:15:22Z

LGTM (modulo optional minor knit) assuming it was tested for OS re-tested for kubernetes

site/installing.md

@@ -220,15 +218,15 @@ Weave Cloud hosts the Scope UI for you, provides secure access control for your

 Sign up for a [Weave Cloud account](https://cloud.weave.works/) and obtain a token. Replace `<token>` with your token by running this on the master node or on whatever machine that has `kubectl` configured to authenticate to your Kubernetes cluster:

-    $ kubectl apply -f 'https://cloud.weave.works/launch/k8s/weavescope.yaml?service-token=<token>'
+    kubectl apply -n kube-system -f 'https://cloud.weave.works/k8s/scope.yaml?service-token=<token>'


site/installing.md

@@ -83,25 +83,23 @@ Suppose you have the following nodes in a cluster:
 Using the IP addresses, you will manually peer each node with all of the other nodes during Scope launch.

 **1. Run the following on each node:**
-=======


site/installing.md


 In the steps that follow, you will manually peer each node with all of the other nodes during Scope launch.

 **1. To begin run the following on each node:**
->>>>>>> Docs update with new version


site/installing.md

@@ -220,15 +218,15 @@ Weave Cloud hosts the Scope UI for you, provides secure access control for your

 Sign up for a [Weave Cloud account](https://cloud.weave.works/) and obtain a token. Replace `<token>` with your token by running this on the master node or on whatever machine that has `kubectl` configured to authenticate to your Kubernetes cluster:

-    $ kubectl apply -f 'https://cloud.weave.works/launch/k8s/weavescope.yaml?service-token=<token>'
+    kubectl apply -n kube-system -f 'https://cloud.weave.works/k8s/scope.yaml?service-token=<token>'


site/installing.md

+##<a name="ose"></a>Installing Scope on OpenShift
+
+To install Weave Scope on OpenShift, you first need to login as `admin` user:
+


site/installing.md

+    oc login -u admin
+
+Next, create a dedicated project for Weave Scope and apply policy permissions to allow Weave Scope to access Kubernetes API:
+


site/installing.md

+
+The installation method for Scope on OpenShift is very similar to the one described above for Kubernetes, but instead of `kubectl apply -n kube-system ...` you need to use
+`oc apply ...` and install it into the namespace of the `weave-scope` project you have just created, and not the `kube-system` namesapce, i.e.:
+


errordeveloper · 2017-02-17T16:03:36Z

@abuehrle I've addressed you comments above, please take another look 👍

2opremio · 2017-02-27T16:51:20Z

Ping

errordeveloper · 2017-02-28T19:30:22Z

I've tested it, but after seeing #2258 I'm puzzled if we should publicise the OpenShift instructions... I will need to test on a different installation.

errordeveloper · 2017-02-28T19:31:40Z

However, I must that these instructions are functional as such.

- use `kube-system` namespace - use prefered URL instead of backward-compatible one

errordeveloper · 2017-03-07T13:11:24Z

@2opremio @abuehrle I've commented out OpenShift part for the time being, as it's more critical to ensure that general Kubernetes instructions are correct.

2opremio reviewed Feb 17, 2017

View reviewed changes

errordeveloper commented Feb 17, 2017

View reviewed changes

site/installing.md Outdated

In the steps that follow, you will manually peer each node with all of the other nodes during Scope launch.

**1. To begin run the following on each node:**

>>>>>>> Docs update with new version

This comment was marked as abuse.

Sign in to view

errordeveloper force-pushed the update-install-docs branch from 8f7b9ba to a1d188e Compare February 17, 2017 14:53

abuehrle reviewed Feb 17, 2017

View reviewed changes

errordeveloper force-pushed the update-install-docs branch from a1d188e to 3e06e43 Compare February 17, 2017 15:57

errordeveloper force-pushed the update-install-docs branch from ae612fb to 1b34e03 Compare February 17, 2017 16:19

errordeveloper mentioned this pull request Feb 17, 2017

pod names missing #2258

Closed

abuehrle mentioned this pull request Feb 20, 2017

Documentation improvements #2252

Merged

errordeveloper added 6 commits March 7, 2017 13:08

Update Kubernetes instructions

2e33495

- use `kube-system` namespace - use prefered URL instead of backward-compatible one

Make all commands formatted consistently

faf308e

Document installation on OpenShift

ce24f3d

Improve text in OpenShift section

4ef338e

Comment out the OpenShift section until weaveworks#2258 is fixed

b63bc0a

Fix indentation

b415a86

errordeveloper force-pushed the update-install-docs branch from 1b34e03 to b415a86 Compare March 7, 2017 13:10

2opremio approved these changes Mar 29, 2017

View reviewed changes

2opremio merged commit c3a4496 into weaveworks:master Mar 29, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update install docs #2257

Update install docs #2257

errordeveloper commented Feb 17, 2017

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

2opremio commented Feb 17, 2017

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

errordeveloper commented Feb 17, 2017

2opremio commented Feb 27, 2017

errordeveloper commented Feb 28, 2017

errordeveloper commented Feb 28, 2017

errordeveloper commented Mar 7, 2017

		##<a name="ose"></a>Installing Scope on OpenShift

		To install Weave Scope on OpenShift, you first need to login as `admin` user:

		oc login -u admin

		Next, create a dedicated project for Weave Scope and apply policy permissions to allow Weave Scope to access Kubernetes API:


		The installation method for Scope on OpenShift is very similar to the one described above for Kubernetes, but instead of `kubectl apply -n kube-system ...` you need to use
		`oc apply ...` and install it into the namespace of the `weave-scope` project you have just created, and not the `kube-system` namesapce, i.e.:

Update install docs #2257

Update install docs #2257

Conversation

errordeveloper commented Feb 17, 2017

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

2opremio commented Feb 17, 2017

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

errordeveloper commented Feb 17, 2017

2opremio commented Feb 27, 2017

errordeveloper commented Feb 28, 2017

errordeveloper commented Feb 28, 2017

errordeveloper commented Mar 7, 2017