Skip to content

e2e: fix contract for CAPI #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 18, 2025
+7 −7
Merged

e2e: fix contract for CAPI #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4009405
e2e: fix contract for CAPI
chrischdi Nov 18, 2025
74fb7a3
fix path again
chrischdi Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions test/e2e/data/e2e_conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/data/e2e_eks_conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/suites/unmanaged/unmanaged_CAPI_clusterclass_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down