From 0ce6ac1a5817dff9f8f5491f7705081d526b9126 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Thu, 16 May 2019 18:47:08 +0530 Subject: [PATCH] Update Weave Net to version 2.5.2 https://github.com/weaveworks/weave/releases/tag/v2.5.2 --- .../addons/networking.weave/k8s-1.12.yaml.template | 4 ++-- .../resources/addons/networking.weave/k8s-1.7.yaml.template | 4 ++-- .../resources/addons/networking.weave/k8s-1.8.yaml.template | 4 ++-- upup/pkg/fi/cloudup/bootstrapchannelbuilder.go | 6 +++--- .../tests/bootstrapchannelbuilder/weave/manifest.yaml | 6 +++--- 5 files changed, 12 insertions(+), 12 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 caed9ff9f660a..785569ba339d6 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 @@ -163,7 +163,7 @@ spec: name: weave-net key: network-password {{- end }} - image: 'weaveworks/weave-kube:2.5.1' + image: 'weaveworks/weave-kube:2.5.2' livenessProbe: httpGet: host: 127.0.0.1 @@ -201,7 +201,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 'weaveworks/weave-npc:2.5.1' + image: 'weaveworks/weave-npc:2.5.2' resources: requests: cpu: 50m diff --git a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.7.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.7.yaml.template index f51870e919d79..2eda16155225a 100644 --- a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.7.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.7.yaml.template @@ -155,7 +155,7 @@ spec: name: weave-net key: network-password {{- end }} - image: 'weaveworks/weave-kube:2.5.1' + image: 'weaveworks/weave-kube:2.5.2' livenessProbe: httpGet: host: 127.0.0.1 @@ -193,7 +193,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 'weaveworks/weave-npc:2.5.1' + image: 'weaveworks/weave-npc:2.5.2' resources: requests: cpu: 50m 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 1cee8ec14989c..c41f0045ae7de 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 @@ -159,7 +159,7 @@ spec: name: weave-net key: network-password {{- end }} - image: 'weaveworks/weave-kube:2.5.1' + image: 'weaveworks/weave-kube:2.5.2' livenessProbe: httpGet: host: 127.0.0.1 @@ -197,7 +197,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 'weaveworks/weave-npc:2.5.1' + image: 'weaveworks/weave-npc:2.5.2' resources: requests: cpu: 50m diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index aaf384f96f278..dd623835ff60d 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -687,9 +687,9 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri versions := map[string]string{ "pre-k8s-1.6": "2.3.0-kops.2", "k8s-1.6": "2.3.0-kops.2", - "k8s-1.7": "2.5.1-kops.1", - "k8s-1.8": "2.5.1-kops.1", - "k8s-1.12": "2.5.1-kops.1", + "k8s-1.7": "2.5.2-kops.1", + "k8s-1.8": "2.5.2-kops.1", + "k8s-1.12": "2.5.2-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 46d1dd948e0a0..c6b6b2054c806 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml @@ -111,18 +111,18 @@ spec: name: networking.weave selector: role.kubernetes.io/networking: "1" - version: 2.5.1-kops.1 + version: 2.5.2-kops.1 - id: k8s-1.8 kubernetesVersion: '>=1.8.0 <1.12.0' manifest: networking.weave/k8s-1.8.yaml name: networking.weave selector: role.kubernetes.io/networking: "1" - version: 2.5.1-kops.1 + version: 2.5.2-kops.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: networking.weave/k8s-1.12.yaml name: networking.weave selector: role.kubernetes.io/networking: "1" - version: 2.5.1-kops.1 + version: 2.5.2-kops.1