Skip to content

Commit

Permalink
Merge pull request #1740 from Nordix/kashif/bump-golang-v1.22.3
Browse files Browse the repository at this point in the history
🌱 Bump golang to v1.22
  • Loading branch information
metal3-io-bot authored Jun 7, 2024
2 parents 73af88e + bc94aa8 commit 8a42778
Show file tree
Hide file tree
Showing 13 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Install go
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: '1.21'
go-version: '1.22'
- name: Generate release artifacts and notes
run: |
make release
Expand Down
8 changes: 4 additions & 4 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ linters:

linters-settings:
gosec:
go: "1.21"
go: "1.22"
severity: medium
confidence: medium
concurrency: 8
Expand Down Expand Up @@ -101,9 +101,9 @@ linters-settings:
allow-leading-space: false
require-specific: true
staticcheck:
go: "1.21"
go: "1.22"
stylecheck:
go: "1.21"
go: "1.22"
gocritic:
enabled-tags:
- experimental
Expand All @@ -122,7 +122,7 @@ linters-settings:
- whyNoLint
- wrapperFunc
unused:
go: "1.21"
go: "1.22"
issues:
exclude-rules:
- path: test/e2e
Expand Down
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.21.9@sha256:7d0dcbe5807b1ad7272a598fbf9d7af15b5e2bed4fd6c4c2b5b3684df0b317dd
ARG BUILD_IMAGE=docker.io/golang:1.22.3@sha256:f43c6f049f04cbbaeb28f0aad3eea15274a7d0a7899a617d0037aec48d7ab010
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.21.9
GO_VERSION ?= 1.22.3
GO := $(shell type -P go)
# Use GOPROXY environment variable if set
GOPROXY := $(shell $(GO) env GOPROXY)
Expand Down
2 changes: 1 addition & 1 deletion Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def fixup_yaml_empty_arrays(yaml_str):

tilt_helper_dockerfile_header = """
# Tilt image
FROM golang:1.21 as tilt-helper
FROM golang:1.22 as tilt-helper
# Support live reloading with Tilt
RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh && \
wget --output-document /start.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/start.sh && \
Expand Down
2 changes: 1 addition & 1 deletion api/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/api

go 1.21
go 1.22

require (
github.com/metal3-io/ip-address-manager/api v1.7.0
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/cluster-api-provider-metal3

go 1.21
go 1.22

require (
github.com/go-logr/logr v1.4.1
Expand Down
2 changes: 1 addition & 1 deletion hack/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ else
--volume "${PWD}:/workdir:ro,z" \
--entrypoint sh \
--workdir /workdir \
docker.io/golang:1.21 \
docker.io/golang:1.22 \
/workdir/hack/build.sh "$@"
fi
2 changes: 1 addition & 1 deletion hack/codegen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ else
--volume "${PWD}:/workdir:rw,z" \
--entrypoint sh \
--workdir /workdir \
docker.io/golang:1.21 \
docker.io/golang:1.22 \
/workdir/hack/codegen.sh
fi
2 changes: 1 addition & 1 deletion hack/gomod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ else
--volume "${PWD}:/workdir:ro,z" \
--entrypoint sh \
--workdir /workdir \
docker.io/golang:1.21 \
docker.io/golang:1.22 \
/workdir/hack/gomod.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 github.com/metal3-io/cluster-api-provider-metal3/hack/tools

go 1.21
go 1.22

require (
github.com/drone/envsubst v1.0.3
Expand Down
2 changes: 1 addition & 1 deletion hack/unit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ else
--volume "${PWD}:/workdir:ro,z" \
--entrypoint sh \
--workdir /workdir \
docker.io/golang:1.21 \
docker.io/golang:1.22 \
/workdir/hack/unit.sh "$@"
fi
2 changes: 1 addition & 1 deletion test/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/test

go 1.21
go 1.22

require (
github.com/docker/docker v26.1.3+incompatible
Expand Down

0 comments on commit 8a42778

Please sign in to comment.