mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 13:37:30 +00:00
Merge pull request #110485 from Octopusjust/k8s-pr
cidr_set.go : fix several typo
This commit is contained in:
commit
694698ca38
@ -174,7 +174,7 @@ func (s *CidrSet) AllocateNext() (*net.IPNet, error) {
|
|||||||
return s.indexToCIDRBlock(candidate), nil
|
return s.indexToCIDRBlock(candidate), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *CidrSet) getBeginingAndEndIndices(cidr *net.IPNet) (begin, end int, err error) {
|
func (s *CidrSet) getBeginningAndEndIndices(cidr *net.IPNet) (begin, end int, err error) {
|
||||||
if cidr == nil {
|
if cidr == nil {
|
||||||
return -1, -1, fmt.Errorf("error getting indices for cluster cidr %v, cidr is nil", s.clusterCIDR)
|
return -1, -1, fmt.Errorf("error getting indices for cluster cidr %v, cidr is nil", s.clusterCIDR)
|
||||||
}
|
}
|
||||||
@ -225,7 +225,7 @@ func (s *CidrSet) getBeginingAndEndIndices(cidr *net.IPNet) (begin, end int, err
|
|||||||
|
|
||||||
// Release releases the given CIDR range.
|
// Release releases the given CIDR range.
|
||||||
func (s *CidrSet) Release(cidr *net.IPNet) error {
|
func (s *CidrSet) Release(cidr *net.IPNet) error {
|
||||||
begin, end, err := s.getBeginingAndEndIndices(cidr)
|
begin, end, err := s.getBeginningAndEndIndices(cidr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -248,7 +248,7 @@ func (s *CidrSet) Release(cidr *net.IPNet) error {
|
|||||||
// Occupy marks the given CIDR range as used. Occupy succeeds even if the CIDR
|
// Occupy marks the given CIDR range as used. Occupy succeeds even if the CIDR
|
||||||
// range was previously used.
|
// range was previously used.
|
||||||
func (s *CidrSet) Occupy(cidr *net.IPNet) (err error) {
|
func (s *CidrSet) Occupy(cidr *net.IPNet) (err error) {
|
||||||
begin, end, err := s.getBeginingAndEndIndices(cidr)
|
begin, end, err := s.getBeginningAndEndIndices(cidr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user