Skip to content

Commit e7c3d5c

Browse files
Merge pull request #839 from salasberryfin/capi_bump_to_v1.12.3_backport_0.23
[release-0.23] chore: bump capi to v1.12.3
2 parents b5eb026 + 7f97abf commit e7c3d5c

6 files changed

Lines changed: 17 additions & 17 deletions

File tree

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ require (
2525
k8s.io/client-go v0.34.3
2626
k8s.io/klog/v2 v2.130.1
2727
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
28-
sigs.k8s.io/cluster-api v1.12.2
29-
sigs.k8s.io/cluster-api/test v1.12.2
28+
sigs.k8s.io/cluster-api v1.12.3
29+
sigs.k8s.io/cluster-api/test v1.12.3
3030
sigs.k8s.io/controller-runtime v0.22.5
3131
sigs.k8s.io/kind v0.31.0
3232
sigs.k8s.io/yaml v1.6.0

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
5252
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
5353
github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=
5454
github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
55-
github.com/coredns/corefile-migration v1.0.29 h1:g4cPYMXXDDs9uLE2gFYrJaPBuUAR07eEMGyh9JBE13w=
56-
github.com/coredns/corefile-migration v1.0.29/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
55+
github.com/coredns/corefile-migration v1.0.30 h1:ljZNPGgna+4yKv81gfkvkgLEWdtz0NjBR1glaiPI140=
56+
github.com/coredns/corefile-migration v1.0.30/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
5757
github.com/coreos/butane v0.26.0 h1:Cqrz5Ud0eLZUQFHVc67A8l+rJ9N4UoWXW4cjqVrMsfQ=
5858
github.com/coreos/butane v0.26.0/go.mod h1:syp2EmtkDFDFzANxWogkSvMgcW/6taTbdvqyd8V/dgM=
5959
github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb h1:rmqyI19j3Z/74bIRhuC59RB442rXUazKNueVpfJPxg4=
@@ -444,10 +444,10 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
444444
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
445445
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
446446
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
447-
sigs.k8s.io/cluster-api v1.12.2 h1:+b+M2IygfvFZJq7bsaloNakimMEVNf81zkGR1IiuxXs=
448-
sigs.k8s.io/cluster-api v1.12.2/go.mod h1:2XuF/dmN3c/1VITb6DB44N5+Ecvsvd5KOWqrY9Q53nU=
449-
sigs.k8s.io/cluster-api/test v1.12.2 h1:gYApF1BJRt0fCxmgaTeqm+rreNhLHcwQw7Z6pFCtr60=
450-
sigs.k8s.io/cluster-api/test v1.12.2/go.mod h1:E6ID6xgLy6rkpm09yQW2DT8Cf2/7nLX1o3sDHv4pFsY=
447+
sigs.k8s.io/cluster-api v1.12.3 h1:cuOl3fWXhlXFuQcyIH4C8i3ns8rLhtcnK+x00MVdKBs=
448+
sigs.k8s.io/cluster-api v1.12.3/go.mod h1:EAiTJtf/8M5eBetPwumi6t8DJJ55Ln6Fkvh2OAa7PD4=
449+
sigs.k8s.io/cluster-api/test v1.12.3 h1:SfHkgaOoMLcCXhPFjmflFtag2yil0I4d2/i2S66GlFU=
450+
sigs.k8s.io/cluster-api/test v1.12.3/go.mod h1:E6ID6xgLy6rkpm09yQW2DT8Cf2/7nLX1o3sDHv4pFsY=
451451
sigs.k8s.io/controller-runtime v0.22.5 h1:v3nfSUMowX/2WMp27J9slwGFyAt7IV0YwBxAkrUr0GE=
452452
sigs.k8s.io/controller-runtime v0.22.5/go.mod h1:pc5SoYWnWI6I+cBHYYdZ7B6YHZVY5xNfll88JB+vniI=
453453
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

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.12.2"
20-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.12.2/core-components.yaml"
19+
- name: "v1.12.3"
20+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.12.3/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.12.2"
34-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.12.2/infrastructure-components-development.yaml"
33+
- name: "v1.12.3"
34+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.12.3/infrastructure-components-development.yaml"
3535
type: "url"
3636
contract: v1beta2
3737
files:

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.12.2"},
276+
InfrastructureProviders: []string{"docker:v1.12.3"},
277277
IPAMProviders: config.IPAMProviders(),
278278
RuntimeExtensionProviders: config.RuntimeExtensionProviders(),
279-
CoreProvider: "cluster-api:v1.12.2",
279+
CoreProvider: "cluster-api:v1.12.3",
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.12.2"},
157-
CoreProvider: "cluster-api:v1.12.2",
156+
InfrastructureProviders: []string{"docker:v1.12.3"},
157+
CoreProvider: "cluster-api:v1.12.3",
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.12.2"),
60+
InfrastructureProvider: ptr.To("docker:v1.12.3"),
6161
Flavor: ptr.To("kcp-remediation"),
6262
}
6363
})

0 commit comments

Comments
 (0)