From 798d280bcdd9537213f490028ab85f1ce2698d92 Mon Sep 17 00:00:00 2001 From: Muhammad Adil Ghaffar Date: Thu, 19 Dec 2024 07:45:08 +0200 Subject: [PATCH] Bump BMO to v0.9.0 and IPAM to v1.9.1 Signed-off-by: Muhammad Adil Ghaffar --- api/go.mod | 4 ++-- api/go.sum | 4 ++-- config/ipam/image_patch.yaml | 2 +- config/ipam/kustomization.yaml | 2 +- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- hack/fake-apiserver/go.mod | 4 ++-- hack/fake-apiserver/go.sum | 8 ++++---- test/go.mod | 6 +++--- test/go.sum | 15 ++++++++------- 10 files changed, 35 insertions(+), 34 deletions(-) diff --git a/api/go.mod b/api/go.mod index 010706ac5f..ff85387453 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,9 +1,9 @@ module github.com/metal3-io/cluster-api-provider-metal3/api -go 1.22.3 +go 1.22.8 require ( - github.com/metal3-io/ip-address-manager/api v1.9.0-beta.0 + github.com/metal3-io/ip-address-manager/api v1.9.1 github.com/onsi/gomega v1.36.1 github.com/pkg/errors v0.9.1 golang.org/x/net v0.32.0 diff --git a/api/go.sum b/api/go.sum index 7fa5ddb987..ae5055cf97 100644 --- a/api/go.sum +++ b/api/go.sum @@ -63,8 +63,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/metal3-io/ip-address-manager/api v1.9.0-beta.0 h1:alRPtYhR26kV7WGiSL5Etn6enlVKlowkxoZWijWxJLg= -github.com/metal3-io/ip-address-manager/api v1.9.0-beta.0/go.mod h1:3GALQa62DD0xmToa1LzBY0nnrpqGNdqyHzCNAlPis/0= +github.com/metal3-io/ip-address-manager/api v1.9.1 h1:V0wLEzMKxGzAPSkEaIhRgjQr1Zo+Odoh302hc8yjB0I= +github.com/metal3-io/ip-address-manager/api v1.9.1/go.mod h1:NDtwzQKFb2gCWMyQkfSpqbB5LLKfwXz2/xA12um03Ro= 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= diff --git a/config/ipam/image_patch.yaml b/config/ipam/image_patch.yaml index 065b345e55..e572ca8033 100644 --- a/config/ipam/image_patch.yaml +++ b/config/ipam/image_patch.yaml @@ -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.9.0-beta.0 + - image: quay.io/metal3-io/ip-address-manager:v1.9.1 name: manager diff --git a/config/ipam/kustomization.yaml b/config/ipam/kustomization.yaml index 066e37f3b1..cc228d152e 100644 --- a/config/ipam/kustomization.yaml +++ b/config/ipam/kustomization.yaml @@ -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.9.0-beta.0/ipam-components.yaml +- https://github.com/metal3-io/ip-address-manager/releases/download/v1.9.1/ipam-components.yaml patches: - path: image_patch.yaml diff --git a/go.mod b/go.mod index 092f040780..e2a60932e5 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ module github.com/metal3-io/cluster-api-provider-metal3 -go 1.22.3 +go 1.22.8 require ( github.com/go-logr/logr v1.4.2 github.com/golang/mock v1.6.0 - github.com/metal3-io/baremetal-operator/apis v0.8.0 + github.com/metal3-io/baremetal-operator/apis v0.9.0 github.com/metal3-io/cluster-api-provider-metal3/api v0.0.0 - github.com/metal3-io/ip-address-manager/api v1.9.0-beta.0 + github.com/metal3-io/ip-address-manager/api v1.9.1 github.com/onsi/ginkgo/v2 v2.22.0 github.com/onsi/gomega v1.36.1 github.com/pkg/errors v0.9.1 @@ -63,7 +63,7 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/mailru/easyjson v0.7.7 // indirect - github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.8.0 // indirect + github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.9.0 // 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 diff --git a/go.sum b/go.sum index 47f74abb56..7ec18d7379 100644 --- a/go.sum +++ b/go.sum @@ -130,12 +130,12 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/metal3-io/baremetal-operator/apis v0.8.0 h1:dy1Z6IRdlRi8tsEww8M3CmOayWZE0yb+xJdNx065FJA= -github.com/metal3-io/baremetal-operator/apis v0.8.0/go.mod h1:eeCH0K7XD17AbEp479XtmYTF0QwOqNkoTCQf3bdZSzk= -github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.8.0 h1:EOm8LnMRFANRM+xiiDTNpwjITK6g9xyNwLlzFo1aplw= -github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.8.0/go.mod h1:f1a/eqi7MA+mf1xFshToVfn02jcPDMw3aYQinLTlMVQ= -github.com/metal3-io/ip-address-manager/api v1.9.0-beta.0 h1:alRPtYhR26kV7WGiSL5Etn6enlVKlowkxoZWijWxJLg= -github.com/metal3-io/ip-address-manager/api v1.9.0-beta.0/go.mod h1:3GALQa62DD0xmToa1LzBY0nnrpqGNdqyHzCNAlPis/0= +github.com/metal3-io/baremetal-operator/apis v0.9.0 h1:D/2II9H4/+ldz5JO+zufBO5VqYjhrJlg89dFgWMKdoE= +github.com/metal3-io/baremetal-operator/apis v0.9.0/go.mod h1:gNPRYPdH/IjTHkmdyFWNLlpWvT+hyfjHH+9CEkdLcWY= +github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.9.0 h1:4xilUV03Z2OPs2QzGQvm/rg1+ptROc2f0pZg+nzNsRA= +github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.9.0/go.mod h1:f1a/eqi7MA+mf1xFshToVfn02jcPDMw3aYQinLTlMVQ= +github.com/metal3-io/ip-address-manager/api v1.9.1 h1:V0wLEzMKxGzAPSkEaIhRgjQr1Zo+Odoh302hc8yjB0I= +github.com/metal3-io/ip-address-manager/api v1.9.1/go.mod h1:NDtwzQKFb2gCWMyQkfSpqbB5LLKfwXz2/xA12um03Ro= 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= @@ -191,8 +191,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE= github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= diff --git a/hack/fake-apiserver/go.mod b/hack/fake-apiserver/go.mod index c267d6fbc5..fd6484f573 100644 --- a/hack/fake-apiserver/go.mod +++ b/hack/fake-apiserver/go.mod @@ -1,9 +1,9 @@ module github.com/metal3-io/cluster-api-provider-metal3/hack/fake-apiserver -go 1.22.3 +go 1.22.8 require ( - github.com/metal3-io/baremetal-operator/apis v0.8.0 + github.com/metal3-io/baremetal-operator/apis v0.9.0 github.com/metal3-io/cluster-api-provider-metal3/api v1.8.3 go.uber.org/zap v1.27.0 k8s.io/api v0.31.4 diff --git a/hack/fake-apiserver/go.sum b/hack/fake-apiserver/go.sum index a5c079d230..4a2a14193f 100644 --- a/hack/fake-apiserver/go.sum +++ b/hack/fake-apiserver/go.sum @@ -110,8 +110,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/metal3-io/baremetal-operator/apis v0.8.0 h1:dy1Z6IRdlRi8tsEww8M3CmOayWZE0yb+xJdNx065FJA= -github.com/metal3-io/baremetal-operator/apis v0.8.0/go.mod h1:eeCH0K7XD17AbEp479XtmYTF0QwOqNkoTCQf3bdZSzk= +github.com/metal3-io/baremetal-operator/apis v0.9.0 h1:D/2II9H4/+ldz5JO+zufBO5VqYjhrJlg89dFgWMKdoE= +github.com/metal3-io/baremetal-operator/apis v0.9.0/go.mod h1:gNPRYPdH/IjTHkmdyFWNLlpWvT+hyfjHH+9CEkdLcWY= github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 h1:X0+MWsJ+Gj/TAkmhGybvesvxk6zQKu3NQXzvC6l0iJs= github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1/go.mod h1:399nvdaqoU9rTI25UdFw2EWcVjmJPpeZPIhfDAIx/XU= github.com/metal3-io/cluster-api-provider-metal3/api v1.8.3 h1:oxkydLZmarGBY/v9tdTUst2Lwcn406XUCUP2qBsVM0c= @@ -167,8 +167,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE= github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= diff --git a/test/go.mod b/test/go.mod index 089cc4a352..1f9fc7c6ca 100644 --- a/test/go.mod +++ b/test/go.mod @@ -6,9 +6,9 @@ require ( github.com/blang/semver v3.5.1+incompatible github.com/docker/docker v27.3.1+incompatible github.com/jinzhu/copier v0.4.0 - github.com/metal3-io/baremetal-operator/apis v0.8.0 + github.com/metal3-io/baremetal-operator/apis v0.9.0 github.com/metal3-io/cluster-api-provider-metal3/api v0.0.0 - github.com/metal3-io/ip-address-manager/api v1.9.0-beta.0 + github.com/metal3-io/ip-address-manager/api v1.9.1 github.com/onsi/ginkgo/v2 v2.22.0 github.com/onsi/gomega v1.36.1 github.com/pkg/errors v0.9.1 @@ -96,7 +96,7 @@ require ( github.com/magiconair/properties v1.8.7 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.8.0 // indirect + github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.9.0 // 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 diff --git a/test/go.sum b/test/go.sum index 36d1242206..ad2617e977 100644 --- a/test/go.sum +++ b/test/go.sum @@ -172,12 +172,12 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/metal3-io/baremetal-operator/apis v0.8.0 h1:dy1Z6IRdlRi8tsEww8M3CmOayWZE0yb+xJdNx065FJA= -github.com/metal3-io/baremetal-operator/apis v0.8.0/go.mod h1:eeCH0K7XD17AbEp479XtmYTF0QwOqNkoTCQf3bdZSzk= -github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.8.0 h1:EOm8LnMRFANRM+xiiDTNpwjITK6g9xyNwLlzFo1aplw= -github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.8.0/go.mod h1:f1a/eqi7MA+mf1xFshToVfn02jcPDMw3aYQinLTlMVQ= -github.com/metal3-io/ip-address-manager/api v1.9.0-beta.0 h1:alRPtYhR26kV7WGiSL5Etn6enlVKlowkxoZWijWxJLg= -github.com/metal3-io/ip-address-manager/api v1.9.0-beta.0/go.mod h1:3GALQa62DD0xmToa1LzBY0nnrpqGNdqyHzCNAlPis/0= +github.com/metal3-io/baremetal-operator/apis v0.9.0 h1:D/2II9H4/+ldz5JO+zufBO5VqYjhrJlg89dFgWMKdoE= +github.com/metal3-io/baremetal-operator/apis v0.9.0/go.mod h1:gNPRYPdH/IjTHkmdyFWNLlpWvT+hyfjHH+9CEkdLcWY= +github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.9.0 h1:4xilUV03Z2OPs2QzGQvm/rg1+ptROc2f0pZg+nzNsRA= +github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.9.0/go.mod h1:f1a/eqi7MA+mf1xFshToVfn02jcPDMw3aYQinLTlMVQ= +github.com/metal3-io/ip-address-manager/api v1.9.1 h1:V0wLEzMKxGzAPSkEaIhRgjQr1Zo+Odoh302hc8yjB0I= +github.com/metal3-io/ip-address-manager/api v1.9.1/go.mod h1:NDtwzQKFb2gCWMyQkfSpqbB5LLKfwXz2/xA12um03Ro= 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/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= @@ -265,8 +265,9 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXVQ=