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

Merge pull request #11026 from olemarkus/cilium-1.10 

Allow cilium 1.10
This commit is contained in:
Kubernetes Prow Robot 2021-03-12 07:06:18 -08:00 committed by GitHub
parent 928b8cc442 8e2e60ae44
commit bafbdaef6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/kops/validation/validation.go
View File

@ -702,8 +702,8 @@ func validateNetworkingCilium(cluster *kops.Cluster, v *kops.CiliumNetworkingSpe
allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Could not parse as semantic version")) allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Could not parse as semantic version"))
} }
if !(version.Minor >= 6 && version.Minor <= 9) { if !(version.Minor >= 6 && version.Minor <= 10) {
allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Only versions 1.6 through 1.9 are supported")) allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Only versions 1.6 through 1.10 are supported"))
} }
if version.Minor == 6 && cluster.IsKubernetesGTE("1.16") { if version.Minor == 6 && cluster.IsKubernetesGTE("1.16") {

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

@ -64,7 +64,7 @@ func addCiliumAddon(b *BootstrapChannelBuilder, addons *api.Addons) error {
NeedsRollingUpdate: "all", NeedsRollingUpdate: "all",
}) })
} }
} else if ver.Minor == 9 { } else if ver.Minor == 9 || ver.Minor == 10 {
version := "1.9.0-kops.1" version := "1.9.0-kops.1"
{ {
id := "k8s-1.12" id := "k8s-1.12"