Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Block IPVS on 1.23 clusters running Canal/Calico CNI #1695

Merged
merged 1 commit into from
Dec 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions pkg/apis/kubeone/validation/validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func ValidateKubeOneCluster(c kubeone.KubeOneCluster) field.ErrorList {
allErrs = append(allErrs, ValidateAPIEndpoint(c.APIEndpoint, field.NewPath("apiEndpoint"))...)
allErrs = append(allErrs, ValidateCloudProviderSpec(c.CloudProvider, field.NewPath("provider"))...)
allErrs = append(allErrs, ValidateVersionConfig(c.Versions, field.NewPath("versions"))...)
allErrs = append(allErrs, ValidateCloudProviderSupportsKubernetes(c, field.NewPath(""))...)
allErrs = append(allErrs, ValidateKubernetesSupport(c, field.NewPath(""))...)
allErrs = append(allErrs, ValidateContainerRuntimeConfig(c.ContainerRuntime, c.Versions, field.NewPath("containerRuntime"))...)
allErrs = append(allErrs, ValidateClusterNetworkConfig(c.ClusterNetwork, field.NewPath("clusterNetwork"))...)
allErrs = append(allErrs, ValidateStaticWorkersConfig(c.StaticWorkers, field.NewPath("staticWorkers"))...)
Expand Down Expand Up @@ -252,7 +252,7 @@ func ValidateVersionConfig(version kubeone.VersionConfig, fldPath *field.Path) f
return allErrs
}

func ValidateCloudProviderSupportsKubernetes(c kubeone.KubeOneCluster, fldPath *field.Path) field.ErrorList {
func ValidateKubernetesSupport(c kubeone.KubeOneCluster, fldPath *field.Path) field.ErrorList {
allErrs := field.ErrorList{}

v, err := semver.NewVersion(c.Versions.Kubernetes)
Expand All @@ -261,8 +261,21 @@ func ValidateCloudProviderSupportsKubernetes(c kubeone.KubeOneCluster, fldPath *
return allErrs
}

if c.CloudProvider.Vsphere != nil && v.Minor() >= 23 {
allErrs = append(allErrs, field.Invalid(fldPath.Child("versions").Child("kubernetes"), c.Versions.Kubernetes, "kubernetes versions 1.23.0 and newer are currently not supported for vsphere clusters"))
if v.Minor() >= 23 {
switch {
case c.CloudProvider.Vsphere != nil:
allErrs = append(allErrs, field.Invalid(fldPath.Child("versions").Child("kubernetes"), c.Versions.Kubernetes, "kubernetes versions 1.23.0 and newer are currently not supported for vsphere clusters"))
case c.ClusterNetwork.KubeProxy != nil && c.ClusterNetwork.KubeProxy.IPVS != nil:
if c.ClusterNetwork.CNI != nil && c.ClusterNetwork.CNI.Canal != nil {
allErrs = append(allErrs, field.Invalid(fldPath.Child("versions").Child("kubernetes"), c.Versions.Kubernetes, "kubernetes versions 1.23.0 and newer are currently not supported for clusters running kube-proxy in ipvs mode with Canal CNI"))
} else if c.ClusterNetwork.CNI != nil && c.ClusterNetwork.CNI.External != nil && c.Addons != nil {
for _, addon := range c.Addons.Addons {
if addon.Name == "calico-vxlan" {
allErrs = append(allErrs, field.Invalid(fldPath.Child("versions").Child("kubernetes"), c.Versions.Kubernetes, "kubernetes versions 1.23.0 and newer are currently not supported for clusters running kube-proxy in ipvs mode with Calico CNI"))
}
}
}
}
}

return allErrs
Expand Down
100 changes: 96 additions & 4 deletions pkg/apis/kubeone/validation/validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -802,11 +802,13 @@ func TestValidateVersionConfig(t *testing.T) {
}
}

func TestValidateCloudProviderSupportsKubernetes(t *testing.T) {
func TestValidateKubernetesSupport(t *testing.T) {
tests := []struct {
name string
providerConfig kubeone.CloudProviderSpec
networkConfig kubeone.ClusterNetworkConfig
versionConfig kubeone.VersionConfig
addonsConfig *kubeone.Addons
expectedError bool
}{
{
Expand Down Expand Up @@ -849,16 +851,106 @@ func TestValidateCloudProviderSupportsKubernetes(t *testing.T) {
},
expectedError: true,
},
{
name: "AWS 1.22.0 cluster with IPVS",
providerConfig: kubeone.CloudProviderSpec{
AWS: &kubeone.AWSSpec{},
},
versionConfig: kubeone.VersionConfig{
Kubernetes: "1.22.0",
},
networkConfig: kubeone.ClusterNetworkConfig{
CNI: &kubeone.CNI{
Canal: &kubeone.CanalSpec{},
},
KubeProxy: &kubeone.KubeProxyConfig{
IPVS: &kubeone.IPVSConfig{},
},
},
expectedError: false,
},
{
name: "AWS 1.23.0 cluster with IPVS",
providerConfig: kubeone.CloudProviderSpec{
AWS: &kubeone.AWSSpec{},
},
versionConfig: kubeone.VersionConfig{
Kubernetes: "1.23.0",
},
networkConfig: kubeone.ClusterNetworkConfig{
CNI: &kubeone.CNI{
Canal: &kubeone.CanalSpec{},
},
KubeProxy: &kubeone.KubeProxyConfig{
IPVS: &kubeone.IPVSConfig{},
},
},
expectedError: true,
},
{
name: "AWS 1.22.0 cluster with IPVS and calico-vxlan",
providerConfig: kubeone.CloudProviderSpec{
AWS: &kubeone.AWSSpec{},
},
versionConfig: kubeone.VersionConfig{
Kubernetes: "1.22.0",
},
networkConfig: kubeone.ClusterNetworkConfig{
CNI: &kubeone.CNI{
External: &kubeone.ExternalCNISpec{},
},
KubeProxy: &kubeone.KubeProxyConfig{
IPVS: &kubeone.IPVSConfig{},
},
},
addonsConfig: &kubeone.Addons{
Enable: true,
Addons: []kubeone.Addon{
{
Name: "calico-vxlan",
},
},
},
expectedError: false,
},
{
name: "AWS 1.23.0 cluster with IPVS and calico-vxlan",
providerConfig: kubeone.CloudProviderSpec{
AWS: &kubeone.AWSSpec{},
},
versionConfig: kubeone.VersionConfig{
Kubernetes: "1.23.0",
},
networkConfig: kubeone.ClusterNetworkConfig{
CNI: &kubeone.CNI{
External: &kubeone.ExternalCNISpec{},
},
KubeProxy: &kubeone.KubeProxyConfig{
IPVS: &kubeone.IPVSConfig{},
},
},
addonsConfig: &kubeone.Addons{
Enable: true,
Addons: []kubeone.Addon{
{
Name: "calico-vxlan",
},
},
},
expectedError: true,
},
}
for _, tc := range tests {
tc := tc
t.Run(tc.name, func(t *testing.T) {
c := kubeone.KubeOneCluster{
CloudProvider: tc.providerConfig,
Versions: tc.versionConfig,
CloudProvider: tc.providerConfig,
Versions: tc.versionConfig,
ClusterNetwork: tc.networkConfig,
Addons: tc.addonsConfig,
}

errs := ValidateCloudProviderSupportsKubernetes(c, nil)
errs := ValidateKubernetesSupport(c, nil)
if (len(errs) == 0) == tc.expectedError {
t.Errorf("test case failed: expected %v, but got %v", tc.expectedError, (len(errs) != 0))
}
Expand Down