diff --git a/pkg/controller/nodeipam/ipam/cidr_allocator.go b/pkg/controller/nodeipam/ipam/cidr_allocator.go index 10f0dce5a44..b53bee83fc6 100644 --- a/pkg/controller/nodeipam/ipam/cidr_allocator.go +++ b/pkg/controller/nodeipam/ipam/cidr_allocator.go @@ -22,6 +22,8 @@ import ( "net" "time" + "k8s.io/kubernetes/pkg/controller/nodeipam/ipam/cidrset" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" @@ -160,3 +162,14 @@ func ipnetToStringList(inCIDRs []*net.IPNet) []string { } return outCIDRs } + +// occupyServiceCIDR removes the service CIDR range from the cluster CIDR if it +// intersects. +func occupyServiceCIDR(set *cidrset.CidrSet, clusterCIDR, serviceCIDR *net.IPNet) error { + if clusterCIDR.Contains(serviceCIDR.IP) || serviceCIDR.Contains(clusterCIDR.IP) { + if err := set.Occupy(serviceCIDR); err != nil { + return err + } + } + return nil +} diff --git a/pkg/controller/nodeipam/ipam/controller_legacyprovider.go b/pkg/controller/nodeipam/ipam/controller_legacyprovider.go index bdf318b8d59..7b8179f492f 100644 --- a/pkg/controller/nodeipam/ipam/controller_legacyprovider.go +++ b/pkg/controller/nodeipam/ipam/controller_legacyprovider.go @@ -165,17 +165,6 @@ func (c *Controller) Run(ctx context.Context) { <-ctx.Done() } -// occupyServiceCIDR removes the service CIDR range from the cluster CIDR if it -// intersects. -func occupyServiceCIDR(set *cidrset.CidrSet, clusterCIDR, serviceCIDR *net.IPNet) error { - if clusterCIDR.Contains(serviceCIDR.IP) || serviceCIDR.Contains(clusterCIDR.IP) { - if err := set.Occupy(serviceCIDR); err != nil { - return err - } - } - return nil -} - type nodeState struct { t Timeout } diff --git a/pkg/controller/nodeipam/ipam/controller_test.go b/pkg/controller/nodeipam/ipam/controller_test.go index 791856082c5..6e5a6f99571 100644 --- a/pkg/controller/nodeipam/ipam/controller_test.go +++ b/pkg/controller/nodeipam/ipam/controller_test.go @@ -1,6 +1,3 @@ -//go:build !providerless -// +build !providerless - /* Copyright 2017 The Kubernetes Authors.