Merge pull request #296 from weaveworks/WKP-1012/update-weave-net-master

Update the version of weave-net to 2.7.0
weaveworks · Aug 29, 2020 · 3fb084a · 3fb084a
2 parents bb58c16 + 93c1761
commit 3fb084a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/addons/weave-net/weave-net.yaml b/addons/weave-net/weave-net.yaml
@@ -128,7 +128,7 @@ items:
                     fieldRef:
                       apiVersion: v1
                       fieldPath: spec.nodeName
-              image: 'docker.io/weaveworks/weave-kube:2.5.1'
+              image: 'docker.io/weaveworks/weave-kube:2.7.0'
               imagePullPolicy: Always
               readinessProbe:
                 httpGet:
@@ -163,7 +163,7 @@ items:
                     fieldRef:
                       apiVersion: v1
                       fieldPath: spec.nodeName
-              image: 'docker.io/weaveworks/weave-npc:2.5.1'
+              image: 'docker.io/weaveworks/weave-npc:2.7.0'
               imagePullPolicy: Always
               # npc-args
               resources:

diff --git a/environments/local-docker-registry/retag_push.sh b/environments/local-docker-registry/retag_push.sh
@@ -23,8 +23,8 @@ k8s.gcr.io/kube-proxy:v1.16.11
 k8s.gcr.io/pause:3.1
 k8s.gcr.io/etcd:3.3.15-0
 k8s.gcr.io/coredns:1.6.2
-docker.io/weaveworks/weave-npc:2.5.1
-docker.io/weaveworks/weave-kube:2.5.1
+docker.io/weaveworks/weave-npc:2.7.0
+docker.io/weaveworks/weave-kube:2.7.0
 )
 
 # Default host for the local Docker registry:

diff --git a/pkg/addons/assets/assets_vfsdata.go b/pkg/addons/assets/assets_vfsdata.go
diff --git a/pkg/addons/transform_test.go b/pkg/addons/transform_test.go
@@ -16,9 +16,9 @@ func TestUpdateImage(t *testing.T) {
 	}{
 		// CNI addon's images should just have their repository updated:
 		{
-			image:         "docker.io/weaveworks/weave-kube:2.5.1",
+			image:         "docker.io/weaveworks/weave-kube:2.7.0",
 			repository:    "172.17.0.2:5000",
-			expectedImage: "172.17.0.2:5000/weaveworks/weave-kube:2.5.1",
+			expectedImage: "172.17.0.2:5000/weaveworks/weave-kube:2.7.0",
 			expectedError: nil,
 		},
 		// WKS controller's image should just have its repository updated:

diff --git a/pkg/apis/wksprovider/machine/os/os_test.go b/pkg/apis/wksprovider/machine/os/os_test.go
@@ -224,7 +224,7 @@ items:
                   fieldRef:
                     apiVersion: v1
                     fieldPath: spec.nodeName
-            image: 'docker.io/weaveworks/weave-kube:2.5.1'
+            image: 'docker.io/weaveworks/weave-kube:2.7.0'
             imagePullPolicy: Always
             readinessProbe:
               httpGet:
@@ -259,7 +259,7 @@ items:
                   fieldRef:
                     apiVersion: v1
                     fieldPath: spec.nodeName
-            image: 'docker.io/weaveworks/weave-npc:2.5.1'
+            image: 'docker.io/weaveworks/weave-npc:2.7.0'
             imagePullPolicy: Always
             # npc-args
             resources: