From 7e87806fab11385872924e152545abd8d2b3a91c Mon Sep 17 00:00:00 2001
From: Antonio Ojea <aojea@google.com>
Date: Sun, 29 Oct 2023 18:05:55 +0000
Subject: [PATCH] default_servicecidr_controller: use new ServiceCIDR API

Change-Id: I2c53815136e0d985959420911339aacd62e01e78
---
 .../default_servicecidr_controller.go         | 25 ++++++-------------
 .../default_servicecidr_controller_test.go    | 18 +++++--------
 2 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/pkg/controlplane/controller/defaultservicecidr/default_servicecidr_controller.go b/pkg/controlplane/controller/defaultservicecidr/default_servicecidr_controller.go
index 6049444b617..686bf6e061d 100644
--- a/pkg/controlplane/controller/defaultservicecidr/default_servicecidr_controller.go
+++ b/pkg/controlplane/controller/defaultservicecidr/default_servicecidr_controller.go
@@ -19,6 +19,7 @@ package defaultservicecidr
 import (
 	"context"
 	"net"
+	"reflect"
 	"time"
 
 	v1 "k8s.io/api/core/v1"
@@ -38,7 +39,6 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/klog/v2"
-	netutils "k8s.io/utils/net"
 )
 
 const (
@@ -64,15 +64,9 @@ func NewController(
 	}
 
 	// obtain configuration from flags
-	if netutils.IsIPv4CIDR(&primaryRange) {
-		c.ipv4CIDR = primaryRange.String()
-	} else if netutils.IsIPv4CIDR(&secondaryRange) {
-		c.ipv4CIDR = secondaryRange.String()
-	}
-	if netutils.IsIPv6CIDR(&primaryRange) {
-		c.ipv6CIDR = primaryRange.String()
-	} else if netutils.IsIPv6CIDR(&secondaryRange) {
-		c.ipv6CIDR = secondaryRange.String()
+	c.cidrs = append(c.cidrs, primaryRange.String())
+	if secondaryRange.IP != nil {
+		c.cidrs = append(c.cidrs, secondaryRange.String())
 	}
 	// instead of using the shared informers from the controlplane instance, we construct our own informer
 	// because we need such a small subset of the information available, only the kubernetes.default ServiceCIDR
@@ -95,8 +89,7 @@ func NewController(
 
 // Controller manages selector-based service ipAddress.
 type Controller struct {
-	ipv4CIDR string
-	ipv6CIDR string
+	cidrs []string // order matters, first cidr defines the default IP family
 
 	client           clientset.Interface
 	eventBroadcaster record.EventBroadcaster
@@ -152,14 +145,13 @@ func (c *Controller) sync() {
 	}
 
 	// default ServiceCIDR does not exist
-	klog.Infof("Creating default ServiceCIDR, ipv4: %q ipv6: %q", c.ipv4CIDR, c.ipv6CIDR)
+	klog.Infof("Creating default ServiceCIDR with CIDRs: %v", c.cidrs)
 	serviceCIDR = &networkingapiv1alpha1.ServiceCIDR{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: DefaultServiceCIDRName,
 		},
 		Spec: networkingapiv1alpha1.ServiceCIDRSpec{
-			IPv4: c.ipv4CIDR,
-			IPv6: c.ipv6CIDR,
+			CIDRs: c.cidrs,
 		},
 	}
 	serviceCIDR, err = c.client.NetworkingV1alpha1().ServiceCIDRs().Create(context.Background(), serviceCIDR, metav1.CreateOptions{})
@@ -201,8 +193,7 @@ func (c *Controller) syncStatus(serviceCIDR *networkingapiv1alpha1.ServiceCIDR)
 		}
 	}
 	// set status to ready if the ServiceCIDR matches this configuration
-	if c.ipv4CIDR == serviceCIDR.Spec.IPv4 &&
-		c.ipv6CIDR == serviceCIDR.Spec.IPv6 {
+	if reflect.DeepEqual(c.cidrs, serviceCIDR.Spec.CIDRs) {
 		klog.Infof("Setting default ServiceCIDR condition Ready to True")
 		svcApplyStatus := networkingapiv1alpha1apply.ServiceCIDRStatus().WithConditions(
 			metav1apply.Condition().
diff --git a/pkg/controlplane/controller/defaultservicecidr/default_servicecidr_controller_test.go b/pkg/controlplane/controller/defaultservicecidr/default_servicecidr_controller_test.go
index d02c8eb140a..b0173b0e3f3 100644
--- a/pkg/controlplane/controller/defaultservicecidr/default_servicecidr_controller_test.go
+++ b/pkg/controlplane/controller/defaultservicecidr/default_servicecidr_controller_test.go
@@ -52,8 +52,7 @@ func newController(t *testing.T, objects []*networkingapiv1alpha1.ServiceCIDR) (
 	c := &Controller{
 		client:             client,
 		interval:           time.Second,
-		ipv4CIDR:           defaultIPv4CIDR,
-		ipv6CIDR:           defaultIPv6CIDR,
+		cidrs:              []string{defaultIPv4CIDR, defaultIPv6CIDR},
 		eventRecorder:      record.NewFakeRecorder(100),
 		serviceCIDRLister:  serviceCIDRInformer.Lister(),
 		serviceCIDRsSynced: func() bool { return true },
@@ -81,8 +80,7 @@ func TestControllerSync(t *testing.T) {
 						Name: DefaultServiceCIDRName,
 					},
 					Spec: networkingapiv1alpha1.ServiceCIDRSpec{
-						IPv4: defaultIPv4CIDR,
-						IPv6: defaultIPv6CIDR,
+						CIDRs: []string{defaultIPv4CIDR, defaultIPv6CIDR},
 					},
 				},
 			},
@@ -96,8 +94,7 @@ func TestControllerSync(t *testing.T) {
 						Name: DefaultServiceCIDRName,
 					},
 					Spec: networkingapiv1alpha1.ServiceCIDRSpec{
-						IPv4: "",
-						IPv6: "fd00::/112",
+						CIDRs: []string{"fd00::/112"},
 					},
 				},
 			},
@@ -110,8 +107,7 @@ func TestControllerSync(t *testing.T) {
 						Name: DefaultServiceCIDRName,
 					},
 					Spec: networkingapiv1alpha1.ServiceCIDRSpec{
-						IPv4: defaultIPv4CIDR,
-						IPv6: defaultIPv6CIDR,
+						CIDRs: []string{defaultIPv4CIDR, defaultIPv6CIDR},
 					},
 					Status: networkingapiv1alpha1.ServiceCIDRStatus{
 						Conditions: []metav1.Condition{
@@ -133,8 +129,7 @@ func TestControllerSync(t *testing.T) {
 						DeletionTimestamp: ptr.To(metav1.Now()),
 					},
 					Spec: networkingapiv1alpha1.ServiceCIDRSpec{
-						IPv4: defaultIPv4CIDR,
-						IPv6: defaultIPv6CIDR,
+						CIDRs: []string{defaultIPv4CIDR, defaultIPv6CIDR},
 					},
 				},
 			},
@@ -147,8 +142,7 @@ func TestControllerSync(t *testing.T) {
 						Name: "non-default-cidr",
 					},
 					Spec: networkingapiv1alpha1.ServiceCIDRSpec{
-						IPv4: defaultIPv4CIDR,
-						IPv6: defaultIPv6CIDR,
+						CIDRs: []string{defaultIPv4CIDR, defaultIPv6CIDR},
 					},
 				},
 			},