kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove trailing comma from from k8s-1.7-v3.yaml.template

This commit is contained in:
Alex Williams 2018-11-16 13:41:18 +00:00
parent 0ee2f427be
commit 18ed48e99b
No known key found for this signature in database
GPG Key ID: 606C899A2D1261C1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7-v3.yaml.template
View File

@ -36,7 +36,7 @@ data:
"type": "calico-ipam"
},
"policy": {
"type": "k8s",
"type": "k8s"
},
"kubernetes": {
"kubeconfig": "/etc/cni/net.d/__KUBECONFIG_FILENAME__"

2
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View File

@ -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" {