Update the version of weave-net to 2.7.0

Cherry-pick of 575b70c6 Co-authored-by: Simon Howe <footless@gmail.com>

Update the version of weave-net to 2.7.0
Cherry-pick of 575b70c6 Co-authored-by: Simon Howe <footless@gmail.com>
93c17614 · Mark Emeis · Bryan Boreham · bb58c16e · 93c17614 · 93c17614
Commit 93c17614 authored 4 years ago by Mark Emeis Committed by Bryan Boreham 4 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 9 additions and 9 deletions
+9 -9
--- 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:

--- 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:

--- a/pkg/addons/assets/assets_vfsdata.go
+++ b/pkg/addons/assets/assets_vfsdata.go
@@ -379,7 +379,7 @@ var Assets = func() http.FileSystem {
 			modTime:          time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
 			uncompressedSize: 5580,
  
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xe4\x57\x4d\x6f\xe3\x36\x13\xbe\xe7\x57\x10\xd8\x43\x4e\x92\x93\xe0\xcd\xbb\x0b\xde\xd2\x6c\xb2\x5b\x20\x9b\x18\x71\xdb\x3d\x53\xd4\xd8\x62\x4d\x91\x2c\x39\x74\xec\x16\xfd\xef\x05\x25\xcb\x2b\x53\x92\xe5\x6d\x8c\x00\x8b\xfa\x64\x91\x33\xcf\x3c\x9c\xe1\x7c\x90\x19\xf1\x1b\x58\x27\xb4\xa2\x64\x75\x79\xb6\x14\x2a\xa7\xe4\x41\x38\x3c\x13\x08\xa5\xa3\x67\x84\x24\x24\x12\x22\x84\x90\x5a\x70\x06\x76\x25\x38\xdc\x70\xae\xbd\xc2\x6a\xa3\x04\x64\x39\x43\x46\xab\x2f\x42\x14\x2b\x81\x92\x17\x60\x2b\x48\x14\xe0\x76\x55\xb2\x0c\xa4\x6b\x64\x86\xa4\xc2\xaa\x33\x8c\x03\x25\x4b\x9f\x41\xe2\x36\x0e\xa1\xec\x50\xb2\x19\xe3\x29\xf3\x58\x68\x2b\xfe\x64\x28\xb4\x4a\x97\x1f\x5c\x2a\xf4\x64\x8f\xec\xad\xf4\x0e\xc1\x3e\x6b\x09\x27\x66\x6a\xbd\x84\x9d\x48\xc5\xed\x93\xd5\xde\xb4\xb4\xc2\xf2\xf9\xf9\xee\xd3\x82\xd3\xde\x72\x88\x24\x8c\xce\xdd\xde\xc2\xce\x01\xd1\xb2\xce\x5b\x2b\x2b\xb0\x59\x04\xb4\xd8\xd1\xaf\xbf\x65\x08\x68\x7b\xe1\x85\x21\x2f\xc6\x08\xc3\x1a\x41\x05\x17\xbb\x31\xe2\x0a\xf0\x45\xdb\xa5\xd1\x52\x70\xf1\x16\xd4\xce\xb7\x16\x85\x5a\x6c\x63\x3d\xea\xdc\xb7\xe7\x38\x4e\x29\xc4\x71\xe2\x90\xa1\x3f\xc8\xc7\xb4\xcc\xd5\x2b\xde\xe4\x0c\xe1\x04\x99\xf0\x93\x50\xb9\x50\x8b\x53\x27\x84\x96\xf0\x0c\xf3\x46\xa8\x3f\xff\x86\x0c\x34\xee\x3c\x70\x9c\x4a\xd2\xf9\xec\x77\xe0\xd8\x4a\xbc\xc1\xa2\x34\x6c\xec\xd4\x45\xe6\x3b\xab\xcb\xa0\xf1\xa3\x3d\x7d\xa2\xd2\xc3\xb5\x9a\x8b\x45\xc9\x4c\x37\xd7\x1f\x03\xc7\x7d\xe9\xae\x17\x8f\xc8\xa2\xdd\x9d\x3d\x3d\xd5\x1e\xeb\xdc\xc2\x2b\x32\xe4\xdf\xa5\xc6\xeb\xa3\xd9\x97\x37\x3f\x68\xc2\x30\x63\xdc\xbe\x53\x3f\x32\x28\xb5\x9a\xc1\x1b\x0e\x0a\x84\x38\x03\xbc\x51\x7f\x47\xbe\x32\x81\xe4\x9a\x38\xe0\x5a\xe5\x8e\xa0\x26\x12\x30\xf4\xdd\x70\xab\x14\x70\x24\x19\xcc\xb5\x85\x10\x09\x29\xd4\x82\x28\x58\x57\xfb\x5b\x04\x07\x12\x38\x6a\xfb\x8d\x50\x19\x6a\xf3\x43\xc4\x72\x88\x67\x29\xd4\x33\xb0\x7c\x33\xab\xed\x53\x72\xbd\xdd\x40\x28\x8d\x64\x08\x2d\xdc\xc8\x3d\x7d\xce\x38\x14\xa5\xf6\xb9\xc3\x8f\x6b\x85\x4c\x28\xb0\x91\x7e\xd2\x46\xd8\xdb\x09\x3a\x65\xc9\x54\x4e\xa3\xe5\xa0\x34\x29\x74\x09\x93\x4a\x69\x22\x99\x57\xbc\x48\x5d\x11\xc9\x81\x5a\xf5\xa9\xd6\xf6\x3e\x3f\xcd\x7e\x79\xbc\xf9\x72\xd7\x11\x20\x64\xc5\xa4\x87\x7b\xab\xcb\xae\x76\xf8\xcd\x05\xc8\xbc\x95\x25\xf1\xaf\x67\x5a\x1d\x00\x99\x32\x2c\x68\xe5\xa9\x34\xb4\xe2\x50\xe8\x22\x71\x51\xb2\x05\x50\x72\x9e\x6b\xbe\x04\x1b\xca\x44\x75\xe4\x30\x48\xb8\xfa\x6f\x12\x2e\x1c\xbd\x4a\xaf\xd3\xcb\xf3\x3e\xe5\xa9\x97\x72\x1a\x66\x8e\x0d\x25\x37\xf2\x85\x6d\x5c\x24\x65\x81\xe5\x42\x81\x73\x53\xab\x33\xe8\x1e\xaa\x40\x34\x9f\x00\xfb\x4e\x5b\x68\x87\x94\x5c\x5e\xbd\x4f\x2f\xd2\x8b\xb4\xef\xa8\xa6\x3a\x61\x3c\x62\xb4\xf6\xb5\x45\x4a\xfe\xff\xfe\xc3\xff\x3a\xac\x7a\x6a\x6f\xb3\xf5\x87\x07\x87\x3d\x3b\x84\x70\xe3\x29\xb9\xbe\x28\xa3\x2d\x07\xdc\x5b\x81\x9b\x5b\xad\x10\xd6\x3d\x67\x31\x56\xac\x84\x84\x05\xe4\x94\xa0\xf5\x71\x18\x56\x5a\xfa\x12\xbe\x84\xf2\xd4\x63\x76\xef\x0a\xe7\x59\x0f\xad\x32\x68\xd6\xd1\x9e\x0c\x49\x35\x28\x5c\x89\x24\x13\x6a\x04\x25\xb8\x7e\xa2\x0d\x8e\xc1\x5c\x1d\x83\x13\x72\xe9\x20\x50\x68\x79\xc7\x00\x01\xf2\x41\x9c\x3c\xeb\xbd\x01\x1d\x8c\x15\xb3\x13\x29\xb2\x49\xaf\x7c\x03\x26\x45\x96\x94\x3a\x0f\xc3\xc7\x08\x66\x80\x1a\x92\x6c\xd0\xd6\xc8\x32\x09\x2e\x91\x9a\x2f\x47\xe0\xac\x57\x93\xad\x78\x3a\x20\x1e\x12\xea\x49\xc9\x0d\x25\x73\x26\x1d\x0c\x57\xbb\x44\x99\xd8\x5d\xff\x8d\x92\xa5\x0c\x7f\x4d\xc5\x7a\x47\x94\xe1\x09\xb3\x8b\x6e\x29\xfb\xf1\x8a\xc6\x5b\xdd\xbd\x90\x5b\x8f\xf5\x13\xb4\xc3\x36\x57\xae\x71\xf8\xf6\x91\x74\x2f\xac\xc3\xaf\x02\x8b\xcf\xb5\x5a\x04\x34\xfd\xf9\x63\x07\xc4\x82\x43\x66\x71\x30\x72\x07\xdd\xe9\xe0\x41\x28\xbf\x7e\x32\x61\x66\x74\x94\xfc\xf5\xf7\x9e\x66\x7b\x3e\x7c\x1c\x18\x38\x08\x41\x2d\xc1\xb2\x1a\x21\xca\x3a\x98\xcf\x81\x23\x25\x8f\x7a\xc6\x0b\x08\xd5\x20\x72\x9e\x36\x41\x55\x5b\x4a\xee\xd6\xc2\xa1\x1b\xd4\xbf\x5b\x03\xf7\xf8\x1d\xea\xf5\x35\x38\x34\xf5\x74\x9a\x41\xe5\xe2\x10\xf3\xee\x95\xab\x6f\x42\x53\x23\xbb\x43\xd3\xe1\x2e\x32\x0a\x1c\x77\x94\x91\x6e\x32\x8a\xd7\xe9\x2c\x23\x5d\x65\x14\x30\xee\x30\x07\xba\xcb\xd1\x5e\xec\xe8\x8e\x77\x99\x51\xec\xa1\xb6\x73\x44\xda\x8f\x62\x8f\xd6\x01\xdc\x18\xa0\xe4\x5e\x48\x78\xb2\xb7\xcd\x3b\x74\x07\x62\x85\xae\xf2\x50\x32\xe7\xea\x64\xaa\x9f\x2b\x49\x28\xe8\x09\xb7\x02\x05\x67\x72\xab\x51\x3f\x9a\x67\x68\x19\xc2\x62\xf3\x8d\x52\x6d\xe2\xb9\x7e\xa5\xfc\x5a\xbf\xac\xff\x09\x00\x00\xff\xff\x17\x11\x83\x3e\xcc\x15\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xe4\x57\x4d\x6f\xe3\x36\x13\xbe\xe7\x57\x10\xd8\x43\x4e\x92\xb3\xc1\x9b\x37\x0b\xde\xd2\x6c\xb2\x5b\x20\x9b\x18\x71\xdb\x3d\x53\xd4\xd8\x62\x4d\x91\x2c\x39\x74\xec\x16\xfd\xef\x05\x25\xcb\x2b\x53\x92\xe5\x6d\x8c\x00\x8b\xfa\x64\x91\x33\xcf\x3c\x9c\xe1\x7c\x90\x19\xf1\x1b\x58\x27\xb4\xa2\x64\xf5\xfe\x6c\x29\x54\x4e\xc9\x83\x70\x78\x26\x10\x4a\x47\xcf\x08\x49\x48\x24\x44\x08\x21\xb5\xe0\x0c\xec\x4a\x70\xb8\xe1\x5c\x7b\x85\xd5\x46\x09\xc8\x72\x86\x8c\x56\x5f\x84\x28\x56\x02\x25\x2f\xc0\x56\x90\x28\xc0\xed\xaa\x64\x19\x48\xd7\xc8\x0c\x49\x85\x55\x67\x18\x07\x4a\x96\x3e\x83\xc4\x6d\x1c\x42\xd9\xa1\x64\x33\xc6\x53\xe6\xb1\xd0\x56\xfc\xc9\x50\x68\x95\x2e\x3f\xb8\x54\xe8\xc9\x1e\xd9\x5b\xe9\x1d\x82\x7d\xd6\x12\x4e\xcc\xd4\x7a\x09\x3b\x91\x8a\xdb\x27\xab\xbd\x69\x69\x85\xe5\xf3\xf3\xdd\xa7\x05\xa7\xbd\xe5\x10\x49\x18\x9d\xbb\xbd\x85\x9d\x03\xa2\x65\x9d\xb7\x56\x56\x60\xb3\x08\x68\xb1\xa3\x5f\x7f\xcb\x10\xd0\xf6\xc2\x0b\x43\x5e\x8c\x11\x86\x35\x82\x0a\x2e\x76\x63\xc4\x15\xe0\x8b\xb6\x4b\xa3\xa5\xe0\xe2\x2d\xa8\x9d\x6f\x2d\x0a\xb5\xd8\xc6\x7a\xd4\xb9\x6f\xcf\x71\x9c\x52\x88\xe3\xc4\x21\x43\x7f\x90\x8f\x69\x99\xab\x57\xbc\xc9\x19\xc2\x09\x32\xe1\x27\xa1\x72\xa1\x16\xa7\x4e\x08\x2d\xe1\x19\xe6\x8d\x50\x7f\xfe\x0d\x19\x68\xdc\x79\xe0\x38\x95\xa4\xf3\xd9\xef\xc0\xb1\x95\x78\x83\x45\x69\xd8\xd8\xa9\x8b\xcc\x77\x56\x97\x41\xe3\x47\x7b\xfa\x44\xa5\x87\x6b\x35\x17\x8b\x92\x99\x6e\xae\x3f\x06\x8e\xfb\xd2\x5d\x2f\x1e\x91\x45\xbb\x3b\x7b\x7a\xaa\x3d\xd6\xb9\x85\x57\x64\xc8\xbf\x4b\x8d\xd7\x47\xb3\x2f\x6f\x7e\xd0\x84\x61\xc6\xb8\x7d\xa7\x7e\x64\x50\x6a\x35\x83\x37\x1c\x14\x08\x71\x06\x78\xa3\xfe\x8e\x7c\x65\x02\xc9\x15\x71\xc0\xb5\xca\x1d\x41\x4d\x24\x60\xe8\xbb\xe1\x56\x29\xe0\x48\x32\x98\x6b\x0b\x21\x12\x52\xa8\x05\x51\xb0\xae\xf6\xb7\x08\x0e\x24\x70\xd4\xf6\x1b\xa1\x32\xd4\xe6\x87\x88\xe5\x10\xcf\x52\xa8\x67\x60\xf9\x66\x56\xdb\xa7\xe4\x6a\xbb\x81\x50\x1a\xc9\x10\x5a\xb8\x91\x7b\xfa\x9c\x71\x28\x4a\xed\x73\x87\x1f\xd7\x0a\x99\x50\x60\x23\xfd\xa4\x8d\xb0\xb7\x13\x74\xca\x92\xa9\x9c\x46\xcb\x41\x69\x52\xe8\x12\x26\x95\xd2\x44\x32\xaf\x78\x91\xba\x22\x92\x03\xb5\xea\x53\xad\xed\x7d\x7e\x9a\xfd\xf2\x78\xf3\xe5\xae\x23\x40\xc8\x8a\x49\x0f\xf7\x56\x97\x5d\xed\xf0\x9b\x0b\x90\x79\x2b\x4b\xe2\x5f\xcf\xb4\x3a\x00\x32\x65\x58\xd0\xca\x53\x69\x68\xc5\xa1\xd0\x45\xe2\xa2\x64\x0b\xa0\xe4\x3c\xd7\x7c\x09\x36\x94\x89\xea\xc8\x61\x90\x70\xf5\xdf\x24\x5c\x38\x7a\x99\x5e\xa7\x17\xe7\x7d\xca\x53\x2f\xe5\x34\xcc\x1c\x1b\x4a\x6e\xe4\x0b\xdb\xb8\x48\xca\x02\xcb\x85\x02\xe7\xa6\x56\x67\xd0\x3d\x54\x81\x68\x3e\x01\xf6\x9d\xb6\xd0\x0e\x29\x79\x7f\x79\x9d\x5e\xa4\x17\x69\xdf\x51\x4d\x75\xc2\x78\xc4\x68\xed\x6b\x8b\x94\xfc\xff\xfa\xc3\xff\x3a\xac\x7a\x6a\x6f\xb3\xf5\x87\x07\x87\x3d\x3b\x84\x70\xe3\x29\xb9\xba\x28\xa3\x2d\x07\xdc\x5b\x81\x9b\x5b\xad\x10\xd6\x3d\x67\x31\x56\xac\x84\x84\x05\xe4\x94\xa0\xf5\x71\x18\x56\x5a\xfa\x12\xbe\x84\xf2\xd4\x63\x76\xef\x0a\xe7\x59\x0f\xad\x32\x68\xd6\xd1\x9e\x0c\x49\x35\x28\x5c\x89\x24\x13\x6a\x04\x25\xb8\x7e\xa2\x0d\x8e\xc1\x5c\x1e\x83\x13\x72\xe9\x20\x50\x68\x79\xc7\x00\x01\xf2\x41\x9c\x3c\xeb\xbd\x01\x1d\x8c\x15\xb3\x13\x29\xb2\x49\xaf\x7c\x03\x26\x45\x96\x94\x3a\x0f\xc3\xc7\x08\x66\x80\x1a\x92\x6c\xd0\xd6\xc8\x32\x09\x2e\x91\x9a\x2f\x47\xe0\xac\x57\x93\xad\x78\x3a\x20\x1e\x12\xea\x49\xc9\x0d\x25\x73\x26\x1d\x0c\x57\xbb\x44\x99\xd8\x5d\xff\x8d\x92\xa5\x0c\x7f\x4d\xc5\x7a\x47\x94\xe1\x09\xb3\x8b\x6e\x29\xfb\xf1\x8a\xc6\x5b\xdd\xbd\x90\x5b\x8f\xf5\x13\xb4\xc3\x36\x57\xae\x71\xf8\xf6\x91\x74\x2f\xac\xc3\xaf\x02\x8b\xcf\xb5\x5a\x04\x34\xfd\xf9\x63\x07\xc4\x82\x43\x66\x71\x30\x72\x07\xdd\xe9\xe0\x41\x28\xbf\x7e\x32\x61\x66\x74\x94\xfc\xf5\xf7\x9e\x66\x7b\x3e\x7c\x1c\x18\x38\x08\x41\x2d\xc1\xb2\x1a\x21\xca\x3a\x98\xcf\x81\x23\x25\x8f\x7a\xc6\x0b\x08\xd5\x20\x72\x9e\x36\x41\x55\x5b\x4a\xee\xd6\xc2\xa1\x1b\xd4\xbf\x5b\x03\xf7\xf8\x1d\xea\xf5\x35\x38\x34\xf5\x74\x9a\x41\xe5\xe2\x10\xf3\xee\x95\xab\x6f\x42\x53\x23\xbb\x43\xd3\xe1\x2e\x32\x0a\x1c\x77\x94\x91\x6e\x32\x8a\xd7\xe9\x2c\x23\x5d\x65\x14\x30\xee\x30\x07\xba\xcb\xd1\x5e\xec\xe8\x8e\x77\x99\x51\xec\xa1\xb6\x73\x44\xda\x8f\x62\x8f\xd6\x01\xdc\x18\xa0\xe4\x5e\x48\x78\xb2\xb7\xcd\x3b\x74\x07\x62\x85\xae\xf2\x50\x32\xe7\xea\x64\xaa\x9f\x2b\x49\x28\xe8\x09\xb7\x02\x05\x67\x72\xab\x51\x3f\x9a\x67\x68\x19\xc2\x62\xf3\x8d\x52\x6d\xe2\xb9\x7e\xa5\xfc\x5a\xbf\xac\xff\x09\x00\x00\xff\xff\x38\xa9\x32\x68\xcc\x15\x00\x00"),
 		},
 	}
 	fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
--- 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:

--- 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: