github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

validation.go: don't clamp the CIDR size calculations

Browse Source 
removed not required import, updated build
This commit is contained in:
Ajay Kumar 2019-12-23 18:25:08 +05:30
parent 9b3db701a1
commit 7271a81921
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kubeadm/app/apis/kubeadm/validation/BUILD
View File

@ -20,7 +20,6 @@ go_library(
"//staging/src/k8s.io/cluster-bootstrap/token/util:go_default_library", "//staging/src/k8s.io/cluster-bootstrap/token/util:go_default_library",
"//vendor/github.com/pkg/errors:go_default_library", "//vendor/github.com/pkg/errors:go_default_library",
"//vendor/github.com/spf13/pflag: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", "//vendor/k8s.io/utils/net:go_default_library",
], ],
) )

5
cmd/kubeadm/app/apis/kubeadm/validation/validation.go
View File

@ -39,7 +39,6 @@ import (
"k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/constants"
"k8s.io/kubernetes/cmd/kubeadm/app/features" "k8s.io/kubernetes/cmd/kubeadm/app/features"
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
"k8s.io/utils/integer"
utilnet "k8s.io/utils/net" 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")) 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 { for _, s := range subnets {
numAddresses := integer.Int64Min(utilnet.RangeSize(s), 1<<16) numAddresses := utilnet.RangeSize(s)
if numAddresses < minAddrs { if numAddresses < minAddrs {
allErrs = append(allErrs, field.Invalid(fldPath, s, "subnet is too small")) 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")) allErrs = append(allErrs, field.Invalid(fldPath, subnetStr, "couldn't parse subnet"))
return allErrs return allErrs
} }
numAddresses := integer.Int64Min(utilnet.RangeSize(svcSubnet), 1<<16) numAddresses := utilnet.RangeSize(svcSubnet)
if numAddresses < minAddrs { if numAddresses < minAddrs {
allErrs = append(allErrs, field.Invalid(fldPath, subnetStr, "subnet is too small")) allErrs = append(allErrs, field.Invalid(fldPath, subnetStr, "subnet is too small"))
} }