diff --git a/.golangci.yaml b/.golangci.yaml index d88c370c0c..73b6c35cda 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -10,7 +10,7 @@ run: - ^scripts - ^terraform - ^upi - go: '1.22' + go: '1.23' modules-download-mode: vendor allow-parallel-runners: true output: diff --git a/docs/dev/dependencies.md b/docs/dev/dependencies.md index d721d1044a..5eafa4a00b 100644 --- a/docs/dev/dependencies.md +++ b/docs/dev/dependencies.md @@ -18,8 +18,6 @@ We follow a hard flattening approach; i.e. direct and inherited dependencies are Dependencies are managed with [Go Modules](https://github.com/golang/go/wiki/Modules) but committed directly to the repository. -We require at least Go 1.22. - - Add or update a dependency with `go get @`. - If you want to use a fork of a project or ensure that a dependency is not updated even when another dependency requires a newer version of it, manually add a [replace directive in the go.mod file](https://github.com/golang/go/wiki/Modules#when-should-i-use-the-replace-directive). - Run `go mod tidy` to tidy `go.mod` and update `go.sum`, then commit the changes. diff --git a/go.mod b/go.mod index bcc9a8916a..15b5846e61 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/openshift/installer -go 1.22.0 +go 1.23.0 -toolchain go1.22.4 +toolchain go1.23.5 require ( cloud.google.com/go/monitoring v1.20.1 diff --git a/hack/build-cluster-api.sh b/hack/build-cluster-api.sh index 2469775b1f..7f0bc26d4e 100644 --- a/hack/build-cluster-api.sh +++ b/hack/build-cluster-api.sh @@ -5,7 +5,7 @@ set -e TARGET_OS_ARCH=$(go env GOOS)_$(go env GOARCH) CLUSTER_API_BIN_DIR="${PWD}/cluster-api/bin/${TARGET_OS_ARCH}" CLUSTER_API_MIRROR_DIR="${PWD}/pkg/clusterapi/mirror/" -ENVTEST_K8S_VERSION="1.31.0" +ENVTEST_K8S_VERSION="1.32.0" ENVTEST_ARCH=$(go env GOOS)-$(go env GOARCH) copy_cluster_api_to_mirror() { diff --git a/hack/build-node-joiner.sh b/hack/build-node-joiner.sh index f2cd4016eb..6eadbb40e6 100755 --- a/hack/build-node-joiner.sh +++ b/hack/build-node-joiner.sh @@ -5,7 +5,7 @@ set -ex # shellcheck disable=SC2068 version() { IFS="."; printf "%03d%03d%03d\\n" $@; unset IFS;} -minimum_go_version=1.22 +minimum_go_version=1.23 current_go_version=$(go version | cut -d " " -f 3) if [ "$(version "${current_go_version#go}")" -lt "$(version "$minimum_go_version")" ]; then diff --git a/hack/build.sh b/hack/build.sh index f3ae277aaa..7ab8ebb432 100755 --- a/hack/build.sh +++ b/hack/build.sh @@ -61,7 +61,7 @@ build_terraform_and_providers() { fi } -minimum_go_version=1.22 +minimum_go_version=1.23 current_go_version=$(go version | cut -d " " -f 3) if [ "$(version "${current_go_version#go}")" -lt "$(version "$minimum_go_version")" ]; then diff --git a/hack/go-fmt.sh b/hack/go-fmt.sh index d492e7fc7b..24daa151b6 100755 --- a/hack/go-fmt.sh +++ b/hack/go-fmt.sh @@ -11,6 +11,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - docker.io/golang:1.22 \ + docker.io/golang:1.23 \ ./hack/go-fmt.sh "${@}" fi diff --git a/hack/go-genmock.sh b/hack/go-genmock.sh index ca5b8c21b1..b72b26b30d 100755 --- a/hack/go-genmock.sh +++ b/hack/go-genmock.sh @@ -10,6 +10,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - docker.io/golang:1.22 \ + docker.io/golang:1.23 \ ./hack/go-genmock.sh "${@}" fi diff --git a/hack/go-sec.sh b/hack/go-sec.sh index a45aa6a7d6..17f04a1ab4 100755 --- a/hack/go-sec.sh +++ b/hack/go-sec.sh @@ -12,6 +12,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - docker.io/golang:1.22 \ + docker.io/golang:1.23 \ ./hack/go-sec.sh "${@}" fi diff --git a/hack/go-test.sh b/hack/go-test.sh index d4897d0c03..72467ec3a7 100755 --- a/hack/go-test.sh +++ b/hack/go-test.sh @@ -8,6 +8,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - docker.io/golang:1.22 \ + docker.io/golang:1.23 \ ./hack/go-test.sh "${@}" fi diff --git a/hack/go-vet.sh b/hack/go-vet.sh index 6345a980d8..bc545a27fa 100755 --- a/hack/go-vet.sh +++ b/hack/go-vet.sh @@ -6,6 +6,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - docker.io/golang:1.22 \ + docker.io/golang:1.23 \ ./hack/go-vet.sh "${@}" fi; diff --git a/hack/verify-capi-manifests.sh b/hack/verify-capi-manifests.sh index be196df60b..26955d59f7 100755 --- a/hack/verify-capi-manifests.sh +++ b/hack/verify-capi-manifests.sh @@ -80,6 +80,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - docker.io/golang:1.22 \ + docker.io/golang:1.23 \ ./hack/verify-capi-manifests.sh "${@}" fi diff --git a/hack/verify-codegen.sh b/hack/verify-codegen.sh index 65707c1e35..7d4146a8c6 100755 --- a/hack/verify-codegen.sh +++ b/hack/verify-codegen.sh @@ -10,6 +10,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - docker.io/golang:1.22 \ + docker.io/golang:1.23 \ ./hack/verify-codegen.sh "${@}" fi diff --git a/hack/verify-vendor.sh b/hack/verify-vendor.sh index 81cf915858..4f31ae1e9a 100755 --- a/hack/verify-vendor.sh +++ b/hack/verify-vendor.sh @@ -39,6 +39,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - docker.io/golang:1.22 \ + docker.io/golang:1.23 \ ./hack/verify-vendor.sh "${@}" fi