From 18ed48e99bff06cfb8276cc84f9dc497cbe2372c Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Fri, 16 Nov 2018 13:41:18 +0000 Subject: [PATCH] Remove trailing comma from from k8s-1.7-v3.yaml.template --- .../networking.projectcalico.org/k8s-1.7-v3.yaml.template | 2 +- upup/pkg/fi/cloudup/bootstrapchannelbuilder.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7-v3.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7-v3.yaml.template index 1063bce91000c..e2191ec29982f 100644 --- a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7-v3.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7-v3.yaml.template @@ -36,7 +36,7 @@ data: "type": "calico-ipam" }, "policy": { - "type": "k8s", + "type": "k8s" }, "kubernetes": { "kubeconfig": "/etc/cni/net.d/__KUBECONFIG_FILENAME__" diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 93e6b7fd6db6c..c30956d7ccb27 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -645,7 +645,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri "pre-k8s-1.6": "2.4.2-kops.1", "k8s-1.6": "2.6.9-kops.1", "k8s-1.7": "2.6.9-kops.1", - "k8s-1.7-v3": "3.3.1-kops.1", + "k8s-1.7-v3": "3.3.1-kops.2", } if b.cluster.Spec.Networking.Calico.MajorVersion == "v3" {