Merge pull request #2 from chrischdi/pr-capa-bump-2

e2e: fix contract for CAPI

Author: clebs

test/e2e/data/e2e_conf.yaml

@@ -51,7 +51,7 @@ providers:
       - name: v1.11.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
         value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.1/core-components.yaml"
         type: "url"
-        contract: v1beta1
+        contract: v1beta2
         files:
           - sourcePath: "./shared/v1beta1/metadata.yaml"
         replacements:
@@ -78,7 +78,7 @@ providers:
       - name: v1.11.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
         value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.1/bootstrap-components.yaml"
         type: "url"
-        contract: v1beta1
+        contract: v1beta2
         files:
           - sourcePath: "./shared/v1beta1/metadata.yaml"
         replacements:
@@ -105,7 +105,7 @@ providers:
       - name: v1.11.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta1 latest clusterctl upgrades test only.
         value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.1/control-plane-components.yaml"
         type: "url"
-        contract: v1beta1
+        contract: v1beta2
         files:
           - sourcePath: "./shared/v1beta1/metadata.yaml"
         replacements:

test/e2e/data/e2e_eks_conf.yaml

@@ -37,7 +37,7 @@ providers:
       - name: v1.11.1
         value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.1/core-components.yaml"
         type: "url"
-        contract: v1beta1
+        contract: v1beta2
         files:
           - sourcePath: "./shared/v1beta1/metadata.yaml"
         replacements:
@@ -53,7 +53,7 @@ providers:
       - name: v1.11.1
         value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.1/bootstrap-components.yaml"
         type: "url"
-        contract: v1beta1
+        contract: v1beta2
         files:
           - sourcePath: "./shared/v1beta1/metadata.yaml"
         replacements:
@@ -69,7 +69,7 @@ providers:
       - name: v1.11.1
         value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.1/control-plane-components.yaml"
         type: "url"
-        contract: v1beta1
+        contract: v1beta2
         files:
           - sourcePath: "./shared/v1beta1/metadata.yaml"
         replacements:

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.deletion.nodeDrainTimeoutSeconds": "10s",
+					"spec.machineTemplate.spec.deletion.nodeDrainTimeoutSeconds": "10s",
 				},
 				// ModifyMachineDeploymentBootstrapConfigTemplateFields are the fields which will be set on the
 				// BootstrapConfigTemplate of all MachineDeploymentClasses of the ClusterClass after the initial Cluster creation.