diff --git a/docs/dev/dependencies.md b/docs/dev/dependencies.md index 683720d089..07856343a5 100644 --- a/docs/dev/dependencies.md +++ b/docs/dev/dependencies.md @@ -18,7 +18,7 @@ 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.17. +We require at least Go 1.18. - 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). diff --git a/go.mod b/go.mod index 379c7cdd46..11f60d5cc2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openshift/installer -go 1.17 +go 1.18 require ( cloud.google.com/go v0.81.0 diff --git a/hack/build.sh b/hack/build.sh index c5b9156ed3..394d2292db 100755 --- a/hack/build.sh +++ b/hack/build.sh @@ -26,7 +26,7 @@ copy_terraform_to_mirror() { cp "${PWD}/terraform/bin/${TARGET_OS_ARCH}/terraform" "${PWD}/pkg/terraform/providers/mirror/terraform/" } -minimum_go_version=1.17 +minimum_go_version=1.18 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 858cc578ee..2bb3b45d25 100755 --- a/hack/go-fmt.sh +++ b/hack/go-fmt.sh @@ -9,6 +9,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.17 \ + docker.io/golang:1.18 \ ./hack/go-fmt.sh "${@}" fi diff --git a/hack/go-genmock.sh b/hack/go-genmock.sh index f167b33685..8471bc05f9 100755 --- a/hack/go-genmock.sh +++ b/hack/go-genmock.sh @@ -9,6 +9,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.17 \ + docker.io/golang:1.18 \ ./hack/go-genmock.sh "${@}" fi diff --git a/hack/go-lint.sh b/hack/go-lint.sh index 70f31ed8a2..346f069dde 100755 --- a/hack/go-lint.sh +++ b/hack/go-lint.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.17 \ + docker.io/golang:1.18 \ ./hack/go-lint.sh "${@}" fi diff --git a/hack/go-sec.sh b/hack/go-sec.sh index f0eabba425..9e78419cf6 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.17 \ + docker.io/golang:1.18 \ ./hack/go-sec.sh "${@}" fi diff --git a/hack/go-test.sh b/hack/go-test.sh index 9e009d52b0..ac15834b4c 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.17 \ + docker.io/golang:1.18 \ ./hack/go-test.sh "${@}" fi diff --git a/hack/go-vet.sh b/hack/go-vet.sh index 3923ae7aa6..7aa0f57b31 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.17 \ + docker.io/golang:1.18 \ ./hack/go-vet.sh "${@}" fi; diff --git a/hack/verify-codegen.sh b/hack/verify-codegen.sh index 97434f9111..a83b493562 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.17 \ + docker.io/golang:1.18 \ ./hack/verify-codegen.sh "${@}" fi diff --git a/hack/verify-vendor.sh b/hack/verify-vendor.sh index f3aa02aaf0..8271e97667 100755 --- a/hack/verify-vendor.sh +++ b/hack/verify-vendor.sh @@ -20,11 +20,11 @@ if [ "$IS_CONTAINER" != "" ]; then verify_module "${PWD}" # Verify the sub-modules for the terraform providers. - # The -compat=1.17 is needed for the openstack provider. The provider uses golang.org/x/mod, which go 1.17 selects + # The -compat=1.18 is needed for the openstack provider. The provider uses golang.org/x/mod, which go 1.18 selects # as v0.3.0 but go 1.16 selects as v0.4.2. find terraform/providers -maxdepth 1 -mindepth 1 -print0 | while read -r -d '' dir do - verify_module "$dir" "1.17" + verify_module "$dir" "1.18" done # Verify the terraform sub-module. @@ -36,6 +36,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.17 \ + docker.io/golang:1.18 \ ./hack/verify-vendor.sh "${@}" fi