From 20cb6fce2346cbcf7047f8a888334d4ec3ecba9f Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Tue, 9 Oct 2018 01:00:33 -0400 Subject: [PATCH] Update weave bootstrapchannelbuilder version Follow on to #5845 --- upup/pkg/fi/cloudup/bootstrapchannelbuilder.go | 4 ++-- .../cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 1da8f0fc9d273..fc9e8b21e52f9 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -489,8 +489,8 @@ 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.4.0-kops.1", - "k8s-1.8": "2.4.0-kops.2", + "k8s-1.7": "2.4.1-kops.1", + "k8s-1.8": "2.4.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 37e8a82b89e71..94f498fde96c3 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml @@ -83,11 +83,11 @@ spec: name: networking.weave selector: role.kubernetes.io/networking: "1" - version: 2.4.0-kops.1 + version: 2.4.1-kops.1 - id: k8s-1.8 kubernetesVersion: '>=1.8.0' manifest: networking.weave/k8s-1.8.yaml name: networking.weave selector: role.kubernetes.io/networking: "1" - version: 2.4.0-kops.2 + version: 2.4.1-kops.1