Merge branch '2.0'

prog/weave-kube/weave-daemonset-k8s-1.6.yaml

@@ -5,6 +5,7 @@ items:
     kind: ServiceAccount
     metadata:
       name: weave-net
+      namespace: kube-system
       labels:
         name: weave-net
   - apiVersion: rbac.authorization.k8s.io/v1beta1
@@ -50,6 +51,7 @@ items:
     kind: DaemonSet
     metadata:
       name: weave-net
+      namespace: kube-system
       labels:
         name: weave-net
     spec:

prog/weave-kube/weave-daemonset.yaml

@@ -5,12 +5,14 @@ items:
     kind: ServiceAccount
     metadata:
       name: weave-net
+      namespace: kube-system
       labels:
         name: weave-net
   - apiVersion: extensions/v1beta1
     kind: DaemonSet
     metadata:
       name: weave-net
+      namespace: kube-system
       labels:
         name: weave-net
     spec: