From 633166223915ad7e36904a6dcf785ff08d254e30 Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Fri, 12 May 2017 09:47:43 +0000 Subject: [PATCH 1/2] Update install documents (again) --- site/installing.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/installing.md b/site/installing.md index fc997cdbb3..7a422e1a6a 100644 --- a/site/installing.md +++ b/site/installing.md @@ -216,7 +216,7 @@ 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 `` 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 --namespace kube-system -f "https://cloud.weave.works/k8s.yaml?service-token=&k8s-version=$(kubectl version | base64 | tr -d '\n')" + kubectl apply --namespace kube-system -f "https://cloud.weave.works/k8s/scope.yaml?service-token=&k8s-version=$(kubectl version | base64 | tr -d '\n')" **SECURITY NOTE: This allows control of your Kubernetes cluster from Weave Cloud, which is a hosted service.** @@ -224,7 +224,7 @@ Sign up for a [Weave Cloud account](https://cloud.weave.works/) and obtain a tok The simplest way to get the latest release of Scope deployed onto a Kubernetes cluster is by running the following: - kubectl apply --namespace kube-system -f "https://cloud.weave.works/k8s.yaml?k8s-version=$(kubectl version | base64 | tr -d '\n')" + kubectl apply --namespace kube-system -f "https://cloud.weave.works/k8s/scope.yaml?k8s-version=$(kubectl version | base64 | tr -d '\n')" This runs a recent Scope image from Dockerhub and launches a probe onto every node as well as a single Scope app. Once launched, Scope doesn’t require any other configuration. @@ -236,7 +236,7 @@ Allowable parameters for the launcher URL: To download and read the Scope manifest run: - curl --silent --location --remote-name https://cloud.weave.works/k8s/scope.yaml + curl --silent --location --remote-name "https://cloud.weave.works/k8s/scope.yaml?k8s-version=$(kubectl version | base64 | tr -d '\n')" **Open Scope in Your Browser** From 7409e2d844442df774f54807e21051da8c4bc35b Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Fri, 12 May 2017 10:21:35 +0000 Subject: [PATCH 2/2] Review feedback --- site/installing.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/site/installing.md b/site/installing.md index 7a422e1a6a..b7bd389ddf 100644 --- a/site/installing.md +++ b/site/installing.md @@ -234,10 +234,6 @@ Allowable parameters for the launcher URL: - `k8s-service-type` - Kubernetes service type (for running Scope in Standalone mode), can be either `LoadBalancer` or `NodePort`, by default this is unspecified (only internal access) -To download and read the Scope manifest run: - - curl --silent --location --remote-name "https://cloud.weave.works/k8s/scope.yaml?k8s-version=$(kubectl version | base64 | tr -d '\n')" - **Open Scope in Your Browser** kubectl port-forward -n kube-system "$(kubectl get -n kube-system pod --selector=weave-scope-component=app -o jsonpath='{.items..metadata.name}')" 4040