Merge pull request #6086 from Smirl/fix-calicov3-template

Remove trailing comma from from k8s-1.7-v3.yaml.template
kubernetes · Nov 16, 2018 · 8f4279f · 8f4279f
2 parents 0ee2f42 + 18ed48e
commit 8f4279f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -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
@@ -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" {