Merge pull request #1221 from DanielXiao/bump-nsx-api

Bump nsx-operator mod
kubernetes · Aug 28, 2024 · 81c893a · 81c893a
2 parents 214b68b + 5fc64a9
commit 81c893a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -15,8 +15,8 @@ require (
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.9.0
-	github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20240816024231-ca8ea47d918d
-	github.com/vmware-tanzu/nsx-operator/pkg/client v0.0.0-20240816024231-ca8ea47d918d
+	github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20240827061921-8f0982975508
+	github.com/vmware-tanzu/nsx-operator/pkg/client v0.0.0-20240827061921-8f0982975508
 	github.com/vmware-tanzu/vm-operator/api v1.8.6
 	github.com/vmware/govmomi v0.42.0
 	github.com/vmware/vsphere-automation-sdk-go/lib v0.7.0

diff --git a/go.sum b/go.sum
@@ -170,10 +170,10 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk=
-github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20240816024231-ca8ea47d918d h1:xxx1jmQDDdNTG3eSFlTaehbVQMrLnXQfzpty+DwAWj0=
-github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20240816024231-ca8ea47d918d/go.mod h1:Q4JzNkNMvjo7pXtlB5/R3oME4Nhah7fAObWgghVmtxk=
-github.com/vmware-tanzu/nsx-operator/pkg/client v0.0.0-20240816024231-ca8ea47d918d h1:8XztAkqq7nKQTBzusKuXLdDCFQ/HAFt7JU4kNlBCYuY=
-github.com/vmware-tanzu/nsx-operator/pkg/client v0.0.0-20240816024231-ca8ea47d918d/go.mod h1:Hsn4QLNjQA6wQYGI6IlQJrTqM+29KWCVdyFgS7a2Sck=
+github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20240827061921-8f0982975508 h1:NBjcpxDcurBzM3uMfX7LpkDE6okU+x7XdDSqVdqXVO8=
+github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20240827061921-8f0982975508/go.mod h1:Q4JzNkNMvjo7pXtlB5/R3oME4Nhah7fAObWgghVmtxk=
+github.com/vmware-tanzu/nsx-operator/pkg/client v0.0.0-20240827061921-8f0982975508 h1:oLcoseDTk/8eVXMu74aZQWxaiMTB/ym3CP8NNQ4qRqg=
+github.com/vmware-tanzu/nsx-operator/pkg/client v0.0.0-20240827061921-8f0982975508/go.mod h1:Hsn4QLNjQA6wQYGI6IlQJrTqM+29KWCVdyFgS7a2Sck=
 github.com/vmware-tanzu/vm-operator/api v1.8.6 h1:NIndORjcnSmIlQsCMIewpIwg/ocRVDh2lYjOroTVLrU=
 github.com/vmware-tanzu/vm-operator/api v1.8.6/go.mod h1:HHA2SNI9B5Yqtyp5t+Gt9WTWBi/fIkM6+MukDDSf11A=
 github.com/vmware/govmomi v0.42.0 h1:MbvAlVfjNBE1mHMaQ7yOSop1KLB0/93x6VAGuCtjqtI=

diff --git a/...paravirtual/controllers/routablepod/ipaddressallocation/ipaddressallocation_controller.go b/...paravirtual/controllers/routablepod/ipaddressallocation/ipaddressallocation_controller.go
@@ -257,7 +257,7 @@ func (c *Controller) processIPAddressAllocationCreateOrUpdate(ctx context.Contex
 			if condition.Status != corev1.ConditionTrue {
 				return fmt.Errorf("IPAddressAllocation %v is not ready", ipAddressAllocation.Name)
 			}
-			podCIDR = ipAddressAllocation.Status.CIDR
+			podCIDR = ipAddressAllocation.Status.AllocationIPs
 		}
 	}
 	if podCIDR == "" {

diff --git a/...irtual/controllers/routablepod/ipaddressallocation/ipaddressallocation_controller_test.go b/...irtual/controllers/routablepod/ipaddressallocation/ipaddressallocation_controller_test.go
@@ -104,7 +104,7 @@ func newIPAddressAllocation(name string, ipAddressBlockVisibility vpcapisv1.IPAd
 			AllocationSize:           24,
 		},
 		Status: vpcapisv1.IPAddressAllocationStatus{
-			CIDR: cidr,
+			AllocationIPs: cidr,
 			Conditions: []vpcapisv1.Condition{
 				{
 					Type:   vpcapisv1.Ready,