Skip to content

Commit 0e1f9da

Browse files
committed
modify components to use the networking v1beta1 API
1 parent ed59731 commit 0e1f9da

File tree

19 files changed

+373
-370
lines changed

19 files changed

+373
-370
lines changed

cmd/kube-apiserver/app/aggregator.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ var apiVersionPriorities = merge(controlplaneapiserver.DefaultGenericAPIServiceP
4040
{Group: "batch", Version: "v1beta1"}: {Group: 17400, Version: 9},
4141
{Group: "batch", Version: "v2alpha1"}: {Group: 17400, Version: 9},
4242
{Group: "networking.k8s.io", Version: "v1"}: {Group: 17200, Version: 15},
43+
{Group: "networking.k8s.io", Version: "v1beta1"}: {Group: 17200, Version: 9},
4344
{Group: "networking.k8s.io", Version: "v1alpha1"}: {Group: 17200, Version: 1},
4445
{Group: "policy", Version: "v1"}: {Group: 17100, Version: 15},
4546
{Group: "policy", Version: "v1beta1"}: {Group: 17100, Version: 9},

cmd/kube-controller-manager/app/networking.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ func newServiceCIDRsControllerDescriptor() *ControllerDescriptor {
4040
func startServiceCIDRsController(ctx context.Context, controllerContext ControllerContext, controllerName string) (controller.Interface, bool, error) {
4141
go servicecidrs.NewController(
4242
ctx,
43-
controllerContext.InformerFactory.Networking().V1alpha1().ServiceCIDRs(),
44-
controllerContext.InformerFactory.Networking().V1alpha1().IPAddresses(),
43+
controllerContext.InformerFactory.Networking().V1beta1().ServiceCIDRs(),
44+
controllerContext.InformerFactory.Networking().V1beta1().IPAddresses(),
4545
controllerContext.ClientBuilder.ClientOrDie("service-cidrs-controller"),
4646
).Run(ctx, 5)
4747
// TODO use component config

cmd/kube-proxy/app/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,7 @@ func (s *ProxyServer) Run(ctx context.Context) error {
982982
go endpointSliceConfig.Run(ctx.Done())
983983

984984
if utilfeature.DefaultFeatureGate.Enabled(features.MultiCIDRServiceAllocator) {
985-
serviceCIDRConfig := config.NewServiceCIDRConfig(ctx, informerFactory.Networking().V1alpha1().ServiceCIDRs(), s.Config.ConfigSyncPeriod.Duration)
985+
serviceCIDRConfig := config.NewServiceCIDRConfig(ctx, informerFactory.Networking().V1beta1().ServiceCIDRs(), s.Config.ConfigSyncPeriod.Duration)
986986
serviceCIDRConfig.RegisterEventHandler(s.Proxier)
987987
go serviceCIDRConfig.Run(wait.NeverStop)
988988
}

pkg/api/servicecidr/servicecidr.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ import (
2121
"net"
2222
"net/netip"
2323

24-
networkingv1alpha1 "k8s.io/api/networking/v1alpha1"
24+
networkingv1beta1 "k8s.io/api/networking/v1beta1"
2525
"k8s.io/apimachinery/pkg/labels"
26-
networkinglisters "k8s.io/client-go/listers/networking/v1alpha1"
26+
networkinglisters "k8s.io/client-go/listers/networking/v1beta1"
2727
)
2828

2929
// OverlapsPrefix return the list of ServiceCIDR that overlaps with the prefix passed as argument
30-
func OverlapsPrefix(serviceCIDRLister networkinglisters.ServiceCIDRLister, prefix netip.Prefix) []*networkingv1alpha1.ServiceCIDR {
31-
result := []*networkingv1alpha1.ServiceCIDR{}
30+
func OverlapsPrefix(serviceCIDRLister networkinglisters.ServiceCIDRLister, prefix netip.Prefix) []*networkingv1beta1.ServiceCIDR {
31+
result := []*networkingv1beta1.ServiceCIDR{}
3232
serviceCIDRList, err := serviceCIDRLister.List(labels.Everything())
3333
if err != nil {
3434
return result
@@ -47,8 +47,8 @@ func OverlapsPrefix(serviceCIDRLister networkinglisters.ServiceCIDRLister, prefi
4747
}
4848

4949
// ContainsPrefix return the list of ServiceCIDR that contains the prefix passed as argument
50-
func ContainsPrefix(serviceCIDRLister networkinglisters.ServiceCIDRLister, prefix netip.Prefix) []*networkingv1alpha1.ServiceCIDR {
51-
result := []*networkingv1alpha1.ServiceCIDR{}
50+
func ContainsPrefix(serviceCIDRLister networkinglisters.ServiceCIDRLister, prefix netip.Prefix) []*networkingv1beta1.ServiceCIDR {
51+
result := []*networkingv1beta1.ServiceCIDR{}
5252
serviceCIDRList, err := serviceCIDRLister.List(labels.Everything())
5353
if err != nil {
5454
return result
@@ -67,14 +67,14 @@ func ContainsPrefix(serviceCIDRLister networkinglisters.ServiceCIDRLister, prefi
6767
}
6868

6969
// ContainsIP return the list of ServiceCIDR that contains the IP address passed as argument
70-
func ContainsIP(serviceCIDRLister networkinglisters.ServiceCIDRLister, ip net.IP) []*networkingv1alpha1.ServiceCIDR {
70+
func ContainsIP(serviceCIDRLister networkinglisters.ServiceCIDRLister, ip net.IP) []*networkingv1beta1.ServiceCIDR {
7171
address := IPToAddr(ip)
7272
return ContainsAddress(serviceCIDRLister, address)
7373
}
7474

7575
// ContainsAddress return the list of ServiceCIDR that contains the address passed as argument
76-
func ContainsAddress(serviceCIDRLister networkinglisters.ServiceCIDRLister, address netip.Addr) []*networkingv1alpha1.ServiceCIDR {
77-
result := []*networkingv1alpha1.ServiceCIDR{}
76+
func ContainsAddress(serviceCIDRLister networkinglisters.ServiceCIDRLister, address netip.Addr) []*networkingv1beta1.ServiceCIDR {
77+
result := []*networkingv1beta1.ServiceCIDR{}
7878
serviceCIDRList, err := serviceCIDRLister.List(labels.Everything())
7979
if err != nil {
8080
return result

0 commit comments

Comments
 (0)