From 2850fdef3e3ee45d8b45dfc057992675fda0842d Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Tue, 10 May 2016 14:31:01 +0200 Subject: [PATCH] Tweaks to the docs --- site/installing.md | 14 ++------- site/k8s/scope.yaml | 73 --------------------------------------------- 2 files changed, 3 insertions(+), 84 deletions(-) delete mode 100644 site/k8s/scope.yaml diff --git a/site/installing.md b/site/installing.md index 79d53f44a..09ae7023f 100644 --- a/site/installing.md +++ b/site/installing.md @@ -173,26 +173,18 @@ It is recommended that you run Scope natively in your Kubernetes cluster using t The simplest way to get the latest release of Scope deployed onto a Kubernetes cluster is the following: -``` -kubectl create -f 'https://scope.weave.works/k8s-gen/weavescope.json' --validate=false -``` + kubectl create -f 'https://scope.weave.works/k8s-gen/weavescope.json' --validate=false Allowable parameters: - - `v` - Weave Scope version or tag, e.g. `latest` or `0.15.0`, current release is the default - +- `v` - Weave Scope version or tag, e.g. `latest` or `0.15.0`, current release is the default - `service-token` - Weave Scope Cloud Service token - - `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 the Scope manifest, use the YAML version of the manifest, since it is easier to read, for example: -``` -curl --silent --remote-name https://scope.weave.works/k8s-gen/weavescope.yaml -``` - - kubectl create -f https://git.io/scope-k8s + curl --silent --remote-name https://scope.weave.works/k8s-gen/weavescope.yaml This runs a recent Scope image from the Docker Hub and will launch a probe onto every node as well as a single app. Once launched, Scope doesn’t require any other configuration and it also doesn’t depend on Weave Net. diff --git a/site/k8s/scope.yaml b/site/k8s/scope.yaml deleted file mode 100644 index c1c995093..000000000 --- a/site/k8s/scope.yaml +++ /dev/null @@ -1,73 +0,0 @@ -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: ReplicationController - metadata: - name: weavescope-app - namespace: kube-system - labels: - name: weavescope-app - spec: - replicas: 1 - template: - metadata: - labels: - provider: weavescope-app - spec: - containers: - - name: weavescope-app - image: weaveworks/scope:0.15 - args: - - --no-probe - - --app.weave.addr= - ports: - - containerPort: 4040 - hostPort: 4040 -- apiVersion: v1 - kind: Service - metadata: - name: weavescope-app - namespace: kube-system - spec: - type: LoadBalancer - ports: - - name: app - port: 4040 - selector: - name: weavescope-app -- apiVersion: extensions/v1beta1 - kind: DaemonSet - metadata: - name: weavescope-probe - namespace: kube-system - spec: - template: - metadata: - name: weavescope-probe - spec: - hostPID: true - hostNetwork: true - containers: - - name: weavescope-probe - image: weaveworks/scope:0.15 - args: - - --no-app - - --probe.docker=true - - --probe.kubernetes=true - - --probe.weave.addr= - - --probe.docker.bridge=docker0 - - --probe.resolver=$(KUBE_DNS_SERVICE_HOST):$(KUBE_DNS_SERVICE_PORT) - - weave-scope-app.kube-system.svc.cluster.local:4040 - securityContext: - privileged: true - resources: - limits: - cpu: 50m - volumeMounts: - - name: docker-sock - mountPath: /var/run/docker.sock - volumes: - - name: docker-sock - hostPath: - path: /var/run/docker.sock