e2e: add v1beta1 CAPI scheme to clients and adjust modifyFunc test to use the new field name

Author: chrischdi

test/e2e/shared/defaults.go

@@ -30,6 +30,9 @@ import (
 	cgscheme "k8s.io/client-go/kubernetes/scheme"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
+	bootstrapv1beta1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta1"
+	controlplanev1beta1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta1"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 	"sigs.k8s.io/cluster-api/test/framework"
 )
 
@@ -221,6 +224,12 @@ func getLimitedResources() map[string]*ServiceQuota {
 func DefaultScheme() *runtime.Scheme {
 	sc := runtime.NewScheme()
 	framework.TryAddDefaultSchemes(sc)
+
+	// Temporary add v1beta1 scheme as long as the e2e tests use v1beta1 templates
+	clusterv1beta1.AddToScheme(sc)
+	bootstrapv1beta1.AddToScheme(sc)
+	controlplanev1beta1.AddToScheme(sc)
+
 	_ = infrav1.AddToScheme(sc)
 	_ = cgscheme.AddToScheme(sc)
 	return sc

test/e2e/suites/unmanaged/unmanaged_CAPI_clusterclass_test.go

@@ -117,7 +117,7 @@ var _ = ginkgo.Context("[unmanaged] [Cluster API Framework] [ClusterClass]", fun
 				// ControlPlaneTemplate of the ClusterClass after the initial Cluster creation.
 				// The test verifies that these fields are rolled out to the ControlPlane.
 				ModifyControlPlaneFields: map[string]interface{}{
-					"spec.machineTemplate.nodeDrainTimeout": "10s",
+					"spec.machineTemplate.nodeDrainTimeoutSeconds": "10s",
 				},
 				// ModifyMachineDeploymentBootstrapConfigTemplateFields are the fields which will be set on the
 				// BootstrapConfigTemplate of all MachineDeploymentClasses of the ClusterClass after the initial Cluster creation.