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..6646ffeb1d 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" + nsxopv1 "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" diff --git a/pkg/services/network/constants.go b/pkg/services/network/constants.go index 902c8d24ce..e48e1bf82b 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" + nsxopv1 "github.com/vmware-tanzu/nsx-operator/pkg/apis/vpc/v1alpha1" ncpv1 "github.com/vmware-tanzu/vm-operator/external/ncp/api/v1alpha1" ) diff --git a/pkg/services/network/nsxt_vpc_provider.go b/pkg/services/network/nsxt_vpc_provider.go index 154a5ade93..dca6f2dded 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" + nsxopv1 "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"