Skip to content

Commit

Permalink
Bump Golang and IPAM
Browse files Browse the repository at this point in the history
  • Loading branch information
peppi-lotta committed Nov 13, 2024
1 parent 79aff95 commit 77323cc
Show file tree
Hide file tree
Showing 13 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

# Support FROM override
ARG BUILD_IMAGE=docker.io/golang:1.22.8@sha256:b274ff14d8eb9309b61b1a45333bf0559a554ebcf6732fa2012dbed9b01ea56f
ARG BUILD_IMAGE=docker.io/golang:1.22.9@sha256:97ccb917d1dfe5b12cb4cfea1fb37989b28d3a87d28e89f27a71336c4700a87f
ARG BASE_IMAGE=gcr.io/distroless/static:nonroot@sha256:9ecc53c269509f63c69a266168e4a687c7eb8c0cfd753bd8bfcaa4f58a90876f

# Build the manager binary on golang image
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ SHELL:=/usr/bin/env bash

.DEFAULT_GOAL:=help

GO_VERSION ?= 1.22.8
GO_VERSION ?= 1.22.9
GO := $(shell type -P go)
# Use GOPROXY environment variable if set
GOPROXY := $(shell $(GO) env GOPROXY)
Expand Down
4 changes: 2 additions & 2 deletions api/go.mod
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module github.com/metal3-io/cluster-api-provider-metal3/api

go 1.22.3
go 1.22.9

require (
github.com/metal3-io/ip-address-manager/api v1.8.0
github.com/metal3-io/ip-address-manager/api v1.8.1
github.com/onsi/gomega v1.35.1
github.com/pkg/errors v0.9.1
golang.org/x/net v0.30.0
Expand Down
4 changes: 2 additions & 2 deletions api/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,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.8.0 h1:qEemVSb45uDbbQonr2StMV21RfSKNSO/NrPnhApV90w=
github.com/metal3-io/ip-address-manager/api v1.8.0/go.mod h1:0PjnN4ke64Jh6A3U04mMvV2sBwePa7HKkiZXazktCTk=
github.com/metal3-io/ip-address-manager/api v1.8.1 h1:hFWgKmfO02AGnY/+QEd6+IY8BuQTHK25BhYOIwu2C2k=
github.com/metal3-io/ip-address-manager/api v1.8.1/go.mod h1:yMOQSHu0XjbRaMP38a7ZiJ27zX/2L2YBcSHRLXvZ6aM=
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
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.8.0
- image: quay.io/metal3-io/ip-address-manager:v1.8.1
name: manager
2 changes: 1 addition & 1 deletion config/ipam/kustomization.yaml
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.8.0/ipam-components.yaml
- /~https://github.com/metal3-io/ip-address-manager/releases/download/v1.8.1/ipam-components.yaml

patches:
- path: image_patch.yaml
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module github.com/metal3-io/cluster-api-provider-metal3

go 1.22.3
go 1.22.9

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/cluster-api-provider-metal3/api v0.0.0
github.com/metal3-io/ip-address-manager/api v1.8.0
github.com/metal3-io/ip-address-manager/api v1.8.1
github.com/onsi/ginkgo/v2 v2.21.0
github.com/onsi/gomega v1.35.1
github.com/pkg/errors v0.9.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ github.com/metal3-io/baremetal-operator/apis v0.8.0 h1:dy1Z6IRdlRi8tsEww8M3CmOay
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.8.0 h1:qEemVSb45uDbbQonr2StMV21RfSKNSO/NrPnhApV90w=
github.com/metal3-io/ip-address-manager/api v1.8.0/go.mod h1:0PjnN4ke64Jh6A3U04mMvV2sBwePa7HKkiZXazktCTk=
github.com/metal3-io/ip-address-manager/api v1.8.1 h1:hFWgKmfO02AGnY/+QEd6+IY8BuQTHK25BhYOIwu2C2k=
github.com/metal3-io/ip-address-manager/api v1.8.1/go.mod h1:yMOQSHu0XjbRaMP38a7ZiJ27zX/2L2YBcSHRLXvZ6aM=
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
2 changes: 1 addition & 1 deletion hack/fake-apiserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

# Support FROM override
ARG BUILD_IMAGE=docker.io/golang:1.22.7@sha256:192683db8982323952988c7b86c098ee7ecc6cbeb202bf7c113ff9be5358367c
ARG BUILD_IMAGE=docker.io/golang:1.22.9@sha256:97ccb917d1dfe5b12cb4cfea1fb37989b28d3a87d28e89f27a71336c4700a87f
ARG BASE_IMAGE=gcr.io/distroless/static:nonroot@sha256:9ecc53c269509f63c69a266168e4a687c7eb8c0cfd753bd8bfcaa4f58a90876f

# Build the fkas binary on golang image
Expand Down
2 changes: 1 addition & 1 deletion hack/fake-apiserver/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/metal3-io/cluster-api-provider-metal3/hack/fake-apiserver

go 1.22.3
go 1.22.9

require (
github.com/metal3-io/baremetal-operator/apis v0.8.0
Expand Down
2 changes: 1 addition & 1 deletion hack/tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/metal3-io/cluster-api-provider-metal3/hack/tools

go 1.22.8
go 1.22.9

require (
github.com/drone/envsubst v1.0.3
Expand Down
4 changes: 2 additions & 2 deletions test/go.mod
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module github.com/metal3-io/cluster-api-provider-metal3/test

go 1.22.8
go 1.22.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/cluster-api-provider-metal3/api v0.0.0
github.com/metal3-io/ip-address-manager/api v1.8.0
github.com/metal3-io/ip-address-manager/api v1.8.1
github.com/onsi/ginkgo/v2 v2.21.0
github.com/onsi/gomega v1.35.1
github.com/pkg/errors v0.9.1
Expand Down
4 changes: 2 additions & 2 deletions test/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ github.com/metal3-io/baremetal-operator/apis v0.8.0 h1:dy1Z6IRdlRi8tsEww8M3CmOay
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.8.0 h1:qEemVSb45uDbbQonr2StMV21RfSKNSO/NrPnhApV90w=
github.com/metal3-io/ip-address-manager/api v1.8.0/go.mod h1:0PjnN4ke64Jh6A3U04mMvV2sBwePa7HKkiZXazktCTk=
github.com/metal3-io/ip-address-manager/api v1.8.1 h1:hFWgKmfO02AGnY/+QEd6+IY8BuQTHK25BhYOIwu2C2k=
github.com/metal3-io/ip-address-manager/api v1.8.1/go.mod h1:yMOQSHu0XjbRaMP38a7ZiJ27zX/2L2YBcSHRLXvZ6aM=
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=
Expand Down

0 comments on commit 77323cc

Please sign in to comment.