From 689be235e542c806a082b4479107a07d533d8013 Mon Sep 17 00:00:00 2001
From: Ciprian Hacman <ciprian.hacman@sematext.com>
Date: Fri, 6 Mar 2020 20:40:23 +0200
Subject: [PATCH] Update Weave Net to version 2.6.1

---
 .../addons/networking.weave/k8s-1.12.yaml.template        | 7 +++++--
 .../addons/networking.weave/k8s-1.8.yaml.template         | 6 ++++--
 upup/pkg/fi/cloudup/bootstrapchannelbuilder.go            | 4 ++--
 .../tests/bootstrapchannelbuilder/weave/manifest.yaml     | 8 ++++----
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template
index dfecce9134d0a..8328eb2c70358 100644
--- a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template
+++ b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template
@@ -168,7 +168,7 @@ spec:
                   name: weave-net
                   key: network-password
             {{- end }}
-          image: 'weaveworks/weave-kube:2.6.0'
+          image: 'weaveworks/weave-kube:2.6.1'
           ports:
             - name: metrics
               containerPort: 6782
@@ -203,6 +203,7 @@ spec:
               mountPath: /lib/modules
             - name: xtables-lock
               mountPath: /run/xtables.lock
+              readOnly: false
         - name: weave-npc
           args: []
           env:
@@ -215,7 +216,7 @@ spec:
             - name: EXTRA_ARGS
               value: "{{ .Networking.Weave.NPCExtraArgs }}"
             {{- end }}
-          image: 'weaveworks/weave-npc:2.6.0'
+          image: 'weaveworks/weave-npc:2.6.1'
           ports:
             - name: metrics
               containerPort: 6781
@@ -233,7 +234,9 @@ spec:
           volumeMounts:
             - name: xtables-lock
               mountPath: /run/xtables.lock
+              readOnly: false
       hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet
       hostPID: true
       restartPolicy: Always
       securityContext:
diff --git a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.8.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.8.yaml.template
index 608caea4670c2..ce20713680dd7 100644
--- a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.8.yaml.template
+++ b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.8.yaml.template
@@ -164,7 +164,7 @@ spec:
                   name: weave-net
                   key: network-password
             {{- end }}
-          image: 'weaveworks/weave-kube:2.6.0'
+          image: 'weaveworks/weave-kube:2.6.1'
           ports:
             - name: metrics
               containerPort: 6782
@@ -199,6 +199,7 @@ spec:
               mountPath: /lib/modules
             - name: xtables-lock
               mountPath: /run/xtables.lock
+              readOnly: false
         - name: weave-npc
           args: []
           env:
@@ -211,7 +212,7 @@ spec:
             - name: EXTRA_ARGS
               value: "{{ .Networking.Weave.NPCExtraArgs }}"
             {{- end }}
-          image: 'weaveworks/weave-npc:2.6.0'
+          image: 'weaveworks/weave-npc:2.6.1'
           ports:
             - name: metrics
               containerPort: 6781
@@ -229,6 +230,7 @@ spec:
           volumeMounts:
             - name: xtables-lock
               mountPath: /run/xtables.lock
+              readOnly: false
       hostNetwork: true
       hostPID: true
       restartPolicy: Always
diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
index 5cb4adeb98829..fb345f84969ab 100644
--- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
+++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -608,8 +608,8 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 	if b.cluster.Spec.Networking.Weave != nil {
 		key := "networking.weave"
 		versions := map[string]string{
-			"k8s-1.8":  "2.6.0-kops.2",
-			"k8s-1.12": "2.6.0-kops.3",
+			"k8s-1.8":  "2.6.1-kops.1",
+			"k8s-1.12": "2.6.1-kops.1",
 		}
 
 		{
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
index 8423e0b320bcd..95295fb30e50c 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
@@ -89,16 +89,16 @@ spec:
   - id: k8s-1.8
     kubernetesVersion: <1.12.0
     manifest: networking.weave/k8s-1.8.yaml
-    manifestHash: 50a20409003956b7c31a479408ca42ec97774854
+    manifestHash: 7aa5336ec05aef46b185cb660fc02bb2ac201852
     name: networking.weave
     selector:
       role.kubernetes.io/networking: "1"
-    version: 2.6.0-kops.2
+    version: 2.6.1-kops.1
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: networking.weave/k8s-1.12.yaml
-    manifestHash: d2df87d90f8877a201f5cad93de296697191d4ae
+    manifestHash: 6f12295454fef72234205b7e6c62cdac656eab52
     name: networking.weave
     selector:
       role.kubernetes.io/networking: "1"
-    version: 2.6.0-kops.3
+    version: 2.6.1-kops.1