Support SubnetIPReservations with reservedIPs

Signed-off-by: Yanjun Zhou <yanjun.zhou@broadcom.com>

Author: yanjunz97

build/yaml/crd/vpc/crd.nsx.vmware.com_subnetipreservations.yaml

@@ -59,20 +59,37 @@ spec:
                 minimum: 1
                 type: integer
                 x-kubernetes-validations:
-                - message: NumberOfIPs is immutable
+                - message: numberOfIPs is immutable
                   rule: self == oldSelf
+              reservedIPs:
+                description: |-
+                  ReservedIPs represents array of Reserved IPs. It can can contain IP addresses,
+                  IP Address range and CIDRs.
+                  Supported formats include: ["192.168.1.1", "192.168.1.3-192.168.1.100", "192.168.2.0/28"]
+                items:
+                  type: string
+                minItems: 1
+                type: array
               subnet:
                 description: |-
                   Subnet specifies the Subnet to reserve IPs from.
                   The Subnet needs to have static IP allocation activated.
                 type: string
                 x-kubernetes-validations:
-                - message: Subnet is immutable
+                - message: subnet is immutable
                   rule: self == oldSelf
             required:
-            - numberOfIPs
             - subnet
             type: object
+            x-kubernetes-validations:
+            - message: Only one of numberOfIPs or reservedIPs can be specified
+              rule: '!has(self.numberOfIPs) || !has(self.reservedIPs)'
+            - message: One of numberOfIPs or reservedIPs must be specified
+              rule: has(self.numberOfIPs) || has(self.reservedIPs)
+            - message: reservedIPs cannot be unset once set
+              rule: '!has(oldSelf.reservedIPs) || has(self.reservedIPs)'
+            - message: numberOfIPs cannot be unset once set
+              rule: '!has(oldSelf.numberOfIPs) || has(self.numberOfIPs)'
           status:
             description: SubnetIPReservationStatus defines the observed state of SubnetIPReservation
             properties:
@@ -110,7 +127,7 @@ spec:
               ips:
                 description: |-
                   List of reserved IPs.
-                  Supported formats include: ["192.168.1.1", "192.168.1.3-192.168.1.100"]
+                  Supported formats include: ["192.168.1.1", "192.168.1.3-192.168.1.100", "192.168.2.0/28"]
                 items:
                   type: string
                 type: array

docs/ref/apis/vpc.md

@@ -141,6 +141,7 @@ _Appears in:_
 | `AutoSnatEnabled` |  |
 | `ExternalIPBlocksConfigured` |  |
 | `DeletionFailed` |  |
+| `UpdateFailed` |  |
 
 
 #### ConnectivityState
@@ -850,7 +851,8 @@ _Appears in:_
 | Field | Description | Default | Validation |
 | --- | --- | --- | --- |
 | `subnet` _string_ | Subnet specifies the Subnet to reserve IPs from.<br />The Subnet needs to have static IP allocation activated. |  | Required: \{\} <br /> |
-| `numberOfIPs` _integer_ | NumberOfIPs defines number of IPs requested to be reserved. |  | Maximum: 100 <br />Minimum: 1 <br />Required: \{\} <br /> |
+| `numberOfIPs` _integer_ | NumberOfIPs defines number of IPs requested to be reserved. |  | Maximum: 100 <br />Minimum: 1 <br /> |
+| `reservedIPs` _string array_ | ReservedIPs represents array of Reserved IPs. It can can contain IP addresses,<br />IP Address range and CIDRs.<br />Supported formats include: ["192.168.1.1", "192.168.1.3-192.168.1.100", "192.168.2.0/28"] |  | MinItems: 1 <br /> |
 
 
 #### SubnetIPReservationStatus
@@ -867,7 +869,7 @@ _Appears in:_
 | Field | Description | Default | Validation |
 | --- | --- | --- | --- |
 | `conditions` _[Condition](#condition) array_ | Conditions described if the SubnetIPReservation is configured on NSX or not.<br />Condition type "" |  |  |
-| `ips` _string array_ | List of reserved IPs.<br />Supported formats include: ["192.168.1.1", "192.168.1.3-192.168.1.100"] |  |  |
+| `ips` _string array_ | List of reserved IPs.<br />Supported formats include: ["192.168.1.1", "192.168.1.3-192.168.1.100", "192.168.2.0/28"] |  |  |
 
 
 #### SubnetInfo

go.mod

@@ -32,8 +32,8 @@ require (
 	github.com/vmware/govmomi v0.27.4
 	github.com/vmware/vsphere-automation-sdk-go/lib v0.7.0
 	github.com/vmware/vsphere-automation-sdk-go/runtime v0.7.0
-	github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.0.0-20251214130913-3e87ca3a7aed
-	github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp v0.0.0-20251214130913-3e87ca3a7aed
+	github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.0.0-20260310075027-d32fca6a7b22
+	github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp v0.0.0-20260310075027-d32fca6a7b22
 	go.uber.org/automaxprocs v1.5.3
 	go.uber.org/zap v1.26.0
 	golang.org/x/crypto v0.47.0
@@ -47,7 +47,6 @@ require (
 	k8s.io/code-generator v0.31.0
 	k8s.io/utils v0.0.0-20260108192941-914a6e750570
 	sigs.k8s.io/controller-runtime v0.19.0
-	sigs.k8s.io/gateway-api v1.5.0
 )
 
 require (
@@ -79,6 +78,8 @@ require (
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
+	github.com/onsi/ginkgo/v2 v2.28.0 // indirect
+	github.com/onsi/gomega v1.39.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
@@ -91,13 +92,13 @@ require (
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
-	golang.org/x/mod v0.31.0 // indirect
+	golang.org/x/mod v0.32.0 // indirect
 	golang.org/x/net v0.49.0 // indirect
 	golang.org/x/oauth2 v0.34.0 // indirect
 	golang.org/x/sys v0.40.0 // indirect
 	golang.org/x/term v0.39.0 // indirect
 	golang.org/x/text v0.33.0 // indirect
-	golang.org/x/tools v0.40.0 // indirect
+	golang.org/x/tools v0.41.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect

go.sum

@@ -65,8 +65,8 @@ github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J0b1vyeLSOYI8bm5wbJM/8yDe8=
-github.com/google/pprof v0.0.0-20250403155104-27863c87afa6/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
+github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 h1:z2ogiKUYzX5Is6zr/vP9vJGqPwcdqsWjOt+V8J7+bTc=
+github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -159,10 +159,10 @@ github.com/vmware/vsphere-automation-sdk-go/lib v0.7.0 h1:pT+oqJ8FD5eUBQkl+e7LZw
 github.com/vmware/vsphere-automation-sdk-go/lib v0.7.0/go.mod h1:f3+6YVZpNcK2pYyiQ94BoHWmjMj9BnYav0vNFuTiDVM=
 github.com/vmware/vsphere-automation-sdk-go/runtime v0.7.0 h1:pSBxa9Agh6bgW8Hr0A1eQxuwnxGTnuAVox8iQb023hg=
 github.com/vmware/vsphere-automation-sdk-go/runtime v0.7.0/go.mod h1:qdzEFm2iK3dvlmm99EYYNxs70HbzuiHyENFD24Ps8fQ=
-github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.0.0-20251214130913-3e87ca3a7aed h1:i0PpOk/+vFa48FJMIhOqMSi2koIKvKwm/t1K4xccuLA=
-github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.0.0-20251214130913-3e87ca3a7aed/go.mod h1:C3JVOHRVLrGBQ8kTWAiGYlRz5UQC5qAcTdt3tvA+5P0=
-github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp v0.0.0-20251214130913-3e87ca3a7aed h1:X1Adxoq1388wnuWK5fvEvxpEhcgRzhUe5L6vKeSEofU=
-github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp v0.0.0-20251214130913-3e87ca3a7aed/go.mod h1:ugk9I4YM62SSAox57l5NAVBCRIkPQ1RNLb3URxyTADc=
+github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.0.0-20260310075027-d32fca6a7b22 h1:yDMJj+UG0u9aDdC0Q1byw8QEjfPd8gm7QKB2mo2oU1I=
+github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.0.0-20260310075027-d32fca6a7b22/go.mod h1:C3JVOHRVLrGBQ8kTWAiGYlRz5UQC5qAcTdt3tvA+5P0=
+github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp v0.0.0-20260310075027-d32fca6a7b22 h1:SKbUc9p+LFUwtPvjk9WCwrjstN6NpewgPx4eWSIZq+k=
+github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp v0.0.0-20260310075027-d32fca6a7b22/go.mod h1:ugk9I4YM62SSAox57l5NAVBCRIkPQ1RNLb3URxyTADc=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -193,8 +193,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI=
-golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=
+golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
+golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -255,8 +255,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
-golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
+golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
+golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
 golang.org/x/tools/go/expect v0.1.0-deprecated h1:jY2C5HGYR5lqex3gEniOQL0r7Dq5+VGVgY1nudX5lXY=
 golang.org/x/tools/go/expect v0.1.0-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY=
 golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated h1:1h2MnaIAIXISqTFKdENegdpAgUXz6NrPEsbIeWaBRvM=
@@ -304,8 +304,6 @@ k8s.io/utils v0.0.0-20260108192941-914a6e750570 h1:JT4W8lsdrGENg9W+YwwdLJxklIuKW
 k8s.io/utils v0.0.0-20260108192941-914a6e750570/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
 sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q=
 sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
-sigs.k8s.io/gateway-api v1.5.0 h1:duoo14Ky/fJXpjpmyMISE2RTBGnfCg8zICfTYLTnBJA=
-sigs.k8s.io/gateway-api v1.5.0/go.mod h1:GvCETiaMAlLym5CovLxGjS0NysqFk3+Yuq3/rh6QL2o=
 sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
 sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
 sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=

pkg/apis/vpc/v1alpha1/subnetipreservation_types.go

@@ -8,19 +8,28 @@ import (
 )
 
 // SubnetIPReservationSpec defines the desired state of SubnetIPReservation
+// +kubebuilder:validation:XValidation:rule="!has(self.numberOfIPs) || !has(self.reservedIPs)",message="Only one of numberOfIPs or reservedIPs can be specified"
+// +kubebuilder:validation:XValidation:rule="has(self.numberOfIPs) || has(self.reservedIPs)",message="One of numberOfIPs or reservedIPs must be specified"
+// +kubebuilder:validation:XValidation:rule="!has(oldSelf.reservedIPs) || has(self.reservedIPs)",message="reservedIPs cannot be unset once set"
+// +kubebuilder:validation:XValidation:rule="!has(oldSelf.numberOfIPs) || has(self.numberOfIPs)",message="numberOfIPs cannot be unset once set"
 type SubnetIPReservationSpec struct {
 	// Subnet specifies the Subnet to reserve IPs from.
 	// The Subnet needs to have static IP allocation activated.
 	// +kubebuilder:validation:Required
-	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Subnet is immutable"
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="subnet is immutable"
 	Subnet string `json:"subnet"`
 
 	// NumberOfIPs defines number of IPs requested to be reserved.
-	// +kubebuilder:validation:Required
-	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="NumberOfIPs is immutable"
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="numberOfIPs is immutable"
 	// +kubebuilder:validation:Maximum:=100
 	// +kubebuilder:validation:Minimum:=1
-	NumberOfIPs int `json:"numberOfIPs"`
+	NumberOfIPs int `json:"numberOfIPs,omitempty"`
+
+	// ReservedIPs represents array of Reserved IPs. It can can contain IP addresses,
+	// IP Address range and CIDRs.
+	// Supported formats include: ["192.168.1.1", "192.168.1.3-192.168.1.100", "192.168.2.0/28"]
+	// +kubebuilder:validation:MinItems=1
+	ReservedIPs []string `json:"reservedIPs,omitempty"`
 }
 
 // SubnetIPReservationStatus defines the observed state of SubnetIPReservation
@@ -29,7 +38,7 @@ type SubnetIPReservationStatus struct {
 	// Condition type ""
 	Conditions []Condition `json:"conditions,omitempty"`
 	// List of reserved IPs.
-	// Supported formats include: ["192.168.1.1", "192.168.1.3-192.168.1.100"]
+	// Supported formats include: ["192.168.1.1", "192.168.1.3-192.168.1.100", "192.168.2.0/28"]
 	IPs []string `json:"ips,omitempty"`
 }
 

pkg/apis/vpc/v1alpha1/zz_generated.deepcopy.go

@@ -43,12 +43,64 @@ type Reconciler struct {
 	IPReservationService *subnetipreservation.IPReservationService
 	SubnetService        servicecommon.SubnetServiceProvider
 	StatusUpdater        common.StatusUpdater
+	restoreMode          bool
 }
 
 func (r *Reconciler) RestoreReconcile() error {
+	// Only resotre IPReservation if Subnet StaticIPReservation is supported
+	if !r.IPReservationService.NSXClient.NSXCheckVersion(nsx.StaticIPReservation) {
+		return nil
+	}
+	restoreList, err := r.getRestoreList()
+	if err != nil {
+		err = fmt.Errorf("failed to get SubnetIPReservation restore list: %w", err)
+		return err
+	}
+	var errorList []error
+	r.restoreMode = true
+	for _, key := range restoreList {
+		result, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: key})
+		if result.Requeue || err != nil {
+			errorList = append(errorList, fmt.Errorf("failed to restore SubnetIPReservation %s, error: %w", key, err))
+		}
+	}
+	if len(errorList) > 0 {
+		return fmt.Errorf("errors found in SubnetIPReservation restore: %v", errorList)
+	}
 	return nil
 }
 
+func (r *Reconciler) getRestoreList() ([]types.NamespacedName, error) {
+	restoreList := []types.NamespacedName{}
+	subnetIPReservationList := &v1alpha1.SubnetIPReservationList{}
+	if err := r.Client.List(context.TODO(), subnetIPReservationList); err != nil {
+		return restoreList, err
+	}
+	for _, ipReservation := range subnetIPReservationList.Items {
+		// Skip the SubnetIPReservation which is not created
+		if len(ipReservation.Status.IPs) == 0 {
+			continue
+		}
+		var reservedIPs []string
+		// Search for both dynamic and static ipreservation store for the NSX IPReservation
+		dynamicIPReservations := r.IPReservationService.DynamicIPReservationStore.GetByIndex(servicecommon.TagScopeSubnetIPReservationCRUID, string(ipReservation.UID))
+		if len(dynamicIPReservations) > 0 {
+			reservedIPs = dynamicIPReservations[0].Ips
+		} else {
+			staticIPReservations := r.IPReservationService.StaticIPReservationStore.GetByIndex(servicecommon.TagScopeSubnetIPReservationCRUID, string(ipReservation.UID))
+			if len(staticIPReservations) > 0 {
+				reservedIPs = staticIPReservations[0].ReservedIps
+			}
+		}
+		// Skip the SubnetIPReservation if the existing reserved ip is the same as CR status
+		if reflect.DeepEqual(reservedIPs, ipReservation.Status.IPs) {
+			continue
+		}
+		restoreList = append(restoreList, types.NamespacedName{Namespace: ipReservation.Namespace, Name: ipReservation.Name})
+	}
+	return restoreList, nil
+}
+
 func NewReconciler(mgr ctrl.Manager, ipReservationService *subnetipreservation.IPReservationService, subnetService servicecommon.SubnetServiceProvider) *Reconciler {
 	recorder := mgr.GetEventRecorderFor("subnetipreservation-controller")
 	// Create the SubnetIPReservation Reconciler with the necessary services and configuration
@@ -195,14 +247,14 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 	}
 
 	// Create or update SubnetIPReservation
-	nsxIPReservation, err := r.IPReservationService.GetOrCreateSubnetIPReservation(ipReservationCR, *nsxSubnet.Path)
+	ips, err := r.IPReservationService.CreateOrUpdateSubnetIPReservation(ipReservationCR, *nsxSubnet.Path, r.restoreMode)
 	if err != nil {
 		log.Error(err, "Failed to get or create NSX SubnetIPReservations")
 		r.StatusUpdater.UpdateFail(ctx, ipReservationCR, err, "Failed to get or create NSX SubnetIPReservations", setReadyStatusFalse)
 		return common.ResultRequeue, nil
 	}
 
-	ipReservationCR.Status.IPs = nsxIPReservation.Ips
+	ipReservationCR.Status.IPs = ips
 	// Update SubnetIPReservation with ready condition
 	r.StatusUpdater.UpdateSuccess(ctx, ipReservationCR, setReadyStatusTrue)
 	return common.ResultNormal, nil