Update Weave to v2.8.1

upup/models/bindata.go

@@ -40542,7 +40542,7 @@ func cloudupResourcesAddonsNetworkingProjectcalicoOrgCanalK8s116YamlTemplate() (
 	return a, nil
 }
 
-var _cloudupResourcesAddonsNetworkingWeaveK8s112YamlTemplate = []byte(`# Pulled and modified from: https://github.com/weaveworks/weave/releases/download/v2.8.0/weave-daemonset-k8s-1.11.yaml
+var _cloudupResourcesAddonsNetworkingWeaveK8s112YamlTemplate = []byte(`# Pulled and modified from: https://github.com/weaveworks/weave/releases/download/v2.8.1/weave-daemonset-k8s-1.11.yaml
 
 {{- if WeaveSecret }}
 apiVersion: v1
@@ -40688,7 +40688,7 @@ spec:
     spec:
       initContainers:
         - name: weave-init
-          image: 'weaveworks/weave-kube:{{ or .Networking.Weave.Version "2.8.0" }}'
+          image: 'weaveworks/weave-kube:{{ or .Networking.Weave.Version "2.8.1" }}'
           command:
             - /home/weave/init.sh
           securityContext:
@@ -40742,7 +40742,7 @@ spec:
                   name: weave-net
                   key: network-password
             {{- end }}
-          image: 'weaveworks/weave-kube:{{ or .Networking.Weave.Version "2.8.0" }}'
+          image: 'weaveworks/weave-kube:{{ or .Networking.Weave.Version "2.8.1" }}'
           ports:
             - name: metrics
               containerPort: 6782
@@ -40768,6 +40768,9 @@ spec:
             - name: dbus
               mountPath: /host/var/lib/dbus
               readOnly: true
+            - mountPath: /host/etc/machine-id
+              name: cni-machine-id
+              readOnly: true
             - name: xtables-lock
               mountPath: /run/xtables.lock
               readOnly: false
@@ -40782,7 +40785,7 @@ spec:
             - name: EXTRA_ARGS
               value: "{{ .Networking.Weave.NPCExtraArgs }}"
             {{- end }}
-          image: 'weaveworks/weave-npc:{{ or .Networking.Weave.Version "2.8.0" }}'
+          image: 'weaveworks/weave-npc:{{ or .Networking.Weave.Version "2.8.1" }}'
           ports:
             - name: metrics
               containerPort: 6781
@@ -40813,8 +40816,6 @@ spec:
           operator: Exists
         - effect: NoExecute
           operator: Exists
-        - key: CriticalAddonsOnly
-          operator: Exists
       volumes:
         - name: weavedb
           hostPath:
@@ -40828,6 +40829,9 @@ spec:
         - name: cni-conf
           hostPath:
             path: /etc
+        - name: cni-machine-id
+          hostPath:
+            path: /etc/machine-id
         - name: dbus
           hostPath:
             path: /var/lib/dbus

upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template

@@ -1,4 +1,4 @@
-# Pulled and modified from: https://github.com/weaveworks/weave/releases/download/v2.8.0/weave-daemonset-k8s-1.11.yaml
+# Pulled and modified from: https://github.com/weaveworks/weave/releases/download/v2.8.1/weave-daemonset-k8s-1.11.yaml
 
 {{- if WeaveSecret }}
 apiVersion: v1
@@ -144,7 +144,7 @@ spec:
     spec:
       initContainers:
         - name: weave-init
-          image: 'weaveworks/weave-kube:{{ or .Networking.Weave.Version "2.8.0" }}'
+          image: 'weaveworks/weave-kube:{{ or .Networking.Weave.Version "2.8.1" }}'
           command:
             - /home/weave/init.sh
           securityContext:
@@ -198,7 +198,7 @@ spec:
                   name: weave-net
                   key: network-password
             {{- end }}
-          image: 'weaveworks/weave-kube:{{ or .Networking.Weave.Version "2.8.0" }}'
+          image: 'weaveworks/weave-kube:{{ or .Networking.Weave.Version "2.8.1" }}'
           ports:
             - name: metrics
               containerPort: 6782
@@ -224,6 +224,9 @@ spec:
             - name: dbus
               mountPath: /host/var/lib/dbus
               readOnly: true
+            - mountPath: /host/etc/machine-id
+              name: cni-machine-id
+              readOnly: true
             - name: xtables-lock
               mountPath: /run/xtables.lock
               readOnly: false
@@ -238,7 +241,7 @@ spec:
             - name: EXTRA_ARGS
               value: "{{ .Networking.Weave.NPCExtraArgs }}"
             {{- end }}
-          image: 'weaveworks/weave-npc:{{ or .Networking.Weave.Version "2.8.0" }}'
+          image: 'weaveworks/weave-npc:{{ or .Networking.Weave.Version "2.8.1" }}'
           ports:
             - name: metrics
               containerPort: 6781
@@ -269,8 +272,6 @@ spec:
           operator: Exists
         - effect: NoExecute
           operator: Exists
-        - key: CriticalAddonsOnly
-          operator: Exists
       volumes:
         - name: weavedb
           hostPath:
@@ -284,6 +285,9 @@ spec:
         - name: cni-conf
           hostPath:
             path: /etc
+        - name: cni-machine-id
+          hostPath:
+            path: /etc/machine-id
         - name: dbus
           hostPath:
             path: /var/lib/dbus

upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go

@@ -699,7 +699,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
 	if b.Cluster.Spec.Networking.Weave != nil {
 		key := "networking.weave"
 		versions := map[string]string{
-			"k8s-1.12": "2.8.0-kops.1",
+			"k8s-1.12": "2.8.1-kops.1",
 		}
 
 		{

upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml

@@ -63,8 +63,8 @@ spec:
     version: 1.17.0
   - id: k8s-1.12
     manifest: networking.weave/k8s-1.12.yaml
-    manifestHash: 950073e66c68d3d33d76be36c9023947f0dff30c
+    manifestHash: 538488bad36e59dbc5fa002960985b62de1aa9bd
     name: networking.weave
     selector:
       role.kubernetes.io/networking: "1"
-    version: 2.8.0-kops.1
+    version: 2.8.1-kops.1