From 8b4d7fefe90ea7eb7945eb146d78c4f77e326ed1 Mon Sep 17 00:00:00 2001 From: Yifeng Xiao Date: Wed, 14 Aug 2024 16:56:14 +0800 Subject: [PATCH] Update nsx-operator API mod There is a group refactor in nsx-operator API, so we need to update to latest version. --- go.mod | 2 +- go.sum | 2 ++ pkg/manager/manager.go | 4 +-- pkg/services/network/constants.go | 4 +-- pkg/services/network/network_test.go | 30 +++++++++++------------ pkg/services/network/nsxt_vpc_provider.go | 18 +++++++------- 6 files changed, 31 insertions(+), 29 deletions(-) diff --git a/go.mod b/go.mod index 717bc468f1..4bac4d0fb1 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ replace github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels => github.c require ( github.com/vmware-tanzu/net-operator-api v0.0.0-20240326163340-1f32d6bf7f9d - github.com/vmware-tanzu/nsx-operator/pkg/apis v0.1.0 + github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20240814023228-d5107efc5039 // The version of vm-operator should be kept in sync with the manifests at: config/deployments/integration-tests github.com/vmware-tanzu/vm-operator/api v1.8.6 github.com/vmware-tanzu/vm-operator/external/ncp v0.0.0-20240404200847-de75746a9505 diff --git a/go.sum b/go.sum index 15456bc38c..3304e3a557 100644 --- a/go.sum +++ b/go.sum @@ -270,6 +270,8 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7 github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk= github.com/vmware-tanzu/net-operator-api v0.0.0-20240326163340-1f32d6bf7f9d h1:cgx9UH/r53bKU/Gbv8IPsUZ34bj5+ItijA2JCUS3kVk= github.com/vmware-tanzu/net-operator-api v0.0.0-20240326163340-1f32d6bf7f9d/go.mod h1:JbFOh22iDsT5BowJe0GgpMI5e2/S7cWaJlv9LdURVQM= +github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20240814023228-d5107efc5039 h1:FrKImh1JgOTvkXuhOYdWgSpVZ8sNJEbWuDKKeV3R5JQ= +github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20240814023228-d5107efc5039/go.mod h1:Q4JzNkNMvjo7pXtlB5/R3oME4Nhah7fAObWgghVmtxk= github.com/vmware-tanzu/nsx-operator/pkg/apis v0.1.0 h1:HdnQb/X9vJ8a5WQ03g/0nDr9igIIK1fF6wO5wOtkJT4= github.com/vmware-tanzu/nsx-operator/pkg/apis v0.1.0/go.mod h1:Q4JzNkNMvjo7pXtlB5/R3oME4Nhah7fAObWgghVmtxk= github.com/vmware-tanzu/vm-operator/api v1.8.6 h1:NIndORjcnSmIlQsCMIewpIwg/ocRVDh2lYjOroTVLrU= diff --git a/pkg/manager/manager.go b/pkg/manager/manager.go index c17a811aea..ae5f36f269 100644 --- a/pkg/manager/manager.go +++ b/pkg/manager/manager.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" netopv1 "github.com/vmware-tanzu/net-operator-api/api/v1alpha1" - nsxopv1 "github.com/vmware-tanzu/nsx-operator/pkg/apis/v1alpha1" + vpcapisv1 "github.com/vmware-tanzu/nsx-operator/pkg/apis/vpc/v1alpha1" vmoprv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha2" ncpv1 "github.com/vmware-tanzu/vm-operator/external/ncp/api/v1alpha1" "gopkg.in/fsnotify.v1" @@ -65,7 +65,7 @@ func New(ctx context.Context, opts Options) (Manager, error) { _ = vmoprv1.AddToScheme(opts.Scheme) _ = ncpv1.AddToScheme(opts.Scheme) _ = netopv1.AddToScheme(opts.Scheme) - _ = nsxopv1.AddToScheme(opts.Scheme) + _ = vpcapisv1.AddToScheme(opts.Scheme) _ = topologyv1.AddToScheme(opts.Scheme) _ = ipamv1.AddToScheme(opts.Scheme) diff --git a/pkg/services/network/constants.go b/pkg/services/network/constants.go index 902c8d24ce..76058840b9 100644 --- a/pkg/services/network/constants.go +++ b/pkg/services/network/constants.go @@ -19,7 +19,7 @@ package network import ( netopv1 "github.com/vmware-tanzu/net-operator-api/api/v1alpha1" - nsxopv1 "github.com/vmware-tanzu/nsx-operator/pkg/apis/v1alpha1" + vpcapisv1 "github.com/vmware-tanzu/nsx-operator/pkg/apis/vpc/v1alpha1" ncpv1 "github.com/vmware-tanzu/vm-operator/external/ncp/api/v1alpha1" ) @@ -49,5 +49,5 @@ var ( NetworkGVKNSXT = ncpv1.SchemeGroupVersion.WithKind("VirtualNetwork") // NetworkGVKNSXTVPC is the GVK used for networks in NSX-T VPC mode. - NetworkGVKNSXTVPC = nsxopv1.SchemeGroupVersion.WithKind("SubnetSet") + NetworkGVKNSXTVPC = vpcapisv1.SchemeGroupVersion.WithKind("SubnetSet") ) diff --git a/pkg/services/network/network_test.go b/pkg/services/network/network_test.go index d30cfd5091..05c23a559a 100644 --- a/pkg/services/network/network_test.go +++ b/pkg/services/network/network_test.go @@ -24,7 +24,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" netopv1 "github.com/vmware-tanzu/net-operator-api/api/v1alpha1" - nsxopv1 "github.com/vmware-tanzu/nsx-operator/pkg/apis/v1alpha1" + vpcapisv1 "github.com/vmware-tanzu/nsx-operator/pkg/apis/vpc/v1alpha1" vmoprv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha2" ncpv1 "github.com/vmware-tanzu/vm-operator/external/ncp/api/v1alpha1" corev1 "k8s.io/api/core/v1" @@ -270,7 +270,7 @@ var _ = Describe("Network provider", func() { Expect(vm.Spec.Network.Interfaces).To(HaveLen(1)) Expect(vm.Spec.Network.Interfaces[0].Network.Name).To(Equal(vSphereCluster.Name)) Expect(vm.Spec.Network.Interfaces[0].Network.TypeMeta.Kind).To(Equal("SubnetSet")) - Expect(vm.Spec.Network.Interfaces[0].Network.TypeMeta.APIVersion).To(Equal(nsxopv1.SchemeGroupVersion.String())) + Expect(vm.Spec.Network.Interfaces[0].Network.TypeMeta.APIVersion).To(Equal(vpcapisv1.SchemeGroupVersion.String())) }) }) }) @@ -336,7 +336,7 @@ var _ = Describe("Network provider", func() { Expect(ncpv1.AddToScheme(scheme)).To(Succeed()) Expect(corev1.AddToScheme(scheme)).To(Succeed()) Expect(vmwarev1.AddToScheme(scheme)).To(Succeed()) - Expect(nsxopv1.AddToScheme(scheme)).To(Succeed()) + Expect(vpcapisv1.AddToScheme(scheme)).To(Succeed()) }) Context("with dummy network provider", func() { @@ -599,14 +599,14 @@ var _ = Describe("Network provider", func() { It("should not update subnetset", func() { // Fetch the SubnetSet before the operation - initialSubnetSet := &nsxopv1.SubnetSet{} + initialSubnetSet := &vpcapisv1.SubnetSet{} err = client.Get(ctx, apitypes.NamespacedName{ Name: dummyCluster, Namespace: dummyNs, }, initialSubnetSet) Expect(err).NotTo(HaveOccurred()) - status := nsxopv1.SubnetSetStatus{ - Conditions: []nsxopv1.Condition{ + status := vpcapisv1.SubnetSetStatus{ + Conditions: []vpcapisv1.Condition{ { Type: "Ready", Status: "True", @@ -620,7 +620,7 @@ var _ = Describe("Network provider", func() { Expect(err).ToNot(HaveOccurred()) Expect(subnetset).To(Equal(clusterCtx.VSphereCluster.Name)) - createdSubnetSet := &nsxopv1.SubnetSet{} + createdSubnetSet := &vpcapisv1.SubnetSet{} err = client.Get(ctx, apitypes.NamespacedName{ Name: dummyCluster, Namespace: dummyNs, @@ -658,7 +658,7 @@ var _ = Describe("Network provider", func() { Expect(err).ToNot(HaveOccurred()) Expect(subnetset).To(Equal(clusterCtx.VSphereCluster.Name)) - createdSubnetSet := &nsxopv1.SubnetSet{} + createdSubnetSet := &vpcapisv1.SubnetSet{} err = client.Get(ctx, apitypes.NamespacedName{ Name: dummyCluster, Namespace: dummyNs, @@ -700,14 +700,14 @@ var _ = Describe("Network provider", func() { BeforeEach(func() { scheme = runtime.NewScheme() - Expect(nsxopv1.AddToScheme(scheme)).To(Succeed()) + Expect(vpcapisv1.AddToScheme(scheme)).To(Succeed()) nsxvpcNp, _ = NSXTVpcNetworkProvider(client).(*nsxtVPCNetworkProvider) np = nsxvpcNp }) It("should return error when subnetset ready status is false", func() { - status := nsxopv1.SubnetSetStatus{ - Conditions: []nsxopv1.Condition{ + status := vpcapisv1.SubnetSetStatus{ + Conditions: []vpcapisv1.Condition{ { Type: "Ready", Status: "False", @@ -716,7 +716,7 @@ var _ = Describe("Network provider", func() { }, }, } - subnetsetObj = &nsxopv1.SubnetSet{ + subnetsetObj = &vpcapisv1.SubnetSet{ ObjectMeta: metav1.ObjectMeta{ Namespace: cluster.Namespace, Name: cluster.Name, @@ -732,10 +732,10 @@ var _ = Describe("Network provider", func() { }) It("should return error when subnetset ready status is not set", func() { - status := nsxopv1.SubnetSetStatus{ - Conditions: []nsxopv1.Condition{}, + status := vpcapisv1.SubnetSetStatus{ + Conditions: []vpcapisv1.Condition{}, } - subnetsetObj = &nsxopv1.SubnetSet{ + subnetsetObj = &vpcapisv1.SubnetSet{ ObjectMeta: metav1.ObjectMeta{ Namespace: cluster.Namespace, Name: cluster.Name, diff --git a/pkg/services/network/nsxt_vpc_provider.go b/pkg/services/network/nsxt_vpc_provider.go index 154a5ade93..3a78ce111c 100644 --- a/pkg/services/network/nsxt_vpc_provider.go +++ b/pkg/services/network/nsxt_vpc_provider.go @@ -21,7 +21,7 @@ import ( "fmt" "github.com/pkg/errors" - nsxopv1 "github.com/vmware-tanzu/nsx-operator/pkg/apis/v1alpha1" + vpcapisv1 "github.com/vmware-tanzu/nsx-operator/pkg/apis/vpc/v1alpha1" vmoprv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha2" vmoprv1common "github.com/vmware-tanzu/vm-operator/api/v1alpha2/common" corev1 "k8s.io/api/core/v1" @@ -71,13 +71,13 @@ func (vp *nsxtVPCNetworkProvider) SupportsVMReadinessProbe() bool { // verifyNsxtVpcSubnetSetStatus checks the status conditions of a given SubnetSet within a cluster context. // If the subnet isn't ready, it is marked as false, and the function returns an error. // If the subnet is ready, the function updates the VSphereCluster with a "true" status and returns nil. -func (vp *nsxtVPCNetworkProvider) verifyNsxtVpcSubnetSetStatus(vspherecluster *vmwarev1.VSphereCluster, subnetset *nsxopv1.SubnetSet) error { +func (vp *nsxtVPCNetworkProvider) verifyNsxtVpcSubnetSetStatus(vspherecluster *vmwarev1.VSphereCluster, subnetset *vpcapisv1.SubnetSet) error { clusterName := vspherecluster.Name namespace := vspherecluster.Namespace hasReadyCondition := false for _, condition := range subnetset.Status.Conditions { - if condition.Type != nsxopv1.Ready { + if condition.Type != vpcapisv1.Ready { continue } hasReadyCondition = true @@ -101,7 +101,7 @@ func (vp *nsxtVPCNetworkProvider) verifyNsxtVpcSubnetSetStatus(vspherecluster *v // If it is, then it calls verifyNsxVpcSubnetSetStatus with the SubnetSet to verify its status. // If it's not, it returns an error. func (vp *nsxtVPCNetworkProvider) VerifyNetworkStatus(_ context.Context, clusterCtx *vmware.ClusterContext, obj runtime.Object) error { - subnetset, ok := obj.(*nsxopv1.SubnetSet) + subnetset, ok := obj.(*vpcapisv1.SubnetSet) if !ok { return fmt.Errorf("expected NSX VPC SubnetSet but got %T", obj) } @@ -124,14 +124,14 @@ func (vp *nsxtVPCNetworkProvider) ProvisionClusterNetwork(ctx context.Context, c log.Info("Provisioning ") defer log.Info("Finished provisioning") - subnetset := &nsxopv1.SubnetSet{ + subnetset := &vpcapisv1.SubnetSet{ ObjectMeta: metav1.ObjectMeta{ Namespace: networkNamespace, Name: networkName, }, - Spec: nsxopv1.SubnetSetSpec{ - AdvancedConfig: nsxopv1.AdvancedConfig{ - StaticIPAllocation: nsxopv1.StaticIPAllocation{ + Spec: vpcapisv1.SubnetSetSpec{ + AdvancedConfig: vpcapisv1.AdvancedConfig{ + StaticIPAllocation: vpcapisv1.StaticIPAllocation{ Enable: true, }, }, @@ -159,7 +159,7 @@ func (vp *nsxtVPCNetworkProvider) ProvisionClusterNetwork(ctx context.Context, c // GetClusterNetworkName returns the name of a valid cluster network if one exists. func (vp *nsxtVPCNetworkProvider) GetClusterNetworkName(ctx context.Context, clusterCtx *vmware.ClusterContext) (string, error) { - subnetset := &nsxopv1.SubnetSet{} + subnetset := &vpcapisv1.SubnetSet{} cluster := clusterCtx.VSphereCluster namespacedName := types.NamespacedName{ Namespace: cluster.Namespace,