Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.

# Build the manager binary on golang image
FROM registry.hub.docker.com/library/golang:1.15.3 as builder
FROM registry.hub.docker.com/library/golang:1.16 as builder
WORKDIR /workspace

# Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ release-binary: $(RELEASE_DIR)
-e GOARCH=$(GOARCH) \
-v "$$(pwd):/workspace" \
-w /workspace \
golang:1.15.3 \
golang:1.16 \
go build -a -ldflags '-extldflags "-static"' \
-o $(RELEASE_DIR)/$(notdir $(RELEASE_BINARY))-$(GOOS)-$(GOARCH) $(RELEASE_BINARY)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/metal3-io/ip-address-manager

go 1.15
go 1.16

require (
cloud.google.com/go v0.75.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion hack/Dockerfile.unit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.hub.docker.com/library/golang:1.15.3
FROM registry.hub.docker.com/library/golang:1.16

WORKDIR /usr/local/kubebuilder
COPY /hack/tools /usr/local/kubebuilder/
Expand Down
2 changes: 1 addition & 1 deletion hack/codegen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ else
--volume "${PWD}:/data:rw,z" \
--entrypoint sh \
--workdir /data \
registry.hub.docker.com/library/golang:1.15.3 \
registry.hub.docker.com/library/golang:1.16 \
/data/hack/codegen.sh
fi;
2 changes: 1 addition & 1 deletion hack/ensure-go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ EOF
local go_version
IFS=" " read -ra go_version <<< "$(go version)"
local minimum_go_version
minimum_go_version=go1.15.0
minimum_go_version=go1.15.3
if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
cat <<EOF
Detected go version: ${go_version[*]}.
Expand Down
2 changes: 1 addition & 1 deletion hack/gofmt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ else
--volume "${PWD}:/go/src/github.com/metal3-io/cluster-api-provider-metal3:ro,z" \
--entrypoint sh \
--workdir /go/src/github.com/metal3-io/cluster-api-provider-metal3 \
registry.hub.docker.com/library/golang:1.15.3 \
registry.hub.docker.com/library/golang:1.16 \
/go/src/github.com/metal3-io/cluster-api-provider-metal3/hack/gofmt.sh
fi;
2 changes: 1 addition & 1 deletion hack/govet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ else
--volume "${PWD}:/go/src/github.com/metal3-io/cluster-api-provider-metal3:ro,z" \
--entrypoint sh \
--workdir /go/src/github.com/metal3-io/cluster-api-provider-metal3 \
registry.hub.docker.com/library/golang:1.15.3 \
registry.hub.docker.com/library/golang:1.16 \
/go/src/github.com/metal3-io/cluster-api-provider-metal3/hack/govet.sh
fi;
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 sigs.k8s.io/cluster-api/hack/tools

go 1.15
go 1.16

require (
github.com/golang/mock v1.4.3
Expand Down