- actually dropping the check on the ipvs module is feels hacky with the check in validation due to blocking, or locking the version to 1.9.3, as they might not be using ipvs anyway. I'm gonna leave it for another PR or perhaps leave kube admins to decide for now

This commit is contained in:
Rohith 2018-10-12 14:49:22 +01:00
parent 87e587fa77
commit 01bc597d29
2 changed files with 0 additions and 12 deletions

View File

@ -436,17 +436,6 @@ func ValidateCluster(c *kops.Cluster, strict bool) *field.Error {
// return field.Required(kubeProxyPath.Child("Master"), "")
//}
// @check if are using kubernetes <1.9.3 with ipvs and deny canal 3.2.3 due to issue
// https://docs.projectcalico.org/v3.2/getting-started/kubernetes/requirements
if c.Spec.KubeProxy.ProxyMode == "ipvs" {
if kubernetesRelease.LT(semver.MustParse("1.9.3")) {
// @NOTE: i'm not sure about this one, it could block someone from upgrading i.e. running 1.9.2 + canal + with pre GA ipvs .. perhaps drop?
if c.Spec.Networking != nil && c.Spec.Networking.Canal != nil {
return field.Invalid(kubeProxyPath.Child("proxyMode"), c.Spec.KubeProxy.ProxyMode, "ipvs mode is not support pre kubernetes 1.9.3 with canal v3")
}
}
}
if master != "" && !isValidAPIServersURL(master) {
return field.Invalid(kubeProxyPath.Child("Master"), master, "Not a valid APIServer URL")
}

View File

@ -652,7 +652,6 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
"k8s-1.8": "2.6.7-kops.3",
"k8s-1.9": "3.2.3-kops.1",
}
{
id := "pre-k8s-1.6"
location := key + "/" + id + ".yaml"