updated package structure

kubernetes-sigs · Sep 23, 2021 · a5fa1c9 · a5fa1c9
1 parent e3f32a6
commit a5fa1c9
Show file tree

Hide file tree

Showing 24 changed files with 294 additions and 282 deletions.
diff --git a/controllers/cluster_controller_phases_test.go b/controllers/cluster_controller_phases_test.go
@@ -31,7 +31,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
-	"sigs.k8s.io/cluster-api/internal/testtypes"
+	"sigs.k8s.io/cluster-api/internal/builder"
 )
 
 func TestClusterReconcilePhases(t *testing.T) {
@@ -129,11 +129,11 @@ func TestClusterReconcilePhases(t *testing.T) {
 				if tt.infraRef != nil {
 					infraConfig := &unstructured.Unstructured{Object: tt.infraRef}
 					c = fake.NewClientBuilder().
-						WithObjects(testtypes.GenericInfrastructureMachineCRD.DeepCopy(), tt.cluster, infraConfig).
+						WithObjects(builder.GenericInfrastructureMachineCRD.DeepCopy(), tt.cluster, infraConfig).
 						Build()
 				} else {
 					c = fake.NewClientBuilder().
-						WithObjects(testtypes.GenericInfrastructureMachineCRD.DeepCopy(), tt.cluster).
+						WithObjects(builder.GenericInfrastructureMachineCRD.DeepCopy(), tt.cluster).
 						Build()
 				}
 				r := &ClusterReconciler{

diff --git a/controllers/machine_controller_phases_test.go b/controllers/machine_controller_phases_test.go
@@ -37,7 +37,7 @@ import (
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/controllers/remote"
-	"sigs.k8s.io/cluster-api/internal/testtypes"
+	"sigs.k8s.io/cluster-api/internal/builder"
 	"sigs.k8s.io/cluster-api/util/conditions"
 	"sigs.k8s.io/cluster-api/util/kubeconfig"
 )
@@ -122,8 +122,8 @@ func TestReconcileMachinePhases(t *testing.T) {
 				WithObjects(defaultCluster,
 					defaultKubeconfigSecret,
 					machine,
-					testtypes.GenericBootstrapConfigCRD.DeepCopy(),
-					testtypes.GenericInfrastructureMachineCRD.DeepCopy(),
+					builder.GenericBootstrapConfigCRD.DeepCopy(),
+					builder.GenericInfrastructureMachineCRD.DeepCopy(),
 					bootstrapConfig,
 					infraConfig,
 				).Build(),
@@ -160,8 +160,8 @@ func TestReconcileMachinePhases(t *testing.T) {
 				WithObjects(defaultCluster,
 					defaultKubeconfigSecret,
 					machine,
-					testtypes.GenericBootstrapConfigCRD.DeepCopy(),
-					testtypes.GenericInfrastructureMachineCRD.DeepCopy(),
+					builder.GenericBootstrapConfigCRD.DeepCopy(),
+					builder.GenericInfrastructureMachineCRD.DeepCopy(),
 					bootstrapConfig,
 					infraConfig,
 				).Build(),
@@ -203,8 +203,8 @@ func TestReconcileMachinePhases(t *testing.T) {
 				WithObjects(defaultCluster,
 					defaultKubeconfigSecret,
 					machine,
-					testtypes.GenericBootstrapConfigCRD.DeepCopy(),
-					testtypes.GenericInfrastructureMachineCRD.DeepCopy(),
+					builder.GenericBootstrapConfigCRD.DeepCopy(),
+					builder.GenericInfrastructureMachineCRD.DeepCopy(),
 					bootstrapConfig,
 					infraConfig,
 				).Build(),
@@ -278,8 +278,8 @@ func TestReconcileMachinePhases(t *testing.T) {
 			WithObjects(defaultCluster,
 				machine,
 				node,
-				testtypes.GenericBootstrapConfigCRD.DeepCopy(),
-				testtypes.GenericInfrastructureMachineCRD.DeepCopy(),
+				builder.GenericBootstrapConfigCRD.DeepCopy(),
+				builder.GenericInfrastructureMachineCRD.DeepCopy(),
 				bootstrapConfig,
 				infraConfig,
 				defaultKubeconfigSecret,
@@ -344,8 +344,8 @@ func TestReconcileMachinePhases(t *testing.T) {
 			WithObjects(defaultCluster,
 				machine,
 				node,
-				testtypes.GenericBootstrapConfigCRD.DeepCopy(),
-				testtypes.GenericInfrastructureMachineCRD.DeepCopy(),
+				builder.GenericBootstrapConfigCRD.DeepCopy(),
+				builder.GenericInfrastructureMachineCRD.DeepCopy(),
 				bootstrapConfig,
 				infraConfig,
 				defaultKubeconfigSecret,
@@ -420,8 +420,8 @@ func TestReconcileMachinePhases(t *testing.T) {
 			WithObjects(defaultCluster,
 				machine,
 				node,
-				testtypes.GenericBootstrapConfigCRD.DeepCopy(),
-				testtypes.GenericInfrastructureMachineCRD.DeepCopy(),
+				builder.GenericBootstrapConfigCRD.DeepCopy(),
+				builder.GenericInfrastructureMachineCRD.DeepCopy(),
 				bootstrapConfig,
 				infraConfig,
 				defaultKubeconfigSecret,
@@ -480,8 +480,8 @@ func TestReconcileMachinePhases(t *testing.T) {
 			WithObjects(defaultCluster,
 				defaultKubeconfigSecret,
 				machine,
-				testtypes.GenericBootstrapConfigCRD.DeepCopy(),
-				testtypes.GenericInfrastructureMachineCRD.DeepCopy(),
+				builder.GenericBootstrapConfigCRD.DeepCopy(),
+				builder.GenericInfrastructureMachineCRD.DeepCopy(),
 				bootstrapConfig,
 				infraConfig,
 			).Build()
@@ -562,8 +562,8 @@ func TestReconcileMachinePhases(t *testing.T) {
 				defaultKubeconfigSecret,
 				machine,
 				machineSecond,
-				testtypes.GenericBootstrapConfigCRD.DeepCopy(),
-				testtypes.GenericInfrastructureMachineCRD.DeepCopy(),
+				builder.GenericBootstrapConfigCRD.DeepCopy(),
+				builder.GenericInfrastructureMachineCRD.DeepCopy(),
 				bootstrapConfig,
 				infraConfig,
 			).Build()
@@ -869,8 +869,8 @@ func TestReconcileBootstrap(t *testing.T) {
 			r := &MachineReconciler{
 				Client: fake.NewClientBuilder().
 					WithObjects(tc.machine,
-						testtypes.GenericBootstrapConfigCRD.DeepCopy(),
-						testtypes.GenericInfrastructureMachineCRD.DeepCopy(),
+						builder.GenericBootstrapConfigCRD.DeepCopy(),
+						builder.GenericInfrastructureMachineCRD.DeepCopy(),
 						bootstrapConfig,
 					).Build(),
 			}
@@ -1079,8 +1079,8 @@ func TestReconcileInfrastructure(t *testing.T) {
 			r := &MachineReconciler{
 				Client: fake.NewClientBuilder().
 					WithObjects(tc.machine,
-						testtypes.GenericBootstrapConfigCRD.DeepCopy(),
-						testtypes.GenericInfrastructureMachineCRD.DeepCopy(),
+						builder.GenericBootstrapConfigCRD.DeepCopy(),
+						builder.GenericInfrastructureMachineCRD.DeepCopy(),
 						infraConfig,
 					).Build(),
 			}

diff --git a/controllers/machine_controller_test.go b/controllers/machine_controller_test.go
@@ -36,7 +36,7 @@ import (
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/controllers/remote"
-	"sigs.k8s.io/cluster-api/internal/testtypes"
+	"sigs.k8s.io/cluster-api/internal/builder"
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/conditions"
 	"sigs.k8s.io/cluster-api/util/patch"
@@ -715,7 +715,7 @@ func TestReconcileRequest(t *testing.T) {
 				node,
 				&testCluster,
 				&tc.machine,
-				testtypes.GenericInfrastructureMachineCRD.DeepCopy(),
+				builder.GenericInfrastructureMachineCRD.DeepCopy(),
 				&infraConfig,
 			).Build()
 
@@ -957,9 +957,9 @@ func TestMachineConditions(t *testing.T) {
 			clientFake := fake.NewClientBuilder().WithObjects(
 				&testCluster,
 				m,
-				testtypes.GenericInfrastructureMachineCRD.DeepCopy(),
+				builder.GenericInfrastructureMachineCRD.DeepCopy(),
 				infra,
-				testtypes.GenericBootstrapConfigCRD.DeepCopy(),
+				builder.GenericBootstrapConfigCRD.DeepCopy(),
 				bootstrap,
 				node,
 			).Build()

diff --git a/controllers/machinehealthcheck_controller_test.go b/controllers/machinehealthcheck_controller_test.go
@@ -24,7 +24,7 @@ import (
 	"time"
 
 	. "github.com/onsi/gomega"
-	"sigs.k8s.io/cluster-api/internal/testtypes"
+	"sigs.k8s.io/cluster-api/internal/builder"
 
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -1462,7 +1462,7 @@ func TestMachineHealthCheck_Reconcile(t *testing.T) {
 		// Create remediation template resource.
 		infraRemediationResource := map[string]interface{}{
 			"kind":       "GenericExternalRemediation",
-			"apiVersion": testtypes.RemediationGroupVersion.String(),
+			"apiVersion": builder.RemediationGroupVersion.String(),
 			"metadata":   map[string]interface{}{},
 			"spec": map[string]interface{}{
 				"size": "3xlarge",
@@ -1476,13 +1476,13 @@ func TestMachineHealthCheck_Reconcile(t *testing.T) {
 			},
 		}
 		infraRemediationTmpl.SetKind("GenericExternalRemediationTemplate")
-		infraRemediationTmpl.SetAPIVersion(testtypes.RemediationGroupVersion.String())
+		infraRemediationTmpl.SetAPIVersion(builder.RemediationGroupVersion.String())
 		infraRemediationTmpl.SetGenerateName("remediation-template-name-")
 		infraRemediationTmpl.SetNamespace(cluster.Namespace)
 		g.Expect(env.Create(ctx, infraRemediationTmpl)).To(Succeed())
 
 		remediationTemplate := &corev1.ObjectReference{
-			APIVersion: testtypes.RemediationGroupVersion.String(),
+			APIVersion: builder.RemediationGroupVersion.String(),
 			Kind:       "GenericExternalRemediationTemplate",
 			Name:       infraRemediationTmpl.GetName(),
 		}
@@ -1582,7 +1582,7 @@ func TestMachineHealthCheck_Reconcile(t *testing.T) {
 		}).Should(Equal(1))
 
 		ref := corev1.ObjectReference{
-			APIVersion: testtypes.RemediationGroupVersion.String(),
+			APIVersion: builder.RemediationGroupVersion.String(),
 			Kind:       "GenericExternalRemediation",
 		}
 
@@ -1610,7 +1610,7 @@ func TestMachineHealthCheck_Reconcile(t *testing.T) {
 		// Create remediation template resource.
 		infraRemediationResource := map[string]interface{}{
 			"kind":       "GenericExternalRemediation",
-			"apiVersion": testtypes.RemediationGroupVersion.String(),
+			"apiVersion": builder.RemediationGroupVersion.String(),
 			"metadata":   map[string]interface{}{},
 			"spec": map[string]interface{}{
 				"size": "3xlarge",
@@ -1624,13 +1624,13 @@ func TestMachineHealthCheck_Reconcile(t *testing.T) {
 			},
 		}
 		infraRemediationTmpl.SetKind("GenericExternalRemediationTemplate")
-		infraRemediationTmpl.SetAPIVersion(testtypes.RemediationGroupVersion.String())
+		infraRemediationTmpl.SetAPIVersion(builder.RemediationGroupVersion.String())
 		infraRemediationTmpl.SetGenerateName("remediation-template-name-")
 		infraRemediationTmpl.SetNamespace(cluster.Namespace)
 		g.Expect(env.Create(ctx, infraRemediationTmpl)).To(Succeed())
 
 		remediationTemplate := &corev1.ObjectReference{
-			APIVersion: testtypes.RemediationGroupVersion.String(),
+			APIVersion: builder.RemediationGroupVersion.String(),
 			Kind:       "GenericExternalRemediationTemplate",
 			Name:       infraRemediationTmpl.GetName(),
 		}
@@ -1781,7 +1781,7 @@ func TestMachineHealthCheck_Reconcile(t *testing.T) {
 		}).Should(Equal(0))
 
 		ref := corev1.ObjectReference{
-			APIVersion: testtypes.RemediationGroupVersion.String(),
+			APIVersion: builder.RemediationGroupVersion.String(),
 			Kind:       "GenericExternalRemediation",
 		}
 

diff --git a/controllers/machineset_controller_test.go b/controllers/machineset_controller_test.go
@@ -33,7 +33,7 @@ import (
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/controllers/external"
-	"sigs.k8s.io/cluster-api/internal/testtypes"
+	"sigs.k8s.io/cluster-api/internal/builder"
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/conditions"
 )
@@ -772,8 +772,8 @@ func TestMachineSetReconcile_MachinesCreatedConditionFalseOnBadInfraRef(t *testi
 				},
 				Spec: clusterv1.MachineSpec{
 					InfrastructureRef: corev1.ObjectReference{
-						Kind:       testtypes.GenericInfrastructureMachineTemplateCRD.Kind,
-						APIVersion: testtypes.GenericInfrastructureMachineTemplateCRD.APIVersion,
+						Kind:       builder.GenericInfrastructureMachineTemplateCRD.Kind,
+						APIVersion: builder.GenericInfrastructureMachineTemplateCRD.APIVersion,
 						// Try to break Infra Cloning
 						Name:      "something_invalid",
 						Namespace: cluster.Namespace,
@@ -793,7 +793,7 @@ func TestMachineSetReconcile_MachinesCreatedConditionFalseOnBadInfraRef(t *testi
 	request := reconcile.Request{
 		NamespacedName: key,
 	}
-	fakeClient := fake.NewClientBuilder().WithObjects(cluster, ms, testtypes.GenericInfrastructureMachineTemplateCRD.DeepCopy()).Build()
+	fakeClient := fake.NewClientBuilder().WithObjects(cluster, ms, builder.GenericInfrastructureMachineTemplateCRD.DeepCopy()).Build()
 
 	msr := &MachineSetReconciler{
 		Client:   fakeClient,