Fix to allow multiple test environments

Author: fabriziopandini

controllers/cluster_controller_phases_test.go

@@ -130,9 +130,9 @@ func TestClusterReconcilePhases(t *testing.T) {
 				var c client.Client
 				if tt.infraRef != nil {
 					infraConfig := &unstructured.Unstructured{Object: tt.infraRef}
-					c = fake.NewFakeClientWithScheme(scheme.Scheme, external.TestGenericInfrastructureCRD, tt.cluster, infraConfig)
+					c = fake.NewFakeClientWithScheme(scheme.Scheme, external.TestGenericInfrastructureCRD.DeepCopy(), tt.cluster, infraConfig)
 				} else {
-					c = fake.NewFakeClientWithScheme(scheme.Scheme, external.TestGenericInfrastructureCRD, tt.cluster)
+					c = fake.NewFakeClientWithScheme(scheme.Scheme, external.TestGenericInfrastructureCRD.DeepCopy(), tt.cluster)
 				}
 				r := &ClusterReconciler{
 					Client: c,

controllers/machine_controller_phases_test.go

@@ -118,8 +118,8 @@ var _ = Describe("Reconcile Machine Phases", func() {
 				defaultCluster,
 				defaultKubeconfigSecret,
 				machine,
-				external.TestGenericBootstrapCRD,
-				external.TestGenericInfrastructureCRD,
+				external.TestGenericBootstrapCRD.DeepCopy(),
+				external.TestGenericInfrastructureCRD.DeepCopy(),
 				bootstrapConfig,
 				infraConfig,
 			),
@@ -154,8 +154,8 @@ var _ = Describe("Reconcile Machine Phases", func() {
 				defaultCluster,
 				defaultKubeconfigSecret,
 				machine,
-				external.TestGenericBootstrapCRD,
-				external.TestGenericInfrastructureCRD,
+				external.TestGenericBootstrapCRD.DeepCopy(),
+				external.TestGenericInfrastructureCRD.DeepCopy(),
 				bootstrapConfig,
 				infraConfig,
 			),
@@ -195,8 +195,8 @@ var _ = Describe("Reconcile Machine Phases", func() {
 				defaultCluster,
 				defaultKubeconfigSecret,
 				machine,
-				external.TestGenericBootstrapCRD,
-				external.TestGenericInfrastructureCRD,
+				external.TestGenericBootstrapCRD.DeepCopy(),
+				external.TestGenericInfrastructureCRD.DeepCopy(),
 				bootstrapConfig,
 				infraConfig,
 			),
@@ -262,8 +262,8 @@ var _ = Describe("Reconcile Machine Phases", func() {
 				defaultCluster,
 				defaultKubeconfigSecret,
 				machine,
-				external.TestGenericBootstrapCRD,
-				external.TestGenericInfrastructureCRD,
+				external.TestGenericBootstrapCRD.DeepCopy(),
+				external.TestGenericInfrastructureCRD.DeepCopy(),
 				bootstrapConfig,
 				infraConfig,
 			),
@@ -316,8 +316,8 @@ var _ = Describe("Reconcile Machine Phases", func() {
 				defaultCluster,
 				defaultKubeconfigSecret,
 				machine,
-				external.TestGenericBootstrapCRD,
-				external.TestGenericInfrastructureCRD,
+				external.TestGenericBootstrapCRD.DeepCopy(),
+				external.TestGenericInfrastructureCRD.DeepCopy(),
 				bootstrapConfig,
 				infraConfig,
 			),
@@ -381,8 +381,8 @@ var _ = Describe("Reconcile Machine Phases", func() {
 				defaultCluster,
 				defaultKubeconfigSecret,
 				machine,
-				external.TestGenericBootstrapCRD,
-				external.TestGenericInfrastructureCRD,
+				external.TestGenericBootstrapCRD.DeepCopy(),
+				external.TestGenericInfrastructureCRD.DeepCopy(),
 				bootstrapConfig,
 				infraConfig,
 			),
@@ -426,8 +426,8 @@ var _ = Describe("Reconcile Machine Phases", func() {
 				defaultCluster,
 				defaultKubeconfigSecret,
 				machine,
-				external.TestGenericBootstrapCRD,
-				external.TestGenericInfrastructureCRD,
+				external.TestGenericBootstrapCRD.DeepCopy(),
+				external.TestGenericInfrastructureCRD.DeepCopy(),
 				bootstrapConfig,
 				infraConfig,
 			),
@@ -493,8 +493,8 @@ var _ = Describe("Reconcile Machine Phases", func() {
 				defaultCluster,
 				defaultKubeconfigSecret,
 				machine,
-				external.TestGenericBootstrapCRD,
-				external.TestGenericInfrastructureCRD,
+				external.TestGenericBootstrapCRD.DeepCopy(),
+				external.TestGenericInfrastructureCRD.DeepCopy(),
 				bootstrapConfig,
 				infraConfig,
 			),
@@ -730,8 +730,8 @@ func TestReconcileBootstrap(t *testing.T) {
 			r := &MachineReconciler{
 				Client: fake.NewFakeClientWithScheme(scheme.Scheme,
 					tc.machine,
-					external.TestGenericBootstrapCRD,
-					external.TestGenericInfrastructureCRD,
+					external.TestGenericBootstrapCRD.DeepCopy(),
+					external.TestGenericInfrastructureCRD.DeepCopy(),
 					bootstrapConfig,
 				),
 				Log:    log.Log,
@@ -931,8 +931,8 @@ func TestReconcileInfrastructure(t *testing.T) {
 			r := &MachineReconciler{
 				Client: fake.NewFakeClientWithScheme(scheme.Scheme,
 					tc.machine,
-					external.TestGenericBootstrapCRD,
-					external.TestGenericInfrastructureCRD,
+					external.TestGenericBootstrapCRD.DeepCopy(),
+					external.TestGenericInfrastructureCRD.DeepCopy(),
 					infraConfig,
 				),
 				Log:    log.Log,

exp/controllers/suite_test.go

@@ -79,10 +79,10 @@ var _ = BeforeSuite(func(done Done) {
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
 		CRDs: []runtime.Object{
-			external.TestGenericBootstrapCRD,
-			external.TestGenericBootstrapTemplateCRD,
-			external.TestGenericInfrastructureCRD,
-			external.TestGenericInfrastructureTemplateCRD,
+			external.TestGenericBootstrapCRD.DeepCopy(),
+			external.TestGenericBootstrapTemplateCRD.DeepCopy(),
+			external.TestGenericInfrastructureCRD.DeepCopy(),
+			external.TestGenericInfrastructureTemplateCRD.DeepCopy(),
 		},
 		CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")},
 	}

test/helpers/envtest.go

@@ -65,10 +65,10 @@ func newTestEnvironment() *TestEnvironment {
 				filepath.Join(root, "bootstrap", "kubeadm", "config", "crd", "bases"),
 			},
 			CRDs: []runtime.Object{
-				external.TestGenericBootstrapCRD,
-				external.TestGenericBootstrapTemplateCRD,
-				external.TestGenericInfrastructureCRD,
-				external.TestGenericInfrastructureTemplateCRD,
+				external.TestGenericBootstrapCRD.DeepCopy(),
+				external.TestGenericBootstrapTemplateCRD.DeepCopy(),
+				external.TestGenericInfrastructureCRD.DeepCopy(),
+				external.TestGenericInfrastructureTemplateCRD.DeepCopy(),
 			},
 		},
 		scheme:  scheme,