Skip to content

Commit

Permalink
Merge pull request #1340 from Nordix/uplift-ipam-bmo/moshiur
Browse files Browse the repository at this point in the history 
🌱Uplift IPAM and BMO patch in release-1.5
  • Loading branch information
@metal3-io-bot
metal3-io-bot authored Nov 23, 2023
2 parents 8ab21ab + d2882a0 commit 8c64223
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 @@ -4,7 +4,7 @@ go 1.20

require (
github.com/google/gofuzz v1.2.0
github.com/metal3-io/ip-address-manager/api v1.5.1
github.com/metal3-io/ip-address-manager/api v1.5.2
github.com/onsi/gomega v1.27.10
github.com/pkg/errors v0.9.1
golang.org/x/net v0.17.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 @@ -111,8 +111,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 v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/metal3-io/ip-address-manager/api v1.5.1 h1:uQXvLLFjyn24ptYNYyPDUv3tw9pyCkxyaAemcEviE3I=
github.com/metal3-io/ip-address-manager/api v1.5.1/go.mod h1:YurMpoFyB1ov6SN8ElELmvPpTNdKlZsPZ6p0/VfUWkM=
github.com/metal3-io/ip-address-manager/api v1.5.2 h1:i5uMlbhrn65UB5OlFmAamKTDzYnKgVqEeZiCqMLr8ys=
github.com/metal3-io/ip-address-manager/api v1.5.2/go.mod h1:C6kV0vU0AVUVAFtA2bdsHYXhuyG+OSwIotBLIMidwaM=
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.5.1
- image: quay.io/metal3-io/ip-address-manager:v1.5.2
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.5.1/ipam-components.yaml
- https://github.com/metal3-io/ip-address-manager/releases/download/v1.5.2/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.20
require (
github.com/go-logr/logr v1.2.4
github.com/golang/mock v1.6.0
github.com/metal3-io/baremetal-operator/apis v0.4.0
github.com/metal3-io/baremetal-operator/apis v0.4.1
github.com/metal3-io/cluster-api-provider-metal3/api v0.0.0
github.com/metal3-io/ip-address-manager/api v1.5.1
github.com/metal3-io/ip-address-manager/api v1.5.2
github.com/onsi/ginkgo/v2 v2.12.0
github.com/onsi/gomega v1.27.10
github.com/pkg/errors v0.9.1
Expand Down Expand Up @@ -60,7 +60,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 v1.0.4 // indirect
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.4.0 // indirect
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.4.1 // 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 @@ -231,12 +231,12 @@ github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/metal3-io/baremetal-operator/apis v0.4.0 h1:1g5S3SKu9FqeD7OIf5jGKS6234HjNQpIRmfepZnSmiQ=
github.com/metal3-io/baremetal-operator/apis v0.4.0/go.mod h1:1GDBiA3XqdP63dLZHJ1JH5fRJrfjn7pshoPEd9jwY7Q=
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.4.0 h1:AnA8XLLp3RKYjjlB4KI0fyPSDN/d5gb3ZtM2cVyxwOc=
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.4.0/go.mod h1:399nvdaqoU9rTI25UdFw2EWcVjmJPpeZPIhfDAIx/XU=
github.com/metal3-io/ip-address-manager/api v1.5.1 h1:uQXvLLFjyn24ptYNYyPDUv3tw9pyCkxyaAemcEviE3I=
github.com/metal3-io/ip-address-manager/api v1.5.1/go.mod h1:YurMpoFyB1ov6SN8ElELmvPpTNdKlZsPZ6p0/VfUWkM=
github.com/metal3-io/baremetal-operator/apis v0.4.1 h1:xQFVJMG/boVuHQo3gN3lB+kfbUzbr7WkQEuK+iUVLr0=
github.com/metal3-io/baremetal-operator/apis v0.4.1/go.mod h1:37iKpPXuy1hHhCKPmOiYU9tvEF5oxSzjNOXpXBbzwQE=
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.4.1 h1:jTS7wUf8o+SSHqpZOIF5B+1IGHutL4NUIVKd0jNchuY=
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.4.1/go.mod h1:399nvdaqoU9rTI25UdFw2EWcVjmJPpeZPIhfDAIx/XU=
github.com/metal3-io/ip-address-manager/api v1.5.2 h1:i5uMlbhrn65UB5OlFmAamKTDzYnKgVqEeZiCqMLr8ys=
github.com/metal3-io/ip-address-manager/api v1.5.2/go.mod h1:C6kV0vU0AVUVAFtA2bdsHYXhuyG+OSwIotBLIMidwaM=
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
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 @@ -5,9 +5,9 @@ go 1.20
require (
github.com/docker/docker v24.0.7+incompatible
github.com/jinzhu/copier v0.4.0
github.com/metal3-io/baremetal-operator/apis v0.4.0
github.com/metal3-io/baremetal-operator/apis v0.4.1
github.com/metal3-io/cluster-api-provider-metal3/api v0.0.0
github.com/metal3-io/ip-address-manager/api v1.5.1
github.com/metal3-io/ip-address-manager/api v1.5.2
github.com/onsi/ginkgo/v2 v2.12.0
github.com/onsi/gomega v1.27.10
golang.org/x/crypto v0.14.0
Expand Down Expand Up @@ -77,7 +77,7 @@ require (
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.4.0 // indirect
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.4.1 // 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 @@ -327,12 +327,12 @@ github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/metal3-io/baremetal-operator/apis v0.4.0 h1:1g5S3SKu9FqeD7OIf5jGKS6234HjNQpIRmfepZnSmiQ=
github.com/metal3-io/baremetal-operator/apis v0.4.0/go.mod h1:1GDBiA3XqdP63dLZHJ1JH5fRJrfjn7pshoPEd9jwY7Q=
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.4.0 h1:AnA8XLLp3RKYjjlB4KI0fyPSDN/d5gb3ZtM2cVyxwOc=
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.4.0/go.mod h1:399nvdaqoU9rTI25UdFw2EWcVjmJPpeZPIhfDAIx/XU=
github.com/metal3-io/ip-address-manager/api v1.5.1 h1:uQXvLLFjyn24ptYNYyPDUv3tw9pyCkxyaAemcEviE3I=
github.com/metal3-io/ip-address-manager/api v1.5.1/go.mod h1:YurMpoFyB1ov6SN8ElELmvPpTNdKlZsPZ6p0/VfUWkM=
github.com/metal3-io/baremetal-operator/apis v0.4.1 h1:xQFVJMG/boVuHQo3gN3lB+kfbUzbr7WkQEuK+iUVLr0=
github.com/metal3-io/baremetal-operator/apis v0.4.1/go.mod h1:37iKpPXuy1hHhCKPmOiYU9tvEF5oxSzjNOXpXBbzwQE=
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.4.1 h1:jTS7wUf8o+SSHqpZOIF5B+1IGHutL4NUIVKd0jNchuY=
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.4.1/go.mod h1:399nvdaqoU9rTI25UdFw2EWcVjmJPpeZPIhfDAIx/XU=
github.com/metal3-io/ip-address-manager/api v1.5.2 h1:i5uMlbhrn65UB5OlFmAamKTDzYnKgVqEeZiCqMLr8ys=
github.com/metal3-io/ip-address-manager/api v1.5.2/go.mod h1:C6kV0vU0AVUVAFtA2bdsHYXhuyG+OSwIotBLIMidwaM=
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
Expand Down

0 comments on commit 8c64223

Please sign in to comment.