Merge pull request #1061 from fao89/dropaee

Drop aee-operator dependency

Author: openshift-merge-bot[bot]

dependencies.yaml

@@ -51,10 +51,6 @@ dependencies:
     value:
       packageName: nova-operator
       version: ">=0.0.0"
-  - type: olm.package
-    value:
-      packageName: openstack-ansibleee-operator
-      version: ">=0.0.0"
   - type: olm.package
     value:
       packageName: openstack-baremetal-operator

go.mod

@@ -31,7 +31,6 @@ require (
 	github.com/openstack-k8s-operators/neutron-operator/api v0.4.1-0.20240906131104-1216e2478b19
 	github.com/openstack-k8s-operators/nova-operator/api v0.4.1-0.20240907101151-b05427a4ffbf
 	github.com/openstack-k8s-operators/octavia-operator/api v0.4.1-0.20240906123247-d049901982ac
-	github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.4.1-0.20240819105135-20bba339978c
 	github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.4.1-0.20240906043908-171788786286
 	github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240531084739-3b4c0451297c
 	github.com/openstack-k8s-operators/ovn-operator/api v0.4.1-0.20240909074420-f268cc641a1d

go.sum

@@ -136,8 +136,6 @@ github.com/openstack-k8s-operators/nova-operator/api v0.4.1-0.20240907101151-b05
 github.com/openstack-k8s-operators/nova-operator/api v0.4.1-0.20240907101151-b05427a4ffbf/go.mod h1:TPjN09Doefidj9cJM5wfRu2FUA2xqcGPxVL39Nmddfo=
 github.com/openstack-k8s-operators/octavia-operator/api v0.4.1-0.20240906123247-d049901982ac h1:q9wC1Dykx2Eg1Jc+v2uYR7mkbNB0RvTdZqjdrg1EfcM=
 github.com/openstack-k8s-operators/octavia-operator/api v0.4.1-0.20240906123247-d049901982ac/go.mod h1:tGgavimnAXiBEw1TKHbW3jOVnGD84AI4aVQi7+NQ3sw=
-github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.4.1-0.20240819105135-20bba339978c h1:uwLzBhrXB4PmC+ZrI/3r8lROXHEEhb8YL77VowX3UaU=
-github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.4.1-0.20240819105135-20bba339978c/go.mod h1:eBaU1YIVyMY9vdhWMl6nWf2prCgme+S5Bp0U6r0UWtY=
 github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.4.1-0.20240906043908-171788786286 h1:Z8fIh06z1oWnJAuPkzPHjDZQGVOJHeuaXAyrlM7RHUc=
 github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.4.1-0.20240906043908-171788786286/go.mod h1:BOjHTeLCZK7A0iAME27ZDML6qkkOuK2iG3Gtib78Z6Q=
 github.com/openstack-k8s-operators/ovn-operator/api v0.4.1-0.20240909074420-f268cc641a1d h1:mRht4Npry4p1Qfm01ygVjenfVuDFMZ02YV/i2uKJXFM=

tests/functional/dataplane/suite_test.go

@@ -42,7 +42,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 
 	infrav1 "github.com/openstack-k8s-operators/infra-operator/apis/network/v1beta1"
-	aee "github.com/openstack-k8s-operators/openstack-ansibleee-operator/api/v1beta1"
 	baremetalv1 "github.com/openstack-k8s-operators/openstack-baremetal-operator/api/v1beta1"
 	openstackv1 "github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1"
 	dataplanev1 "github.com/openstack-k8s-operators/openstack-operator/apis/dataplane/v1beta1"
@@ -91,9 +90,6 @@ var _ = BeforeSuite(func() {
 
 	const gomod = "../../../go.mod"
 
-	aeeCRDs, err := test.GetCRDDirFromModule(
-		"github.com/openstack-k8s-operators/openstack-ansibleee-operator/api", gomod, "bases")
-	Expect(err).ShouldNot(HaveOccurred())
 	baremetalCRDs, err := test.GetCRDDirFromModule(
 		"github.com/openstack-k8s-operators/openstack-baremetal-operator/api", gomod, "bases")
 	Expect(err).ShouldNot(HaveOccurred())
@@ -110,7 +106,6 @@ var _ = BeforeSuite(func() {
 	testEnv = &envtest.Environment{
 		CRDDirectoryPaths: []string{
 			filepath.Join("..", "..", "..", "config", "crd", "bases"),
-			aeeCRDs,
 			baremetalCRDs,
 			infraCRDs,
 			certmgrv1CRDs,
@@ -136,8 +131,6 @@ var _ = BeforeSuite(func() {
 	// will silently not start in the test env.
 	err = dataplanev1.AddToScheme(scheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
-	err = aee.AddToScheme(scheme.Scheme)
-	Expect(err).NotTo(HaveOccurred())
 	err = batchv1.AddToScheme(scheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
 	err = corev1.AddToScheme(scheme.Scheme)