Skip to content

Commit 9186928

Browse files
metal3-io-botmetal3-io-bot
authored
Merge pull request #3038 from Nordix/Sunnatillo/uplift-capi-bmo-ipam-v1.12
🌱 Bump CAPI to v1.12.1, IPAM v1.12.0 and BMO v0.12.0
2 parents 0394e86 + 82c4753 commit 9186928

File tree

11 files changed

+47
-48
lines changed

11 files changed

+47
-48
lines changed

‎api/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ module github.com/metal3-io/cluster-api-provider-metal3/api
33
go 1.24.0
44

55
require (
6-
github.com/metal3-io/ip-address-manager/api v1.12.0-rc.0
6+
github.com/metal3-io/ip-address-manager/api v1.12.0
77
github.com/onsi/gomega v1.38.3
88
github.com/pkg/errors v0.9.1
99
k8s.io/api v0.34.3
1010
k8s.io/apiextensions-apiserver v0.34.3
1111
k8s.io/apimachinery v0.34.3
1212
k8s.io/client-go v0.34.3
13-
sigs.k8s.io/cluster-api v1.12.0
13+
sigs.k8s.io/cluster-api v1.12.1
1414
sigs.k8s.io/controller-runtime v0.22.4
1515
)
1616

‎api/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
5959
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
6060
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
6161
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
62-
github.com/metal3-io/ip-address-manager/api v1.12.0-rc.0 h1:7nOf9bxUrIGLiuVk7v8hC6BspF3IIA3TFFYW/rggKsA=
63-
github.com/metal3-io/ip-address-manager/api v1.12.0-rc.0/go.mod h1:o0C+n3DRFYEsNP2/cwyNKHYKZ9Dfii5IN9K/TFF7dfE=
62+
github.com/metal3-io/ip-address-manager/api v1.12.0 h1:VHDUHvnaoYFRJ6601ax/ObUEGCyPRBNkiWioGacalHU=
63+
github.com/metal3-io/ip-address-manager/api v1.12.0/go.mod h1:fkcCgObstEXiiF3t8z04SQ6F5OIDWoXcLuJ6bW1igJc=
6464
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
6565
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
6666
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -69,8 +69,8 @@ github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFd
6969
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
7070
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
7171
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
72-
github.com/onsi/ginkgo/v2 v2.27.2 h1:LzwLj0b89qtIy6SSASkzlNvX6WktqurSHwkk2ipF/Ns=
73-
github.com/onsi/ginkgo/v2 v2.27.2/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo=
72+
github.com/onsi/ginkgo/v2 v2.27.3 h1:ICsZJ8JoYafeXFFlFAG75a7CxMsJHwgKwtO+82SE9L8=
73+
github.com/onsi/ginkgo/v2 v2.27.3/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo=
7474
github.com/onsi/gomega v1.38.3 h1:eTX+W6dobAYfFeGC2PV6RwXRu/MyT+cQguijutvkpSM=
7575
github.com/onsi/gomega v1.38.3/go.mod h1:ZCU1pkQcXDO5Sl9/VVEGlDyp+zm0m1cmeG5TOzLgdh4=
7676
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -185,8 +185,8 @@ k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOP
185185
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts=
186186
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
187187
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
188-
sigs.k8s.io/cluster-api v1.12.0 h1:iFOz8b0LdrMJS5Df1Eb7wyvTkWqlTUM2LHFEHCeI6vA=
189-
sigs.k8s.io/cluster-api v1.12.0/go.mod h1:+S6WJdi8UPdqv5q9nka5al3ed/Qa0zAcSBgzTaa9VKA=
188+
sigs.k8s.io/cluster-api v1.12.1 h1:s3DivSZjXdu2HPyOtV/n6XwSZBaIycZdKNs4y8X+3lY=
189+
sigs.k8s.io/cluster-api v1.12.1/go.mod h1:+S6WJdi8UPdqv5q9nka5al3ed/Qa0zAcSBgzTaa9VKA=
190190
sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A=
191191
sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
192192
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ go 1.24.0
55
require (
66
github.com/go-logr/logr v1.4.3
77
github.com/golang/mock v1.6.0
8-
github.com/metal3-io/baremetal-operator/apis v0.12.0-rc.0
8+
github.com/metal3-io/baremetal-operator/apis v0.12.0
99
github.com/metal3-io/cluster-api-provider-metal3/api v0.0.0
10-
github.com/metal3-io/ip-address-manager/api v1.12.0-rc.0
10+
github.com/metal3-io/ip-address-manager/api v1.12.0
1111
github.com/onsi/ginkgo/v2 v2.27.3
1212
github.com/onsi/gomega v1.38.3
1313
github.com/pkg/errors v0.9.1
@@ -20,7 +20,7 @@ require (
2020
k8s.io/component-base v0.34.3
2121
k8s.io/klog/v2 v2.130.1
2222
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
23-
sigs.k8s.io/cluster-api v1.12.0
23+
sigs.k8s.io/cluster-api v1.12.1
2424
sigs.k8s.io/controller-runtime v0.22.4
2525
sigs.k8s.io/yaml v1.6.0
2626
)

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,10 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0
117117
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
118118
github.com/maruel/natural v1.1.1 h1:Hja7XhhmvEFhcByqDoHz9QZbkWey+COd9xWfCfn1ioo=
119119
github.com/maruel/natural v1.1.1/go.mod h1:v+Rfd79xlw1AgVBjbO0BEQmptqb5HvL/k9GRHB7ZKEg=
120-
github.com/metal3-io/baremetal-operator/apis v0.12.0-rc.0 h1:odK1t3tJrF45X00px3neZxW3WspF9/XKIoexCDirKxk=
121-
github.com/metal3-io/baremetal-operator/apis v0.12.0-rc.0/go.mod h1:xfEEC1yLdYQshioMOivWoIcovd0XRnBhO1kVjowXSpw=
122-
github.com/metal3-io/ip-address-manager/api v1.12.0-rc.0 h1:7nOf9bxUrIGLiuVk7v8hC6BspF3IIA3TFFYW/rggKsA=
123-
github.com/metal3-io/ip-address-manager/api v1.12.0-rc.0/go.mod h1:o0C+n3DRFYEsNP2/cwyNKHYKZ9Dfii5IN9K/TFF7dfE=
120+
github.com/metal3-io/baremetal-operator/apis v0.12.0 h1:tLe+VocO7nwGLiIK7vcnFE5f3jcM4AhJ5mCLDVrEAtU=
121+
github.com/metal3-io/baremetal-operator/apis v0.12.0/go.mod h1:7MJs5wimmBRFZ9drrrt51blP7LaBewTZ9rzzc4nyi8E=
122+
github.com/metal3-io/ip-address-manager/api v1.12.0 h1:VHDUHvnaoYFRJ6601ax/ObUEGCyPRBNkiWioGacalHU=
123+
github.com/metal3-io/ip-address-manager/api v1.12.0/go.mod h1:fkcCgObstEXiiF3t8z04SQ6F5OIDWoXcLuJ6bW1igJc=
124124
github.com/mfridman/tparse v0.18.0 h1:wh6dzOKaIwkUGyKgOntDW4liXSo37qg5AXbIhkMV3vE=
125125
github.com/mfridman/tparse v0.18.0/go.mod h1:gEvqZTuCgEhPbYk/2lS3Kcxg1GmTxxU7kTC8DvP0i/A=
126126
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
@@ -321,8 +321,8 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
321321
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
322322
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
323323
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
324-
sigs.k8s.io/cluster-api v1.12.0 h1:iFOz8b0LdrMJS5Df1Eb7wyvTkWqlTUM2LHFEHCeI6vA=
325-
sigs.k8s.io/cluster-api v1.12.0/go.mod h1:+S6WJdi8UPdqv5q9nka5al3ed/Qa0zAcSBgzTaa9VKA=
324+
sigs.k8s.io/cluster-api v1.12.1 h1:s3DivSZjXdu2HPyOtV/n6XwSZBaIycZdKNs4y8X+3lY=
325+
sigs.k8s.io/cluster-api v1.12.1/go.mod h1:+S6WJdi8UPdqv5q9nka5al3ed/Qa0zAcSBgzTaa9VKA=
326326
sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A=
327327
sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
328328
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

‎hack/fake-apiserver/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ require (
99
k8s.io/api v0.34.3
1010
k8s.io/apimachinery v0.34.3
1111
k8s.io/client-go v0.34.3
12-
sigs.k8s.io/cluster-api v1.12.0
13-
sigs.k8s.io/cluster-api/test v1.12.0
12+
sigs.k8s.io/cluster-api v1.12.1
13+
sigs.k8s.io/cluster-api/test v1.12.1
1414
sigs.k8s.io/controller-runtime v0.22.4
1515
)
1616

‎hack/fake-apiserver/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,10 +317,10 @@ k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d h1:wAhiDyZ4Tdtt7e46e9M5ZSAJ/MnPG
317317
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
318318
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
319319
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
320-
sigs.k8s.io/cluster-api v1.12.0 h1:iFOz8b0LdrMJS5Df1Eb7wyvTkWqlTUM2LHFEHCeI6vA=
321-
sigs.k8s.io/cluster-api v1.12.0/go.mod h1:+S6WJdi8UPdqv5q9nka5al3ed/Qa0zAcSBgzTaa9VKA=
322-
sigs.k8s.io/cluster-api/test v1.12.0 h1:OpxFwNSu9j9jY2v4dl90rSi5W9is8/vBXxGCTci5gyE=
323-
sigs.k8s.io/cluster-api/test v1.12.0/go.mod h1:eS05aBCEZeKzcW7MGnT9U+zap4NCpkxHBWb10DshWp0=
320+
sigs.k8s.io/cluster-api v1.12.1 h1:s3DivSZjXdu2HPyOtV/n6XwSZBaIycZdKNs4y8X+3lY=
321+
sigs.k8s.io/cluster-api v1.12.1/go.mod h1:+S6WJdi8UPdqv5q9nka5al3ed/Qa0zAcSBgzTaa9VKA=
322+
sigs.k8s.io/cluster-api/test v1.12.1 h1:GGMBW7Nc5LxwrvgVSXiiMWFSOTKSqa0Dgo6V2LVysdM=
323+
sigs.k8s.io/cluster-api/test v1.12.1/go.mod h1:CQxT0fp1fFJjD8zlSUZBUU66UmgIJSv+2U09zenoXOI=
324324
sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A=
325325
sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
326326
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

‎hack/gen_tilt_settings.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ get_latest_release() {
4242
}
4343

4444
CAPIRELEASEPATH="${CAPIRELEASEPATH:-https://api.github.com/repos/${CAPI_BASE_URL:-kubernetes-sigs/cluster-api}/releases}"
45-
export CAPIRELEASE="${CAPIRELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "v1.3.")}"
45+
export CAPIRELEASE="${CAPIRELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "v1.12.")}"
4646

4747
# ClusterClass enable flag
4848
if [ -n "${CLUSTER_TOPOLOGY:-}" ]; then

‎scripts/ci-e2e.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ else
2323
# Commenting this out as CAPI release prefix and exporting CAPIRELEASE
2424
# during pre-release phase of CAPI.
2525
# We will change when minor is released.
26-
# export CAPI_RELEASE_PREFIX="v1.12."
27-
export CAPIRELEASE="v1.12.0-rc.1"
26+
export CAPI_RELEASE_PREFIX="v1.12."
2827
fi
2928

3029
# Default CAPI_CONFIG_FOLDER to $HOME/.config folder if XDG_CONFIG_HOME not set

‎test/e2e/config/e2e_conf.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ providers:
1717
- name: cluster-api
1818
type: CoreProvider
1919
versions:
20-
- name: "v1.12.99"
20+
- name: "{go://sigs.k8s.io/cluster-api@v1.12}"
2121
# Switch back to nightly builds once 1.12 stable is out. ("https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_${DATE}/core-components.yaml"
22-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.12.0-rc.1/core-components.yaml"
22+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/core-components.yaml
2323
type: "url"
2424
contract: v1beta2
2525
replacements:
@@ -66,9 +66,9 @@ providers:
6666
- name: kubeadm
6767
type: BootstrapProvider
6868
versions:
69-
- name: "v1.12.99"
69+
- name: "{go://sigs.k8s.io/cluster-api@v1.12}"
7070
# Switch back to nightly builds once 1.12 stable is out. ("https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_${DATE}/bootstrap-components.yaml"
71-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.12.0-rc.1/bootstrap-components.yaml"
71+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/bootstrap-components.yaml"
7272
type: "url"
7373
contract: v1beta2
7474
replacements:
@@ -115,7 +115,7 @@ providers:
115115
- name: kubeadm
116116
type: ControlPlaneProvider
117117
versions:
118-
- name: "v1.12.99"
118+
- name: "{go://sigs.k8s.io/cluster-api@v1.12}"
119119
# Switch back to nightly builds once 1.12 stable is out. ("https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_${DATE}/control-plane-components.yaml"
120120
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.12.0-rc.1/control-plane-components.yaml"
121121
type: "url"
@@ -164,8 +164,8 @@ providers:
164164
- name: metal3
165165
type: IPAMProvider
166166
versions:
167-
- name: "v1.12.99"
168-
value: "https://github.com/metal3-io/ip-address-manager/releases/download/v1.12.0-rc.0/ipam-components.yaml"
167+
- name: "{go://github.com/metal3-io/ip-address-manager@v1.12}"
168+
value: "https://github.com/metal3-io/ip-address-manager/releases/download/{go://github.com/metal3-io/[email protected]}/ipam-components.yaml"
169169
type: "url"
170170
contract: v1beta1
171171
replacements:

‎test/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ require (
77
github.com/blang/semver/v4 v4.0.0
88
github.com/docker/docker v28.5.2+incompatible
99
github.com/jinzhu/copier v0.4.0
10-
github.com/metal3-io/baremetal-operator/apis v0.12.0-rc.0
10+
github.com/metal3-io/baremetal-operator/apis v0.12.0
1111
github.com/metal3-io/cluster-api-provider-metal3/api v0.0.0
12-
github.com/metal3-io/ip-address-manager/api v1.12.0-rc.0
12+
github.com/metal3-io/ip-address-manager/api v1.12.0
1313
github.com/metal3-io/ironic-standalone-operator/api v0.6.1
1414
github.com/onsi/ginkgo/v2 v2.27.3
1515
github.com/onsi/gomega v1.38.3
@@ -25,8 +25,8 @@ require (
2525
k8s.io/klog/v2 v2.130.1
2626
k8s.io/kubectl v0.34.3
2727
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
28-
sigs.k8s.io/cluster-api v1.12.0
29-
sigs.k8s.io/cluster-api/test v1.12.0
28+
sigs.k8s.io/cluster-api v1.12.1
29+
sigs.k8s.io/cluster-api/test v1.12.1
3030
sigs.k8s.io/controller-runtime v0.22.4
3131
sigs.k8s.io/kustomize/api v0.21.0
3232
sigs.k8s.io/kustomize/kyaml v0.21.0
@@ -196,7 +196,7 @@ require (
196196
oras.land/oras-go/v2 v2.6.0 // indirect
197197
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
198198
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
199-
sigs.k8s.io/kind v0.30.0 // indirect
199+
sigs.k8s.io/kind v0.31.0 // indirect
200200
sigs.k8s.io/randfill v1.0.0 // indirect
201201
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
202202
sigs.k8s.io/yaml v1.6.0 // indirect

0 commit comments

Comments
 (0)