[suite_test] Adapt to V2 enabled by default

DataDog · Sep 21, 2022 · 6dde7da · 6dde7da
1 parent 871a5b4
commit 6dde7da
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 35 deletions.
diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -15,6 +15,7 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
@@ -84,6 +85,9 @@ var _ = BeforeSuite(func() {
 	node2 := testutils.NewNode("node2", nil)
 	Expect(k8sClient.Create(context.Background(), node2)).Should(Succeed())
 
+	err = patchCRDsForV1()
+	Expect(err).ToNot(HaveOccurred())
+
 	// Start controllers
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{
 		Scheme: scheme.Scheme,
@@ -116,3 +120,35 @@ var _ = AfterSuite(func() {
 	err := testEnv.Stop()
 	Expect(err).ToNot(HaveOccurred())
 })
+
+// Applies the patch defined in config/test-v1/storagev1_in_datadogagents.yaml
+func patchCRDsForV1() error {
+	crdKey := client.ObjectKey{
+		Namespace: "default",
+		Name:      "datadogagents.datadoghq.com",
+	}
+
+	crd := v1.CustomResourceDefinition{}
+	if err := k8sClient.Get(context.TODO(), crdKey, &crd); err != nil {
+		return err
+	}
+
+	// Versions[0] is v1alpha1 and [1] is v2alpha1
+	crd.Spec.Versions[0].Storage = true
+	crd.Spec.Versions[0].Served = true
+	crd.Spec.Versions[1].Storage = false
+	crd.Spec.Versions[1].Served = false
+
+	if err := k8sClient.Update(context.TODO(), &crd); err != nil {
+		return err
+	}
+
+	// Wait until the CRD is accessible. Otherwise, we might get errors when
+	// trying to create objects of this type.
+	Eventually(func() bool {
+		err := k8sClient.Get(context.Background(), crdKey, &crd)
+		return err == nil
+	}, timeout, interval).Should(BeTrue())
+
+	return nil
+}
diff --git a/controllers/suite_v2_test.go b/controllers/suite_v2_test.go
@@ -20,7 +20,6 @@ import (
 	datadoghqv2alpha1 "github.com/DataDog/datadog-operator/apis/datadoghq/v2alpha1"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
@@ -91,9 +90,6 @@ var _ = BeforeSuite(func() {
 	node2 := testutils.NewNode("node2", nil)
 	Expect(k8sClient.Create(context.Background(), node2)).Should(Succeed())
 
-	err = patchCRDsForV2()
-	Expect(err).ToNot(HaveOccurred())
-
 	// Start controllers
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{
 		Scheme: scheme.Scheme,
@@ -126,34 +122,3 @@ var _ = AfterSuite(func() {
 	err := testEnv.Stop()
 	Expect(err).ToNot(HaveOccurred())
 })
-
-// Applies the patch defined in config/test-v2/storagev2_in_datadogagents.yaml
-func patchCRDsForV2() error {
-	crdKey := client.ObjectKey{
-		Namespace: "default",
-		Name:      "datadogagents.datadoghq.com",
-	}
-
-	crd := v1.CustomResourceDefinition{}
-	if err := k8sClient.Get(context.TODO(), crdKey, &crd); err != nil {
-		return err
-	}
-
-	// Versions[0] is v1alpha1 and [1] is v2alpha1
-	crd.Spec.Versions[0].Storage = false
-	crd.Spec.Versions[1].Storage = true
-	crd.Spec.Versions[1].Served = true
-
-	if err := k8sClient.Update(context.TODO(), &crd); err != nil {
-		return err
-	}
-
-	// Wait until the CRD is accessible. Otherwise, we might get errors when
-	// trying to create objects of this type.
-	Eventually(func() bool {
-		err := k8sClient.Get(context.Background(), crdKey, &crd)
-		return err == nil
-	}, timeout, interval).Should(BeTrue())
-
-	return nil
-}