Skip to content

Commit 08b79ae

Browse files
Merge pull request #826 from salasberryfin/backport_test_capi_v1.12.2
[release-0.23] test: bump capi to v1.12.2
2 parents d46bb63 + 7d64ed4 commit 08b79ae

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

test/e2e/config/e2e_conf.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ providers:
1616
- name: cluster-api
1717
type: CoreProvider
1818
versions:
19-
- name: "v1.11.5"
20-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.5/core-components.yaml"
19+
- name: "v1.12.2"
20+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.12.2/core-components.yaml"
2121
type: "url"
2222
contract: v1beta2
2323
files:
@@ -30,8 +30,8 @@ providers:
3030
- name: docker
3131
type: InfrastructureProvider
3232
versions:
33-
- name: "v1.11.5"
34-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.5/infrastructure-components-development.yaml"
33+
- name: "v1.12.2"
34+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.12.2/infrastructure-components-development.yaml"
3535
type: "url"
3636
contract: v1beta2
3737
files:

test/e2e/data/shared/v1beta1/metadata.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
22
kind: Metadata
33
releaseSeries:
4+
- major: 1
5+
minor: 12
6+
contract: v1beta2
47
- major: 1
58
minor: 11
69
contract: v1beta2

test/e2e/e2e_suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,10 +273,10 @@ func initUpgradableBootstrapCluster(bootstrapClusterProxy framework.ClusterProxy
273273
InitManagementCluster(context.TODO(), clusterctl.InitManagementClusterAndWatchControllerLogsInput{
274274
ClusterProxy: bootstrapClusterProxy,
275275
ClusterctlConfigPath: clusterctlConfig,
276-
InfrastructureProviders: []string{"docker:v1.11.5"},
276+
InfrastructureProviders: []string{"docker:v1.12.2"},
277277
IPAMProviders: config.IPAMProviders(),
278278
RuntimeExtensionProviders: config.RuntimeExtensionProviders(),
279-
CoreProvider: "cluster-api:v1.11.5",
279+
CoreProvider: "cluster-api:v1.12.2",
280280
BootstrapProviders: []string{"rke2-bootstrap:v0.22.0"},
281281
ControlPlaneProviders: []string{"rke2-control-plane:v0.22.0"},
282282
LogFolder: filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()),

test/e2e/e2e_upgrade_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ var _ = Describe("Provider upgrade", Label(UpgradeTestsLabel), func() {
153153
UpgradeManagementCluster(ctx, clusterctl.UpgradeManagementClusterAndWaitInput{
154154
ClusterProxy: bootstrapClusterProxy,
155155
ClusterctlConfigPath: clusterctlConfigPath,
156-
InfrastructureProviders: []string{"docker:v1.11.5"},
157-
CoreProvider: "cluster-api:v1.11.5",
156+
InfrastructureProviders: []string{"docker:v1.12.2"},
157+
CoreProvider: "cluster-api:v1.12.2",
158158
BootstrapProviders: []string{"rke2-bootstrap:v0.23.99"},
159159
ControlPlaneProviders: []string{"rke2-control-plane:v0.23.99"},
160160
LogFolder: clusterctlLogFolder,

test/e2e/rcp_remediation_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ var _ = Describe("When testing RCP remediation", Label(DefaultTestsLabel), func(
5757
BootstrapClusterProxy: bootstrapClusterProxy,
5858
ArtifactFolder: artifactFolder,
5959
SkipCleanup: skipCleanup,
60-
InfrastructureProvider: ptr.To("docker:v1.11.5"),
60+
InfrastructureProvider: ptr.To("docker:v1.12.2"),
6161
Flavor: ptr.To("kcp-remediation"),
6262
}
6363
})

0 commit comments

Comments
 (0)