Skip to content

Commit 500af56

Browse files
metal3-io-botmetal3-io-bot
authored
Merge pull request #1500 from Nordix/uplift-ipam-1-6-2-moshiur
🌱 Uplift IPAM to v1.6.2 and BMO to v0.5.1
2 parents b39dd30 + cb63072 commit 500af56

File tree

8 files changed

+23
-23
lines changed

8 files changed

+23
-23
lines changed

‎api/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.20
44

55
require (
66
github.com/google/gofuzz v1.2.0
7-
github.com/metal3-io/ip-address-manager/api v1.6.1
7+
github.com/metal3-io/ip-address-manager/api v1.6.2
88
github.com/onsi/gomega v1.30.0
99
github.com/pkg/errors v0.9.1
1010
golang.org/x/net v0.19.0

‎api/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0
6868
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
6969
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
7070
github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
71-
github.com/metal3-io/ip-address-manager/api v1.6.1 h1:mvoFX52/jRsVYgcP9c9/YPDGh8K0j7OZHEni0zR7llg=
72-
github.com/metal3-io/ip-address-manager/api v1.6.1/go.mod h1:vf+6KPKpmzOIdR62WJ9u6ck7PT6oUUIPyjcGRvmjpBU=
71+
github.com/metal3-io/ip-address-manager/api v1.6.2 h1:YPndsZoqYBFlMYQWjbB5DkrRSr0Jr1gZthx0H0xCoEA=
72+
github.com/metal3-io/ip-address-manager/api v1.6.2/go.mod h1:vf+6KPKpmzOIdR62WJ9u6ck7PT6oUUIPyjcGRvmjpBU=
7373
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
7474
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
7575
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

‎config/ipam/image_patch.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ spec:
88
spec:
99
containers:
1010
# Change the value of image field below to your controller image URL
11-
- image: quay.io/metal3-io/ip-address-manager:v1.6.1
11+
- image: quay.io/metal3-io/ip-address-manager:v1.6.2
1212
name: manager

‎config/ipam/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Kustomization
33

44
# When updating the release, update also the image tag in image_patch.yaml
55
resources:
6-
- https://github.com/metal3-io/ip-address-manager/releases/download/v1.6.1/ipam-components.yaml
6+
- https://github.com/metal3-io/ip-address-manager/releases/download/v1.6.2/ipam-components.yaml
77

88
patchesStrategicMerge:
99
- image_patch.yaml

‎go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ go 1.20
55
require (
66
github.com/go-logr/logr v1.3.0
77
github.com/golang/mock v1.6.0
8-
github.com/metal3-io/baremetal-operator/apis v0.5.0
8+
github.com/metal3-io/baremetal-operator/apis v0.5.1
99
github.com/metal3-io/cluster-api-provider-metal3/api v0.0.0
10-
github.com/metal3-io/ip-address-manager/api v1.6.1
10+
github.com/metal3-io/ip-address-manager/api v1.6.2
1111
github.com/onsi/ginkgo/v2 v2.13.2
1212
github.com/onsi/gomega v1.30.0
1313
github.com/pkg/errors v0.9.1
@@ -67,7 +67,7 @@ require (
6767
github.com/json-iterator/go v1.1.12 // indirect
6868
github.com/mailru/easyjson v0.7.7 // indirect
6969
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
70-
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.0 // indirect
70+
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 // indirect
7171
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7272
github.com/modern-go/reflect2 v1.0.2 // indirect
7373
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect

‎go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,12 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0
130130
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
131131
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
132132
github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
133-
github.com/metal3-io/baremetal-operator/apis v0.5.0 h1:IRaKMxRCkYfFAjvZdDyGC6bIaGQsV6MMNmGV8gqyYCc=
134-
github.com/metal3-io/baremetal-operator/apis v0.5.0/go.mod h1:rjpH/E7MB7JWt/LPi6hDd5LpaBIiqaBnm3KtFjKxnUM=
135-
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.0 h1:oRkQOlTxcRJsHFM2jkXzOPAkg/REnLEd15GxJTN27Nk=
136-
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.0/go.mod h1:399nvdaqoU9rTI25UdFw2EWcVjmJPpeZPIhfDAIx/XU=
137-
github.com/metal3-io/ip-address-manager/api v1.6.1 h1:mvoFX52/jRsVYgcP9c9/YPDGh8K0j7OZHEni0zR7llg=
138-
github.com/metal3-io/ip-address-manager/api v1.6.1/go.mod h1:vf+6KPKpmzOIdR62WJ9u6ck7PT6oUUIPyjcGRvmjpBU=
133+
github.com/metal3-io/baremetal-operator/apis v0.5.1 h1:l6VCuM2nSYMsdir3mocXvF80F7HnTXVZ7NNIoMEYbio=
134+
github.com/metal3-io/baremetal-operator/apis v0.5.1/go.mod h1:Q3MHes59mRabjHM6ARoHfgd2uXUjJIytl3/uflzhyew=
135+
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 h1:X0+MWsJ+Gj/TAkmhGybvesvxk6zQKu3NQXzvC6l0iJs=
136+
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1/go.mod h1:399nvdaqoU9rTI25UdFw2EWcVjmJPpeZPIhfDAIx/XU=
137+
github.com/metal3-io/ip-address-manager/api v1.6.2 h1:YPndsZoqYBFlMYQWjbB5DkrRSr0Jr1gZthx0H0xCoEA=
138+
github.com/metal3-io/ip-address-manager/api v1.6.2/go.mod h1:vf+6KPKpmzOIdR62WJ9u6ck7PT6oUUIPyjcGRvmjpBU=
139139
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
140140
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
141141
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

‎test/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ go 1.20
55
require (
66
github.com/docker/docker v24.0.7+incompatible
77
github.com/jinzhu/copier v0.4.0
8-
github.com/metal3-io/baremetal-operator/apis v0.5.0
8+
github.com/metal3-io/baremetal-operator/apis v0.5.1
99
github.com/metal3-io/cluster-api-provider-metal3/api v0.0.0
10-
github.com/metal3-io/ip-address-manager/api v1.6.1
10+
github.com/metal3-io/ip-address-manager/api v1.6.2
1111
github.com/onsi/ginkgo/v2 v2.13.2
1212
github.com/onsi/gomega v1.30.0
1313
golang.org/x/crypto v0.17.0
@@ -79,7 +79,7 @@ require (
7979
github.com/mailru/easyjson v0.7.7 // indirect
8080
github.com/mattn/go-isatty v0.0.20 // indirect
8181
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
82-
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.0 // indirect
82+
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 // indirect
8383
github.com/mitchellh/copystructure v1.2.0 // indirect
8484
github.com/mitchellh/mapstructure v1.5.0 // indirect
8585
github.com/mitchellh/reflectwalk v1.0.2 // indirect

‎test/go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -261,12 +261,12 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
261261
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
262262
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
263263
github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
264-
github.com/metal3-io/baremetal-operator/apis v0.5.0 h1:IRaKMxRCkYfFAjvZdDyGC6bIaGQsV6MMNmGV8gqyYCc=
265-
github.com/metal3-io/baremetal-operator/apis v0.5.0/go.mod h1:rjpH/E7MB7JWt/LPi6hDd5LpaBIiqaBnm3KtFjKxnUM=
266-
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.0 h1:oRkQOlTxcRJsHFM2jkXzOPAkg/REnLEd15GxJTN27Nk=
267-
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.0/go.mod h1:399nvdaqoU9rTI25UdFw2EWcVjmJPpeZPIhfDAIx/XU=
268-
github.com/metal3-io/ip-address-manager/api v1.6.1 h1:mvoFX52/jRsVYgcP9c9/YPDGh8K0j7OZHEni0zR7llg=
269-
github.com/metal3-io/ip-address-manager/api v1.6.1/go.mod h1:vf+6KPKpmzOIdR62WJ9u6ck7PT6oUUIPyjcGRvmjpBU=
264+
github.com/metal3-io/baremetal-operator/apis v0.5.1 h1:l6VCuM2nSYMsdir3mocXvF80F7HnTXVZ7NNIoMEYbio=
265+
github.com/metal3-io/baremetal-operator/apis v0.5.1/go.mod h1:Q3MHes59mRabjHM6ARoHfgd2uXUjJIytl3/uflzhyew=
266+
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 h1:X0+MWsJ+Gj/TAkmhGybvesvxk6zQKu3NQXzvC6l0iJs=
267+
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1/go.mod h1:399nvdaqoU9rTI25UdFw2EWcVjmJPpeZPIhfDAIx/XU=
268+
github.com/metal3-io/ip-address-manager/api v1.6.2 h1:YPndsZoqYBFlMYQWjbB5DkrRSr0Jr1gZthx0H0xCoEA=
269+
github.com/metal3-io/ip-address-manager/api v1.6.2/go.mod h1:vf+6KPKpmzOIdR62WJ9u6ck7PT6oUUIPyjcGRvmjpBU=
270270
github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
271271
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
272272
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=

0 commit comments

Comments
 (0)