From 5efec68fd3bc152625c5a78b962fcb00f9b1ae70 Mon Sep 17 00:00:00 2001 From: Sean Malloy Date: Wed, 18 Dec 2019 00:26:25 -0600 Subject: [PATCH] Update To Go 1.13.5 Starting with Kubernetes release 1.17 Go >= 1.13.4 is required. https://github.com/kubernetes/kubernetes/pull/82809 --- .travis.yml | 2 +- Dockerfile | 2 +- hack/update-gofmt.sh | 2 +- hack/verify-gofmt.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index cf2b68e82..59957517a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: false language: go go: - - 1.12.x + - 1.13.x services: - docker before_script: diff --git a/Dockerfile b/Dockerfile index edb578b2c..35ee9b541 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.12.12 +FROM golang:1.13.5 WORKDIR /go/src/sigs.k8s.io/descheduler COPY . . diff --git a/hack/update-gofmt.sh b/hack/update-gofmt.sh index 4bef00ed8..3edd0a3ca 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') ]]; then +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') ]]; 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 747e54a71..f0262f824 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') ]]; then +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') ]]; then echo "Unknown go version '${GO_VERSION[2]}', skipping gofmt." exit 1 fi