Skip to content

Commit

Permalink
Merge pull request #2186 from Nordix/mquhuy/uplift-bmo-ipam
Browse files Browse the repository at this point in the history 
🌱 Uplift BMO to v0.6.3 and IPAM to v1.7.4
  • Loading branch information
@metal3-io-bot
metal3-io-bot authored Dec 20, 2024
2 parents 5de8555 + 9c6f613 commit 2eb1bd1
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion api/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/metal3-io/cluster-api-provider-metal3/api
go 1.22

require (
github.com/metal3-io/ip-address-manager/api v1.7.3
github.com/metal3-io/ip-address-manager/api v1.7.4
github.com/onsi/gomega v1.33.1
github.com/pkg/errors v0.9.1
golang.org/x/net v0.24.0
Expand Down
4 changes: 2 additions & 2 deletions api/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
github.com/metal3-io/ip-address-manager/api v1.7.3 h1:RzvwafurmlJm7zYxXG8EApi7ZJOGf38YFzEellUNWgQ=
github.com/metal3-io/ip-address-manager/api v1.7.3/go.mod h1:Dv2QBcHQrQEuYJowGIW30ZvDGyco/20HmP9mYj5tZow=
github.com/metal3-io/ip-address-manager/api v1.7.4 h1:SKfjySRsoj+S2BOy0y28AL+rUlnLtVH0xnOJ4Ejjibs=
github.com/metal3-io/ip-address-manager/api v1.7.4/go.mod h1:Dv2QBcHQrQEuYJowGIW30ZvDGyco/20HmP9mYj5tZow=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
Expand Down
2 changes: 1 addition & 1 deletion config/ipam/image_patch.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ spec:
spec:
containers:
# Change the value of image field below to your controller image URL
- image: quay.io/metal3-io/ip-address-manager:v1.7.3
- image: quay.io/metal3-io/ip-address-manager:v1.7.4
name: manager
2 changes: 1 addition & 1 deletion config/ipam/kustomization.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Kustomization

# When updating the release, update also the image tag in image_patch.yaml
resources:
- /~https://github.com/metal3-io/ip-address-manager/releases/download/v1.7.3/ipam-components.yaml
- /~https://github.com/metal3-io/ip-address-manager/releases/download/v1.7.4/ipam-components.yaml

patchesStrategicMerge:
- image_patch.yaml
Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ go 1.22
require (
github.com/go-logr/logr v1.4.2
github.com/golang/mock v1.6.0
github.com/metal3-io/baremetal-operator/apis v0.6.2
github.com/metal3-io/baremetal-operator/apis v0.6.3
github.com/metal3-io/cluster-api-provider-metal3/api v0.0.0
github.com/metal3-io/ip-address-manager/api v1.7.3
github.com/metal3-io/ip-address-manager/api v1.7.4
github.com/onsi/ginkgo/v2 v2.17.3
github.com/onsi/gomega v1.33.1
github.com/pkg/errors v0.9.1
Expand Down Expand Up @@ -63,7 +63,7 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.6.2 // indirect
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.6.3 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,12 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
github.com/metal3-io/baremetal-operator/apis v0.6.2 h1:/szSfHXW9+ocxy61J+54VIHsGeOFI9T9JHKdFfjR3jI=
github.com/metal3-io/baremetal-operator/apis v0.6.2/go.mod h1:zj6oG+P54XKkrBc6FdZEpLoJi0MykYWIqp7r7FB0F3k=
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.6.2 h1:OubzMDH7R7wv+g4z53lN23c2azSCgmAUiUIzLyAjEy0=
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.6.2/go.mod h1:wdkQoDe+Kmien7xXRIUufMeX4FGGpciSLi05kcf+Ig4=
github.com/metal3-io/ip-address-manager/api v1.7.3 h1:RzvwafurmlJm7zYxXG8EApi7ZJOGf38YFzEellUNWgQ=
github.com/metal3-io/ip-address-manager/api v1.7.3/go.mod h1:Dv2QBcHQrQEuYJowGIW30ZvDGyco/20HmP9mYj5tZow=
github.com/metal3-io/baremetal-operator/apis v0.6.3 h1:0HB0Nkz3PZFf1An9MxqyOfjgBztzihTSb4j3EPt8j88=
github.com/metal3-io/baremetal-operator/apis v0.6.3/go.mod h1:G7ZbZqrASbIDpHXB2Zu3KaCNaRasnB/sOt6ewgDSrMA=
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.6.3 h1:KOKNNJer6qL7Tdz+RM3bkRli+yihMplcZASn6xkucVg=
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.6.3/go.mod h1:wdkQoDe+Kmien7xXRIUufMeX4FGGpciSLi05kcf+Ig4=
github.com/metal3-io/ip-address-manager/api v1.7.4 h1:SKfjySRsoj+S2BOy0y28AL+rUlnLtVH0xnOJ4Ejjibs=
github.com/metal3-io/ip-address-manager/api v1.7.4/go.mod h1:Dv2QBcHQrQEuYJowGIW30ZvDGyco/20HmP9mYj5tZow=
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
Expand Down
6 changes: 3 additions & 3 deletions test/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ require (
github.com/blang/semver v3.5.1+incompatible
github.com/docker/docker v26.1.5+incompatible
github.com/jinzhu/copier v0.4.0
github.com/metal3-io/baremetal-operator/apis v0.6.2
github.com/metal3-io/baremetal-operator/apis v0.6.3
github.com/metal3-io/cluster-api-provider-metal3/api v0.0.0
github.com/metal3-io/ip-address-manager/api v1.7.3
github.com/metal3-io/ip-address-manager/api v1.7.4
github.com/onsi/ginkgo/v2 v2.17.3
github.com/onsi/gomega v1.33.1
github.com/pkg/errors v0.9.1
Expand Down Expand Up @@ -84,7 +84,7 @@ require (
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.6.2 // indirect
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.6.3 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
Expand Down
12 changes: 6 additions & 6 deletions test/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,12 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
github.com/metal3-io/baremetal-operator/apis v0.6.2 h1:/szSfHXW9+ocxy61J+54VIHsGeOFI9T9JHKdFfjR3jI=
github.com/metal3-io/baremetal-operator/apis v0.6.2/go.mod h1:zj6oG+P54XKkrBc6FdZEpLoJi0MykYWIqp7r7FB0F3k=
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.6.2 h1:OubzMDH7R7wv+g4z53lN23c2azSCgmAUiUIzLyAjEy0=
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.6.2/go.mod h1:wdkQoDe+Kmien7xXRIUufMeX4FGGpciSLi05kcf+Ig4=
github.com/metal3-io/ip-address-manager/api v1.7.3 h1:RzvwafurmlJm7zYxXG8EApi7ZJOGf38YFzEellUNWgQ=
github.com/metal3-io/ip-address-manager/api v1.7.3/go.mod h1:Dv2QBcHQrQEuYJowGIW30ZvDGyco/20HmP9mYj5tZow=
github.com/metal3-io/baremetal-operator/apis v0.6.3 h1:0HB0Nkz3PZFf1An9MxqyOfjgBztzihTSb4j3EPt8j88=
github.com/metal3-io/baremetal-operator/apis v0.6.3/go.mod h1:G7ZbZqrASbIDpHXB2Zu3KaCNaRasnB/sOt6ewgDSrMA=
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.6.3 h1:KOKNNJer6qL7Tdz+RM3bkRli+yihMplcZASn6xkucVg=
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.6.3/go.mod h1:wdkQoDe+Kmien7xXRIUufMeX4FGGpciSLi05kcf+Ig4=
github.com/metal3-io/ip-address-manager/api v1.7.4 h1:SKfjySRsoj+S2BOy0y28AL+rUlnLtVH0xnOJ4Ejjibs=
github.com/metal3-io/ip-address-manager/api v1.7.4/go.mod h1:Dv2QBcHQrQEuYJowGIW30ZvDGyco/20HmP9mYj5tZow=
github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
Expand Down

0 comments on commit 2eb1bd1

Please sign in to comment.