Use new paths for CRDs in test suites

Author: JoelSpeed

Diff for: pkg/actuators/machine/actuator_test.go

@@ -19,6 +19,8 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/tools/record"
+	"k8s.io/klog/v2/klogr"
+	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"
 )
@@ -28,6 +30,8 @@ func init() {
 	machinev1beta1.AddToScheme(scheme.Scheme)
 	machinev1.Install(scheme.Scheme)
 	configv1.AddToScheme(scheme.Scheme)
+
+	ctrl.SetLogger(klogr.New())
 }
 
 func TestMachineEvents(t *testing.T) {
@@ -148,6 +152,13 @@ func TestMachineEvents(t *testing.T) {
 			gs.Expect(err).ToNot(HaveOccurred())
 			gs.Expect(stubMachine).ToNot(BeNil())
 
+			// Clean up events to make sure we have a clean slate.
+			eventList := &v1.EventList{}
+			gs.Expect(k8sClient.List(ctx, eventList, client.InNamespace(machine.Namespace))).To(Succeed())
+			for i := range eventList.Items {
+				gs.Expect(k8sClient.Delete(ctx, &eventList.Items[i])).To(Succeed())
+			}
+
 			// Create the machine
 			gs.Expect(k8sClient.Create(ctx, machine)).To(Succeed())
 			defer func() {
@@ -233,9 +244,8 @@ func TestMachineEvents(t *testing.T) {
 			actuator := NewActuator(params)
 			tc.operation(actuator, machine)
 
-			eventList := &v1.EventList{}
-			waitForEvent := func() error {
-				gs.Expect(k8sClient.List(ctx, eventList, client.InNamespace(machine.Namespace))).To(Succeed())
+			waitForEvent := func(g Gomega) error {
+				g.Expect(k8sClient.List(ctx, eventList, client.InNamespace(machine.Namespace))).To(Succeed())
 				if len(eventList.Items) != 1 {
 					errorMsg := fmt.Sprintf("Expected len 1, got %d", len(eventList.Items))
 					return errors.New(errorMsg)
@@ -246,10 +256,6 @@ func TestMachineEvents(t *testing.T) {
 			gs.Eventually(waitForEvent, timeout).Should(Succeed())
 
 			gs.Expect(eventList.Items[0].Message).To(Equal(tc.event))
-
-			for i := range eventList.Items {
-				gs.Expect(k8sClient.Delete(ctx, &eventList.Items[i])).To(Succeed())
-			}
 		})
 	}
 }

Diff for: pkg/actuators/machine/machine_scope_test.go

@@ -148,7 +148,7 @@ func TestPatchMachine(t *testing.T) {
 	g := NewWithT(t)
 
 	testEnv := &envtest.Environment{
-		CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "vendor", "github.com", "openshift", "api", "machine", "v1beta1")},
+		CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "vendor", "github.com", "openshift", "api", "machine", "v1beta1", "zz_generated.crd-manifests", "0000_10_machine-api_01_machines-CustomNoUpgrade.crd.yaml")},
 	}
 
 	cfg, err := testEnv.Start()

Diff for: pkg/actuators/machine/suite_test.go

@@ -31,9 +31,9 @@ var (
 func TestMain(m *testing.M) {
 	testEnv := &envtest.Environment{
 		CRDDirectoryPaths: []string{
-			filepath.Join("..", "..", "..", "vendor", "github.com", "openshift", "api", "machine", "v1beta1"),
-			filepath.Join("..", "..", "..", "vendor", "github.com", "openshift", "api", "machine", "v1"),
-			filepath.Join("..", "..", "..", "vendor", "github.com", "openshift", "api", "config", "v1"),
+			filepath.Join("..", "..", "..", "vendor", "github.com", "openshift", "api", "machine", "v1beta1", "zz_generated.crd-manifests", "0000_10_machine-api_01_machines-CustomNoUpgrade.crd.yaml"),
+			filepath.Join("..", "..", "..", "vendor", "github.com", "openshift", "api", "machine", "v1", "zz_generated.crd-manifests", "0000_10_control-plane-machine-set_01_controlplanemachinesets-CustomNoUpgrade.crd.yaml"),
+			filepath.Join("..", "..", "..", "vendor", "github.com", "openshift", "api", "config", "v1", "zz_generated.crd-manifests", "0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml"),
 		},
 	}
 

Diff for: pkg/actuators/machineset/controller_suite_test.go

@@ -47,7 +47,7 @@ func TestReconciler(t *testing.T) {
 
 var _ = BeforeSuite(func() {
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "vendor", "github.com", "openshift", "api", "machine", "v1beta1")},
+		CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "vendor", "github.com", "openshift", "api", "machine", "v1beta1", "zz_generated.crd-manifests", "0000_10_machine-api_01_machinesets-CustomNoUpgrade.crd.yaml")},
 	}
 	machinev1beta1.AddToScheme(scheme.Scheme)
 

Diff for: tools.go

@@ -9,6 +9,9 @@ package tools
 import (
 	_ "github.com/golang/mock/mockgen"
 	_ "github.com/onsi/ginkgo/v2/ginkgo"
+	_ "github.com/openshift/api/config/v1/zz_generated.crd-manifests"
+	_ "github.com/openshift/api/machine/v1/zz_generated.crd-manifests"
+	_ "github.com/openshift/api/machine/v1beta1/zz_generated.crd-manifests"
 	_ "sigs.k8s.io/controller-runtime/tools/setup-envtest"
 	_ "sigs.k8s.io/controller-tools/cmd/controller-gen"
 )