Update Weave to v2.8.0

kubernetes · Jan 19, 2021 · 01efb50 · 01efb50
1 parent 470ff01
commit 01efb50
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 27 deletions.
diff --git a/upup/models/bindata.go b/upup/models/bindata.go
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
@@ -1,4 +1,4 @@
-# Pulled and modified from: https://github.com/weaveworks/weave/releases/download/v2.7.0/weave-daemonset-k8s-1.11.yaml
+# Pulled and modified from: https://github.com/weaveworks/weave/releases/download/v2.8.0/weave-daemonset-k8s-1.11.yaml
 
 {{- if WeaveSecret }}
 apiVersion: v1
@@ -142,11 +142,32 @@ spec:
       annotations:
         prometheus.io/scrape: "true"
     spec:
+      initContainers:
+        - name: weave-init
+          image: 'weaveworks/weave-kube:{{ or .Networking.Weave.Version "2.8.0" }}'
+          command:
+            - /home/weave/init.sh
+          securityContext:
+            privileged: true
+          volumeMounts:
+            - name: cni-bin
+              mountPath: /host/opt
+            - name: cni-bin2
+              mountPath: /host/home
+            - name: cni-conf
+              mountPath: /host/etc
+            - name: lib-modules
+              mountPath: /lib/modules
+            - name: xtables-lock
+              mountPath: /run/xtables.lock
+              readOnly: false
       containers:
         - name: weave
           command:
             - /home/weave/launch.sh
           env:
+            - name: INIT_CONTAINER
+              value: "true"
             - name: HOSTNAME
               valueFrom:
                 fieldRef:
@@ -177,7 +198,7 @@ spec:
                   name: weave-net
                   key: network-password
             {{- end }}
-          image: 'weaveworks/weave-kube:{{ or .Networking.Weave.Version "2.7.0" }}'
+          image: 'weaveworks/weave-kube:{{ or .Networking.Weave.Version "2.8.0" }}'
           ports:
             - name: metrics
               containerPort: 6782
@@ -200,16 +221,9 @@ spec:
           volumeMounts:
             - name: weavedb
               mountPath: /weavedb
-            - name: cni-bin
-              mountPath: /host/opt
-            - name: cni-bin2
-              mountPath: /host/home
-            - name: cni-conf
-              mountPath: /host/etc
             - name: dbus
               mountPath: /host/var/lib/dbus
-            - name: lib-modules
-              mountPath: /lib/modules
+              readOnly: true
             - name: xtables-lock
               mountPath: /run/xtables.lock
               readOnly: false
@@ -224,7 +238,7 @@ spec:
             - name: EXTRA_ARGS
               value: "{{ .Networking.Weave.NPCExtraArgs }}"
             {{- end }}
-          image: 'weaveworks/weave-npc:{{ or .Networking.Weave.Version "2.7.0" }}'
+          image: 'weaveworks/weave-npc:{{ or .Networking.Weave.Version "2.8.0" }}'
           ports:
             - name: metrics
               containerPort: 6781
@@ -245,7 +259,7 @@ spec:
               readOnly: false
       hostNetwork: true
       dnsPolicy: ClusterFirstWithHostNet
-      hostPID: true
+      hostPID: false
       restartPolicy: Always
       securityContext:
         seLinuxOptions: {}

diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go b/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.7.0-kops.1",
+			"k8s-1.12": "2.8.0-kops.1",
 		}
 
 		{

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/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: 3b33c6cfe20c96620178864ba26f4afae37db5fd
+    manifestHash: 950073e66c68d3d33d76be36c9023947f0dff30c
     name: networking.weave
     selector:
       role.kubernetes.io/networking: "1"
-    version: 2.7.0-kops.1
+    version: 2.8.0-kops.1