Upgrade to go 1.14.4

kubernetes · Jul 5, 2020 · 78b57bd · 78b57bd
1 parent 03e620b
commit 78b57bd
Show file tree

Hide file tree

Showing 10 changed files with 109 additions and 18 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
         go: [1.13, 1.14]
         exclude:
           - os: macos-10.15
-            go: 1.14
+            go: 1.13
       fail-fast: true
 
     runs-on: ${{ matrix.os }}
@@ -45,7 +45,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-18.04]
-        go: [1.13]
+        go: [1.14]
       fail-fast: true
 
     runs-on: ${{ matrix.os }}

diff --git a/.travis.yml b/.travis.yml
@@ -29,6 +29,6 @@ jobs:
     - name: Verify
       arch: amd64
       os: linux
-      go: 1.13.x
+      go: 1.14.x
       script:
         - GOPROXY=https://proxy.golang.org make travis-ci
diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ GCS_URL=$(GCS_LOCATION:gs://%=https://storage.googleapis.com/%)
 LATEST_FILE?=latest-ci.txt
 GOPATH_1ST:=$(shell go env | grep GOPATH | cut -f 2 -d \")
 UNIQUE:=$(shell date +%s)
-GOVERSION=1.13.9
+GOVERSION=1.14.4
 BUILD=$(KOPS_ROOT)/.build
 LOCAL=$(BUILD)/local
 BINDATA_TARGETS=upup/models/bindata.go
@@ -45,9 +45,6 @@ BAZEL_CONFIG?=
 API_OPTIONS?=
 GCFLAGS?=
 
-# This can be removed when we upgrade to go 1.14
-export GOFLAGS=-mod=vendor
-
 UPLOAD_CMD=$(KOPS_ROOT)/hack/upload
 
 # Unexport environment variables that can affect tests and are not used in builds
@@ -448,7 +445,7 @@ gomod-prereqs:
 
 .PHONY: gomod
 gomod: gomod-prereqs
-	GO111MODULE=on GOFLAGS= go mod vendor
+	GO111MODULE=on go mod vendor
 	# Switch weavemesh to use peer_name_hash - bazel rule-go doesn't support build tags yet
 	rm vendor/github.com/weaveworks/mesh/peer_name_mac.go
 	sed -i -e 's/peer_name_hash/!peer_name_mac/g' vendor/github.com/weaveworks/mesh/peer_name_hash.go

diff --git a/WORKSPACE b/WORKSPACE
@@ -27,7 +27,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
 go_rules_dependencies()
 
 go_register_toolchains(
-    go_version = "1.13.9",
+    go_version = "1.14.4",
 )
 
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -14,7 +14,7 @@
 
 FROM alpine:3.8
 
-ARG GO_VERSION=1.13.9
+ARG GO_VERSION=1.14.4
 
 # KOPS_GITISH: Modify to build at an explicit tag/gitish
 ARG KOPS_GITISH=release

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/kops
 
-go 1.13
+go 1.14
 
 // Version kubernetes-1.18.0 => tag v0.18.1
 

diff --git a/hack/make-apimachinery.sh b/hack/make-apimachinery.sh
@@ -30,16 +30,15 @@ mkdir -p "${WORK_DIR}/go/"
 cp -R "${GOPATH}/src/k8s.io/kops/vendor/" "${WORK_DIR}/go/src"
 
 unset GOBIN
-unset GOFLAGS
 
-env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install -v k8s.io/code-generator/cmd/conversion-gen/
+env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install -mod=mod -v k8s.io/code-generator/cmd/conversion-gen/
 cp "${WORK_DIR}/go/bin/conversion-gen" "${GOPATH}/bin/"
 
-env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install k8s.io/code-generator/cmd/deepcopy-gen/
+env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install -mod=mod k8s.io/code-generator/cmd/deepcopy-gen/
 cp "${WORK_DIR}/go/bin/deepcopy-gen" "${GOPATH}/bin/"
 
-env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install k8s.io/code-generator/cmd/defaulter-gen/
+env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install -mod=mod k8s.io/code-generator/cmd/defaulter-gen/
 cp "${WORK_DIR}/go/bin/defaulter-gen" "${GOPATH}/bin/"
 
-env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install k8s.io/code-generator/cmd/client-gen/
+env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install -mod=mod k8s.io/code-generator/cmd/client-gen/
 cp "${WORK_DIR}/go/bin/client-gen" "${GOPATH}/bin/"
diff --git a/images/dns-controller-builder/Dockerfile b/images/dns-controller-builder/Dockerfile
@@ -24,7 +24,7 @@ RUN apt-get update && apt-get install --yes --reinstall lsb-base \
   && rm -rf /var/lib/apt/lists/*
 
 # Install golang
-RUN curl -L https://storage.googleapis.com/golang/go1.13.9.linux-amd64.tar.gz | tar zx -C /usr/local
+RUN curl -L https://storage.googleapis.com/golang/go1.14.4.linux-amd64.tar.gz | tar zx -C /usr/local
 ENV PATH $PATH:/usr/local/go/bin
 
 COPY onbuild.sh /onbuild.sh
diff --git a/images/protokube-builder/Dockerfile b/images/protokube-builder/Dockerfile
@@ -24,7 +24,7 @@ RUN apt-get update && apt-get install --yes --reinstall lsb-base \
   && rm -rf /var/lib/apt/lists/*
 
 # Install golang
-RUN curl -L https://storage.googleapis.com/golang/go1.13.9.linux-amd64.tar.gz | tar zx -C /usr/local
+RUN curl -L https://storage.googleapis.com/golang/go1.14.4.linux-amd64.tar.gz | tar zx -C /usr/local
 ENV PATH $PATH:/usr/local/go/bin
 
 COPY onbuild.sh /onbuild.sh