diff --git a/test/e2e/clusterclass_changes.go b/test/e2e/clusterclass_changes.go index 5503a170e26e..f99e40ceb25f 100644 --- a/test/e2e/clusterclass_changes.go +++ b/test/e2e/clusterclass_changes.go @@ -432,7 +432,7 @@ type modifyMachinePoolViaClusterClassAndWaitInput struct { ClusterProxy framework.ClusterProxy ClusterClass *clusterv1.ClusterClass Cluster *clusterv1.Cluster - ModifyBootstrapConfigTemplateFields map[string]interface{} + ModifyBootstrapConfigObjectFields map[string]interface{} ModifyInfrastructureMachinePoolTemplateFields map[string]interface{} WaitForMachinePools []interface{} } @@ -464,7 +464,7 @@ func modifyMachinePoolViaClusterClassAndWait(ctx context.Context, input modifyMa newBootstrapConfigTemplateName = fmt.Sprintf("%s-%s", bootstrapConfigTemplateRef.Name, util.RandomString(6)) newBootstrapConfigTemplate.SetName(newBootstrapConfigTemplateName) newBootstrapConfigTemplate.SetResourceVersion("") - for fieldPath, value := range input.ModifyBootstrapConfigTemplateFields { + for fieldPath, value := range input.ModifyBootstrapConfigObjectFields { Expect(unstructured.SetNestedField(newBootstrapConfigTemplate.Object, value, strings.Split(fieldPath, ".")...)).To(Succeed()) } Expect(mgmtClient.Create(ctx, newBootstrapConfigTemplate)).To(Succeed()) @@ -524,7 +524,7 @@ func modifyMachinePoolViaClusterClassAndWait(ctx context.Context, input modifyMa g.Expect(err).ToNot(HaveOccurred()) // Verify that ModifyBootstrapConfigTemplateFields have been set. - for fieldPath, expectedValue := range input.ModifyBootstrapConfigTemplateFields { + for fieldPath, expectedValue := range input.ModifyBootstrapConfigObjectFields { currentValue, ok, err := unstructured.NestedFieldNoCopy(bootstrapConfigTemplate.Object, strings.Split(fieldPath, ".")...) g.Expect(err).ToNot(HaveOccurred(), fmt.Sprintf("failed to get field %q", fieldPath)) g.Expect(ok).To(BeTrue(), fmt.Sprintf("failed to get field %q", fieldPath)) diff --git a/test/e2e/clusterclass_rollout.go b/test/e2e/clusterclass_rollout.go index 4b897d553da5..2cce4ff00133 100644 --- a/test/e2e/clusterclass_rollout.go +++ b/test/e2e/clusterclass_rollout.go @@ -239,8 +239,8 @@ func ClusterClassRolloutSpec(ctx context.Context, inputGetter func() ClusterClas ClusterProxy: input.BootstrapClusterProxy, ClusterClass: clusterResources.ClusterClass, Cluster: clusterResources.Cluster, - ModifyBootstrapConfigTemplateFields: map[string]interface{}{ - "spec.template.spec.verbosity": int64(4), + ModifyBootstrapConfigObjectFields: map[string]interface{}{ + "spec.verbosity": int64(4), }, WaitForMachinePools: input.E2EConfig.GetIntervals(specName, "wait-worker-nodes"), })