From 195082d33b9acb4f85ab1e8b2d839f937c2c42ef Mon Sep 17 00:00:00 2001 From: Sean Malloy Date: Tue, 11 Aug 2020 21:37:55 -0500 Subject: [PATCH] Update To Go 1.15.0 As part of the k8s 1.19 release cycle the Go version is being bumped to 1.15.0. Updating the descheduler to use Go 1.15 prior to the descheduler v0.19.0 release. See below issues for reference: * https://github.com/kubernetes/release/issues/1421 * https://github.com/kubernetes/kubernetes/issues/93484 --- Dockerfile | 2 +- docs/contributor-guide.md | 4 ++-- go.mod | 2 +- hack/update-gofmt.sh | 2 +- hack/verify-gofmt.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index b76562e27..da5625bf4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.14.4 +FROM golang:1.15.0 WORKDIR /go/src/sigs.k8s.io/descheduler COPY . . diff --git a/docs/contributor-guide.md b/docs/contributor-guide.md index 0d747b891..c9df10548 100644 --- a/docs/contributor-guide.md +++ b/docs/contributor-guide.md @@ -3,7 +3,7 @@ ## Required Tools - [Git](https://git-scm.com/downloads) -- [Go 1.14+](https://golang.org/dl/) +- [Go 1.15+](https://golang.org/dl/) - [Docker](https://docs.docker.com/install/) - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - [kind](https://kind.sigs.k8s.io/) @@ -40,4 +40,4 @@ make test-e2e ``` ### Miscellaneous -See the [hack directory](https://github.com/kubernetes-sigs/descheduler/tree/master/hack) for additional tools and scripts used for developing the descheduler. \ No newline at end of file +See the [hack directory](https://github.com/kubernetes-sigs/descheduler/tree/master/hack) for additional tools and scripts used for developing the descheduler. diff --git a/go.mod b/go.mod index 51642faeb..17da5bd15 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/descheduler -go 1.14 +go 1.15 require ( github.com/spf13/cobra v0.0.5 diff --git a/hack/update-gofmt.sh b/hack/update-gofmt.sh index 3b843c28b..927d76d72 100755 --- a/hack/update-gofmt.sh +++ b/hack/update-gofmt.sh @@ -23,7 +23,7 @@ DESCHEDULER_ROOT=$(dirname "${BASH_SOURCE}")/.. GO_VERSION=($(go version)) -if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.2|go1.3|go1.4|go1.5|go1.6|go1.7|go1.8|go1.9|go1.10|go1.11|go1.12|go1.13|go1.14') ]]; then +if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.13|go1.14|go1.15') ]]; then echo "Unknown go version '${GO_VERSION[2]}', skipping gofmt." exit 1 fi diff --git a/hack/verify-gofmt.sh b/hack/verify-gofmt.sh index 87f65e370..fb2102491 100755 --- a/hack/verify-gofmt.sh +++ b/hack/verify-gofmt.sh @@ -23,7 +23,7 @@ DESCHEDULER_ROOT=$(dirname "${BASH_SOURCE}")/.. GO_VERSION=($(go version)) -if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.2|go1.3|go1.4|go1.5|go1.6|go1.7|go1.8|go1.9|go1.10|go1.11|go1.12|go1.13|go1.14') ]]; then +if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.13|go1.14|go1.15') ]]; then echo "Unknown go version '${GO_VERSION[2]}', skipping gofmt." exit 1 fi