github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #122595 from dims/support-building-with-and-without-cloud-providers

Browse Source 
KUBE_PROVIDERLESS - Support building with and without cloud providers
This commit is contained in:
Kubernetes Prow Robot
2024-01-11 05:42:23 +01:00
committed by GitHub
parent 741fd84d15 ce263d8828
commit c9158e9a19
82 changed files with 903 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/controller/nodeipam/ipam/cidr_allocator.go
View File

@@ -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
}

11
pkg/controller/nodeipam/ipam/controller_legacyprovider.go
View File

@@ -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
}