sync with master

examples/cri/cluster-role.yaml

@@ -15,6 +15,7 @@ rules:
   - replicationcontrollers
   - services
   - nodes
+  - namespaces
   verbs:
   - list
   - watch

examples/cri/deploy.yaml

@@ -25,7 +25,7 @@ spec:
           args:
             - '--no-probe'
           env: []
-          image: weaveworks/scope:1.13.1
+          image: weaveworks/scope:1.13.2
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 4040

examples/cri/ds.yaml

@@ -34,7 +34,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: weaveworks/scope:1.13.1
+          image: weaveworks/scope:1.13.2
           imagePullPolicy: IfNotPresent
           securityContext:
             privileged: true

examples/docker/docker-compose-probe-v1.yml

@@ -1,5 +1,5 @@
 probe:
-  image: weaveworks/scope:1.13.1
+  image: weaveworks/scope:1.13.2
   net: "host"
   pid: "host"
   privileged: true

examples/docker/docker-compose-probe-v2.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
   probe:
-    image: weaveworks/scope:1.13.1
+    image: weaveworks/scope:1.13.2
     network_mode: "host"
     pid: "host"
     privileged: true

examples/k8s/cluster-role.yaml

@@ -16,6 +16,7 @@ rules:
   - replicationcontrollers
   - services
   - nodes
+  - namespaces
   - persistentvolumes
   - persistentvolumeclaims
   verbs:

examples/k8s/deploy.yaml

@@ -28,7 +28,7 @@ spec:
           args:
             - '--no-probe'
           env: []
-          image: weaveworks/scope:1.13.1
+          image: weaveworks/scope:1.13.2
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 4040

examples/k8s/ds.yaml

@@ -31,7 +31,12 @@ spec:
             - '--probe.docker.bridge=docker0'
             - '--probe.docker=true'
             - 'weave-scope-app.weave.svc.cluster.local.:80'
-          image: weaveworks/scope:1.13.1
+          env:
+            - name: SCOPE_HOSTNAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+          image: weaveworks/scope:1.13.2
           imagePullPolicy: IfNotPresent
           resources:
             requests:

examples/k8s/probe-deploy.yaml

@@ -35,7 +35,7 @@ spec:
             - 'weave-scope-app.weave.svc.cluster.local.:80'
           command:
             - /home/weave/scope
-          image: 'docker.io/weaveworks/scope:1.13.1'
+          image: 'docker.io/weaveworks/scope:1.13.2'
           imagePullPolicy: IfNotPresent
           resources:
             requests:

examples/mesos/minimesos.json

@@ -12,7 +12,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "weaveworks/scope:1.13.1",
+      "image": "weaveworks/scope:1.13.2",
       "network": "HOST",
       "privileged": true,
       "parameters": [