From 7271a81921e2fb0cdbbd69bb97b321c232642fef Mon Sep 17 00:00:00 2001 From: Ajay Kumar Date: Mon, 23 Dec 2019 18:25:08 +0530 Subject: [PATCH] validation.go: don't clamp the CIDR size calculations removed not required import, updated build --- cmd/kubeadm/app/apis/kubeadm/validation/BUILD | 1 - cmd/kubeadm/app/apis/kubeadm/validation/validation.go | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmd/kubeadm/app/apis/kubeadm/validation/BUILD b/cmd/kubeadm/app/apis/kubeadm/validation/BUILD index f37cf38ebff..36bd318e199 100644 --- a/cmd/kubeadm/app/apis/kubeadm/validation/BUILD +++ b/cmd/kubeadm/app/apis/kubeadm/validation/BUILD @@ -20,7 +20,6 @@ go_library( "//staging/src/k8s.io/cluster-bootstrap/token/util:go_default_library", "//vendor/github.com/pkg/errors:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", - "//vendor/k8s.io/utils/integer:go_default_library", "//vendor/k8s.io/utils/net:go_default_library", ], ) diff --git a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go b/cmd/kubeadm/app/apis/kubeadm/validation/validation.go index 90129c69cf4..15f24edc451 100644 --- a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go +++ b/cmd/kubeadm/app/apis/kubeadm/validation/validation.go @@ -39,7 +39,6 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/features" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - "k8s.io/utils/integer" utilnet "k8s.io/utils/net" ) @@ -385,7 +384,7 @@ func ValidateIPNetFromString(subnetStr string, minAddrs int64, isDualStack bool, allErrs = append(allErrs, field.Invalid(fldPath, subnetStr, "expected at least one IP from each family (v4 or v6) for dual-stack networking")) } for _, s := range subnets { - numAddresses := integer.Int64Min(utilnet.RangeSize(s), 1<<16) + numAddresses := utilnet.RangeSize(s) if numAddresses < minAddrs { allErrs = append(allErrs, field.Invalid(fldPath, s, "subnet is too small")) } @@ -397,7 +396,7 @@ func ValidateIPNetFromString(subnetStr string, minAddrs int64, isDualStack bool, allErrs = append(allErrs, field.Invalid(fldPath, subnetStr, "couldn't parse subnet")) return allErrs } - numAddresses := integer.Int64Min(utilnet.RangeSize(svcSubnet), 1<<16) + numAddresses := utilnet.RangeSize(svcSubnet) if numAddresses < minAddrs { allErrs = append(allErrs, field.Invalid(fldPath, subnetStr, "subnet is too small")) }