Merge branch 'master' into volume-snapshot

examples/k8s/cluster-role.yaml

@@ -51,6 +51,14 @@ rules:
   verbs:
   - list
   - watch
+- apigroups:
+  - extensions
+  resourcenames:
+  - weave-scope
+  resources:
+  - podsecuritypolicies
+  verbs:
+  - use
 - apiGroups:
   - volumesnapshot.external-storage.k8s.io
   resources:
@@ -58,4 +66,4 @@ rules:
   - volumesnapshotdatas
   verbs:
   - list
-  - watch
+  - watch

examples/k8s/psp.yaml

@@ -0,0 +1,21 @@
+apiVersion: extensions/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: weave-scope
+spec:
+  privileged: true
+  hostPID: true
+  hostNetwork: true
+  allowedCapabilities:
+  - 'NET_ADMIN'
+  fsGroup:
+    rule: RunAsAny
+  runAsUser:
+    rule: RunAsAny
+  seLinux:
+    rule: RunAsAny
+  supplementalGroups:
+    rule: RunAsAny
+  volumes:
+  - secret
+  - hostPath