diff --git a/config/deployments/integration-tests/README.md b/config/deployments/integration-tests/README.md index bfd9569e62..2c57737fc5 100644 --- a/config/deployments/integration-tests/README.md +++ b/config/deployments/integration-tests/README.md @@ -2,7 +2,7 @@ The [crds](./crds/) are copied from the vm-operators version which is consumed as go module. -These should get updated when bumping the dependency vm-operator dependency. +These should get updated when bumping the vm-operator dependency. To sync the new CRD's use the following script **and** update `kustomization.yaml` accordingly. diff --git a/go.mod b/go.mod index 91140fd1fb..85603b7a35 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,16 @@ replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.0-rc.0.0.2024061 replace github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels => github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels v0.0.0-20240404200847-de75746a9505 +require ( + github.com/vmware-tanzu/net-operator-api v0.0.0-20240326163340-1f32d6bf7f9d + github.com/vmware-tanzu/nsx-operator/pkg/apis v0.1.0 + // 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 + github.com/vmware-tanzu/vm-operator/external/tanzu-topology v0.0.0-20240404200847-de75746a9505 + github.com/vmware/govmomi v0.37.3 +) + require ( github.com/blang/semver/v4 v4.0.0 github.com/go-logr/logr v1.4.2 @@ -16,12 +26,6 @@ require ( github.com/pkg/errors v0.9.1 github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.9.0 - 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/vm-operator/api v1.8.6 - github.com/vmware-tanzu/vm-operator/external/ncp v0.0.0-20240404200847-de75746a9505 - github.com/vmware-tanzu/vm-operator/external/tanzu-topology v0.0.0-20240404200847-de75746a9505 - github.com/vmware/govmomi v0.37.3 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba golang.org/x/exp v0.0.0-20230905200255-921286631fa9 golang.org/x/mod v0.18.0 diff --git a/pkg/services/network/network_test.go b/pkg/services/network/network_test.go index a9a84813f7..33114c6e1f 100644 --- a/pkg/services/network/network_test.go +++ b/pkg/services/network/network_test.go @@ -271,7 +271,6 @@ var _ = Describe("Network provider", func() { 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())) - // TODO(chrischdi): also assert group version }) }) })