diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 44f6514e00..30063658bf 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -388,8 +388,8 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri if b.cluster.Spec.Networking.Weave != nil { key := "networking.weave" - // 2.0.6-kops.1 = 2.0.5 with kops manifest tweaks. This should go away with the next version bump. - version := "2.0.6-kops.1" + // 2.1.3-kops.1 = 2.1.3, kops packaging version 1. + version := "2.1.3-kops.1" { location := key + "/pre-k8s-1.6.yaml" diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml index 8870186b0d..4574ea5e25 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml @@ -69,18 +69,18 @@ spec: name: networking.weave selector: role.kubernetes.io/networking: "1" - version: 2.0.6-kops.1 + version: 2.1.3-kops.1 - id: k8s-1.6 kubernetesVersion: '>=1.6.0 <1.7.0' manifest: networking.weave/k8s-1.6.yaml name: networking.weave selector: role.kubernetes.io/networking: "1" - version: 2.0.6-kops.1 + version: 2.1.3-kops.1 - id: k8s-1.7 kubernetesVersion: '>=1.7.0' manifest: networking.weave/k8s-1.7.yaml name: networking.weave selector: role.kubernetes.io/networking: "1" - version: 2.0.6-kops.1 + version: 2.1.3-kops.1