Merge pull request #5622 from killianmuldoon/test/add-builders-to-webhook-tests

🌱 Use internal/builders in tests for webhook package

Author: k8s-ci-robot

cmd/clusterctl/internal/test/fake_objects.go

@@ -1458,7 +1458,7 @@ func (f *FakeClusterClass) Objs() []client.Object {
 			objMap[fakeMDClass.bootstrapTemplate] = true
 			objMap[fakeMDClass.infrastructureTemplate] = true
 		}
-		clusterClassBuilder.WithWorkerMachineDeploymentClasses(mdClasses)
+		clusterClassBuilder.WithWorkerMachineDeploymentClasses(mdClasses...)
 	}
 
 	clusterClass := clusterClassBuilder.Build()

controllers/topology/blueprint_test.go

@@ -182,7 +182,7 @@ func TestGetBlueprint(t *testing.T) {
 			clusterClass: builder.ClusterClass(metav1.NamespaceDefault, "class1").
 				WithInfrastructureClusterTemplate(infraClusterTemplate).
 				WithControlPlaneTemplate(controlPlaneTemplate).
-				WithWorkerMachineDeploymentClasses(mds).
+				WithWorkerMachineDeploymentClasses(mds...).
 				Build(),
 			objects: []client.Object{
 				infraClusterTemplate,
@@ -194,7 +194,7 @@ func TestGetBlueprint(t *testing.T) {
 				ClusterClass: builder.ClusterClass(metav1.NamespaceDefault, "class1").
 					WithInfrastructureClusterTemplate(infraClusterTemplate).
 					WithControlPlaneTemplate(controlPlaneTemplate).
-					WithWorkerMachineDeploymentClasses(mds).
+					WithWorkerMachineDeploymentClasses(mds...).
 					Build(),
 				InfrastructureClusterTemplate: infraClusterTemplate,
 				ControlPlane: &scope.ControlPlaneBlueprint{
@@ -217,7 +217,7 @@ func TestGetBlueprint(t *testing.T) {
 			clusterClass: builder.ClusterClass(metav1.NamespaceDefault, "class1").
 				WithInfrastructureClusterTemplate(infraClusterTemplate).
 				WithControlPlaneTemplate(controlPlaneTemplate).
-				WithWorkerMachineDeploymentClasses(mds).
+				WithWorkerMachineDeploymentClasses(mds...).
 				Build(),
 			objects: []client.Object{
 				infraClusterTemplate,
@@ -232,7 +232,7 @@ func TestGetBlueprint(t *testing.T) {
 			clusterClass: builder.ClusterClass(metav1.NamespaceDefault, "class1").
 				WithInfrastructureClusterTemplate(infraClusterTemplate).
 				WithControlPlaneTemplate(controlPlaneTemplate).
-				WithWorkerMachineDeploymentClasses(mds).
+				WithWorkerMachineDeploymentClasses(mds...).
 				Build(),
 			objects: []client.Object{
 				infraClusterTemplate,

controllers/topology/cluster_controller_test.go

@@ -325,7 +325,7 @@ func setupTestEnvForIntegrationTests(ns *corev1.Namespace) (func() error, error)
 		WithInfrastructureClusterTemplate(infrastructureClusterTemplate).
 		WithControlPlaneTemplate(controlPlaneTemplate).
 		WithControlPlaneInfrastructureMachineTemplate(infrastructureMachineTemplate).
-		WithWorkerMachineDeploymentClasses([]clusterv1.MachineDeploymentClass{*machineDeploymentClass1, *machineDeploymentClass2}).
+		WithWorkerMachineDeploymentClasses(*machineDeploymentClass1, *machineDeploymentClass2).
 		Build()
 
 	// 3) Two Clusters including a Cluster Topology objects and the MachineDeploymentTopology objects used in the

controllers/topology/clusterclass_controller_test.go

@@ -76,7 +76,7 @@ func TestClusterClassReconciler_reconcile(t *testing.T) {
 		WithInfrastructureClusterTemplate(infraClusterTemplate).
 		WithControlPlaneTemplate(controlPlaneTemplate).
 		WithControlPlaneInfrastructureMachineTemplate(infraMachineTemplateControlPlane).
-		WithWorkerMachineDeploymentClasses([]clusterv1.MachineDeploymentClass{*machineDeploymentClass1, *machineDeploymentClass2}).
+		WithWorkerMachineDeploymentClasses(*machineDeploymentClass1, *machineDeploymentClass2).
 		Build()
 
 	// Create the set of initObjects from the objects above to add to the API server when the test environment starts.

controllers/topology/desired_state_test.go

@@ -688,7 +688,7 @@ func TestComputeMachineDeployment(t *testing.T) {
 		Build()
 	mcds := []clusterv1.MachineDeploymentClass{*md1}
 	fakeClass := builder.ClusterClass(metav1.NamespaceDefault, "class1").
-		WithWorkerMachineDeploymentClasses(mcds).
+		WithWorkerMachineDeploymentClasses(mcds...).
 		Build()
 
 	version := "v1.21.2"

controllers/topology/internal/extensions/patches/engine_test.go

@@ -466,7 +466,7 @@ func setupTestObjects() (*scope.ClusterBlueprint, *scope.ClusterState) {
 		WithInfrastructureClusterTemplate(infrastructureClusterTemplate).
 		WithControlPlaneTemplate(controlPlaneTemplate).
 		WithControlPlaneInfrastructureMachineTemplate(controlPlaneInfrastructureMachineTemplate).
-		WithWorkerMachineDeploymentClasses([]clusterv1.MachineDeploymentClass{*mdClass1}).
+		WithWorkerMachineDeploymentClasses(*mdClass1).
 		Build()
 
 	cluster := &clusterv1.Cluster{

internal/builder/builders.go

@@ -219,7 +219,7 @@ func (c *ClusterClassBuilder) WithControlPlaneInfrastructureMachineTemplate(t *u
 }
 
 // WithWorkerMachineDeploymentClasses adds the variables and objects needed to create MachineDeploymentTemplates for a ClusterClassBuilder.
-func (c *ClusterClassBuilder) WithWorkerMachineDeploymentClasses(mdcs []clusterv1.MachineDeploymentClass) *ClusterClassBuilder {
+func (c *ClusterClassBuilder) WithWorkerMachineDeploymentClasses(mdcs ...clusterv1.MachineDeploymentClass) *ClusterClassBuilder {
 	if c.machineDeploymentClasses == nil {
 		c.machineDeploymentClasses = make([]clusterv1.MachineDeploymentClass, 0)
 	}

webhooks/cluster.go

@@ -252,7 +252,7 @@ func (webhook *Cluster) validateTopology(ctx context.Context, old, new *clusterv
 		allErrs = append(
 			allErrs, field.Invalid(
 				field.NewPath("spec", "topology", "class"),
-				new.Name,
+				new.Spec.Topology.Class,
 				"ClusterClass could not be found"))
 	}
 	return allErrs