Skip to content

Commit ffba84d

Browse files
Merge pull request #2871 from Nordix/uplift-bmo-ipam
🌱 Uplift IPAM and BMO patch for release-1.10
2 parents 70fd1f3 + 58c4d36 commit ffba84d

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

api/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/metal3-io/cluster-api-provider-metal3/api
33
go 1.23.7
44

55
require (
6-
github.com/metal3-io/ip-address-manager/api v1.10.2
6+
github.com/metal3-io/ip-address-manager/api v1.10.3
77
github.com/onsi/gomega v1.37.0
88
github.com/pkg/errors v0.9.1
99
k8s.io/api v0.32.9

api/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
6464
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
6565
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
6666
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
67-
github.com/metal3-io/ip-address-manager/api v1.10.2 h1:CEGy7DjrrUWbsZ3SIT+B3ioMHFaauUxwliLAVVQKfio=
68-
github.com/metal3-io/ip-address-manager/api v1.10.2/go.mod h1:vDfNFQDJQKRK49pF8XoEoGMh2SkMzMN0JeIYahiHvY8=
67+
github.com/metal3-io/ip-address-manager/api v1.10.3 h1:kDAEzOAa9Zcwn5pewcxIX66oo6jt1+0/x7w75tIKzP4=
68+
github.com/metal3-io/ip-address-manager/api v1.10.3/go.mod h1:k1O3LHaTZ6WAXjgciku+Ro3PDWaN/z5P01n7bWlqotA=
6969
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
7070
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
7171
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ go 1.23.7
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.10.3
8+
github.com/metal3-io/baremetal-operator/apis v0.10.4
99
github.com/metal3-io/cluster-api-provider-metal3/api v0.0.0
10-
github.com/metal3-io/ip-address-manager/api v1.10.2
10+
github.com/metal3-io/ip-address-manager/api v1.10.3
1111
github.com/onsi/ginkgo/v2 v2.23.4
1212
github.com/onsi/gomega v1.37.0
1313
github.com/pkg/errors v0.9.1

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,12 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
129129
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
130130
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
131131
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
132-
github.com/metal3-io/baremetal-operator/apis v0.10.3 h1:DytMgx6dBEXpJlXXYumunLLo8N1Bco3PXHAEGHlGY3s=
133-
github.com/metal3-io/baremetal-operator/apis v0.10.3/go.mod h1:YGKMWs4FhNzjZedAwISM2MBg+5sv68c+arkKQ4AHJ0Y=
132+
github.com/metal3-io/baremetal-operator/apis v0.10.4 h1:dO/QS3osAv/BS3IpYxHCdH94GpHVghYpCEH7weEk1zY=
133+
github.com/metal3-io/baremetal-operator/apis v0.10.4/go.mod h1:8So7kek+BAsxNd/xV0ZDH0qDF/ROVXMrwjRhafxpiqI=
134134
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.10.3 h1:HmJYQWy5OYR2iwFUPCK1OP5KuX2/NUPmpuXoMuFIJJ8=
135135
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.10.3/go.mod h1:f1a/eqi7MA+mf1xFshToVfn02jcPDMw3aYQinLTlMVQ=
136-
github.com/metal3-io/ip-address-manager/api v1.10.2 h1:CEGy7DjrrUWbsZ3SIT+B3ioMHFaauUxwliLAVVQKfio=
137-
github.com/metal3-io/ip-address-manager/api v1.10.2/go.mod h1:vDfNFQDJQKRK49pF8XoEoGMh2SkMzMN0JeIYahiHvY8=
136+
github.com/metal3-io/ip-address-manager/api v1.10.3 h1:kDAEzOAa9Zcwn5pewcxIX66oo6jt1+0/x7w75tIKzP4=
137+
github.com/metal3-io/ip-address-manager/api v1.10.3/go.mod h1:k1O3LHaTZ6WAXjgciku+Ro3PDWaN/z5P01n7bWlqotA=
138138
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
139139
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
140140
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=

test/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ require (
66
github.com/blang/semver v3.5.1+incompatible
77
github.com/docker/docker v28.1.1+incompatible
88
github.com/jinzhu/copier v0.4.0
9-
github.com/metal3-io/baremetal-operator/apis v0.10.3
9+
github.com/metal3-io/baremetal-operator/apis v0.10.4
1010
github.com/metal3-io/cluster-api-provider-metal3/api v0.0.0
11-
github.com/metal3-io/ip-address-manager/api v1.10.2
11+
github.com/metal3-io/ip-address-manager/api v1.10.3
1212
github.com/metal3-io/ironic-standalone-operator/api v0.0.0-20250402103806-d91a8f698be5
1313
github.com/onsi/ginkgo/v2 v2.23.4
1414
github.com/onsi/gomega v1.37.0

test/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,12 +177,12 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D
177177
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
178178
github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
179179
github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
180-
github.com/metal3-io/baremetal-operator/apis v0.10.3 h1:DytMgx6dBEXpJlXXYumunLLo8N1Bco3PXHAEGHlGY3s=
181-
github.com/metal3-io/baremetal-operator/apis v0.10.3/go.mod h1:YGKMWs4FhNzjZedAwISM2MBg+5sv68c+arkKQ4AHJ0Y=
180+
github.com/metal3-io/baremetal-operator/apis v0.10.4 h1:dO/QS3osAv/BS3IpYxHCdH94GpHVghYpCEH7weEk1zY=
181+
github.com/metal3-io/baremetal-operator/apis v0.10.4/go.mod h1:8So7kek+BAsxNd/xV0ZDH0qDF/ROVXMrwjRhafxpiqI=
182182
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.10.3 h1:HmJYQWy5OYR2iwFUPCK1OP5KuX2/NUPmpuXoMuFIJJ8=
183183
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.10.3/go.mod h1:f1a/eqi7MA+mf1xFshToVfn02jcPDMw3aYQinLTlMVQ=
184-
github.com/metal3-io/ip-address-manager/api v1.10.2 h1:CEGy7DjrrUWbsZ3SIT+B3ioMHFaauUxwliLAVVQKfio=
185-
github.com/metal3-io/ip-address-manager/api v1.10.2/go.mod h1:vDfNFQDJQKRK49pF8XoEoGMh2SkMzMN0JeIYahiHvY8=
184+
github.com/metal3-io/ip-address-manager/api v1.10.3 h1:kDAEzOAa9Zcwn5pewcxIX66oo6jt1+0/x7w75tIKzP4=
185+
github.com/metal3-io/ip-address-manager/api v1.10.3/go.mod h1:k1O3LHaTZ6WAXjgciku+Ro3PDWaN/z5P01n7bWlqotA=
186186
github.com/metal3-io/ironic-standalone-operator/api v0.0.0-20250402103806-d91a8f698be5 h1:NeCn+cnTNE2moBj+xK9J5zi9OGPVDakh4Dl8VinrYkw=
187187
github.com/metal3-io/ironic-standalone-operator/api v0.0.0-20250402103806-d91a8f698be5/go.mod h1:OeNr5HCWyFYZPlgsLqsi5/Yc/lnX8frETljrpvMJi6c=
188188
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=

0 commit comments

Comments
 (0)