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

Merge pull request #12887 from olemarkus/cilium-allow-11 

Allow setting cilium 1.11
This commit is contained in:
Kubernetes Prow Robot 2021-12-04 09:28:32 -08:00 committed by GitHub
parent 20bec64af2 0d946b15c1
commit 8a06cca4e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@ import (
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
utilvalidation "k8s.io/apimachinery/pkg/util/validation" utilvalidation "k8s.io/apimachinery/pkg/util/validation"
"k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/dns" "k8s.io/kops/pkg/dns"
"k8s.io/kops/pkg/model/components" "k8s.io/kops/pkg/model/components"
@ -859,8 +860,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 >= 8 && version.Minor <= 10) { if !(version.Minor >= 8 && version.Minor <= 11) {
allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Only versions 1.8 through 1.10 are supported")) allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Only versions 1.8 through 1.11 are supported"))
} }
if version.Minor < 10 && c.IsIPv6Only() { if version.Minor < 10 && c.IsIPv6Only() {

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

@ -20,6 +20,7 @@ import (
"fmt" "fmt"
"github.com/blang/semver/v4" "github.com/blang/semver/v4"
"k8s.io/kops/channels/pkg/api" "k8s.io/kops/channels/pkg/api"
"k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi"
) )
@ -63,7 +64,7 @@ func addCiliumAddon(b *BootstrapChannelBuilder, addons *AddonList) error {
} }
addons.Add(addon) addons.Add(addon)
} }
} else if ver.Minor == 10 { } else if ver.Minor == 10 || ver.Minor == 11 {
{ {
id := "k8s-1.16" id := "k8s-1.16"
location := key + "/" + id + "-v1.10.yaml" location := key + "/" + id + "-v1.10.yaml"