From 9d8dec60d6250165d49f68752f0ef2d6810bdbe6 Mon Sep 17 00:00:00 2001 From: Yan Grunenberger Date: Mon, 1 Mar 2021 10:26:40 +0100 Subject: [PATCH] Allow multi-CNI setups to set usesSecondaryIP (#10828) * validation.go: remove checks on CNI * move CNI block check to allow option with others CNI --- pkg/apis/kops/validation/validation.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkg/apis/kops/validation/validation.go b/pkg/apis/kops/validation/validation.go index c281eeaa80..fe77f046e3 100644 --- a/pkg/apis/kops/validation/validation.go +++ b/pkg/apis/kops/validation/validation.go @@ -541,13 +541,6 @@ func validateNetworking(cluster *kops.Cluster, v *kops.NetworkingSpec, fldPath * optionTaken = true } - if v.CNI != nil { - if optionTaken { - allErrs = append(allErrs, field.Forbidden(fldPath.Child("cni"), "only one networking option permitted")) - } - optionTaken = true - } - if v.Kopeio != nil { if optionTaken { allErrs = append(allErrs, field.Forbidden(fldPath.Child("kopeio"), "only one networking option permitted")) @@ -555,6 +548,10 @@ func validateNetworking(cluster *kops.Cluster, v *kops.NetworkingSpec, fldPath * optionTaken = true } + if v.CNI != nil && optionTaken { + allErrs = append(allErrs, field.Forbidden(fldPath.Child("cni"), "only one networking option permitted")) + } + if v.Weave != nil { if optionTaken { allErrs = append(allErrs, field.Forbidden(fldPath.Child("weave"), "only one networking option permitted"))