From 9d9d41e50e6edb7accb276d267473425673cbae1 Mon Sep 17 00:00:00 2001 From: Ilya Zuyev Date: Tue, 2 Mar 2021 10:56:09 -0800 Subject: [PATCH 1/8] Use us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.16.0-1 build image --- Makefile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index c7ce225f1342..604f20f8b469 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ RPM_VERSION ?= $(DEB_VERSION) RPM_REVISION ?= 0 # used by hack/jenkins/release_build_and_upload.sh and KVM_BUILD_IMAGE, see also BUILD_IMAGE below -GO_VERSION ?= 1.15.8 +GO_VERSION ?= 1.16.0 INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) BUILDROOT_BRANCH ?= 2020.02.10 @@ -44,13 +44,7 @@ COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO COMMIT_SHORT = $(shell git rev-parse --short HEAD 2> /dev/null || true) HYPERKIT_BUILD_IMAGE ?= karalabe/xgo-1.12.x -# NOTE: "latest" as of 2021-02-06. kube-cross images aren't updated as often as Kubernetes -# https://github.com/kubernetes/kubernetes/blob/master/build/build-image/cross/VERSION -# -# TODO: See https://github.com/kubernetes/minikube/issues/10276 -#BUILD_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1 -BUILD_IMAGE ?= golang:1.16.0-buster -# +BUILD_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1 ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image KVM_BUILD_IMAGE ?= $(REGISTRY)/kvm-build-image:$(GO_VERSION) From dc4a166b5ac36923d184d0da34a4948e224869da Mon Sep 17 00:00:00 2001 From: Ilya Zuyev Date: Tue, 2 Mar 2021 10:59:01 -0800 Subject: [PATCH 2/8] bump go version in go.mod --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index fb6b35ffbfa5..5a048d1e407d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module k8s.io/minikube -go 1.15 +go 1.16 require ( cloud.google.com/go/storage v1.13.0 From bc2e6bfc256fa70c052bcd5439c050505e199e08 Mon Sep 17 00:00:00 2001 From: Ilya Zuyev Date: Tue, 2 Mar 2021 11:37:43 -0800 Subject: [PATCH 3/8] update go.mod and go.sum --- go.mod | 1 - go.sum | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 5a048d1e407d..00baba9b813d 100644 --- a/go.mod +++ b/go.mod @@ -94,7 +94,6 @@ require ( gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 gotest.tools/v3 v3.0.2 // indirect - honnef.co/go/tools v0.0.1-2020.1.4 // indirect k8s.io/api v0.18.8 k8s.io/apimachinery v0.18.8 k8s.io/client-go v0.18.8 diff --git a/go.sum b/go.sum index 718eb2560fcf..39faddb15d82 100644 --- a/go.sum +++ b/go.sum @@ -755,6 +755,7 @@ github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT9 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw= github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.1.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= @@ -857,6 +858,7 @@ github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/cobra v1.1.3 h1:xghbfqPkxzxP3C/f3n5DdpAbdKLj4ZE4BWQI362l53M= github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/jwalterweatherman v0.0.0-20180109140146-7c0cea34c8ec/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= @@ -1404,6 +1406,7 @@ gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From e6db084354d06a077cb3b8c2a5fe7d6e046712ba Mon Sep 17 00:00:00 2001 From: Ilya Zuyev Date: Tue, 2 Mar 2021 13:09:20 -0800 Subject: [PATCH 4/8] Restore comment about kube-cross image version in Makefile --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 604f20f8b469..a1cfd271492b 100644 --- a/Makefile +++ b/Makefile @@ -44,6 +44,9 @@ COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO COMMIT_SHORT = $(shell git rev-parse --short HEAD 2> /dev/null || true) HYPERKIT_BUILD_IMAGE ?= karalabe/xgo-1.12.x +# NOTE: "latest" as of 2021-02-06. kube-cross images aren't updated as often as Kubernetes +# https://github.com/kubernetes/kubernetes/blob/master/build/build-image/cross/VERSION +# BUILD_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1 ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image From 48cb28b7cc92acbdb205c8322b21d9eada62050d Mon Sep 17 00:00:00 2001 From: Ilya Zuyev Date: Tue, 2 Mar 2021 14:17:43 -0800 Subject: [PATCH 5/8] separate kube-cross version from GO_VERSION --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a1cfd271492b..379eb7bda1aa 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,8 @@ RPM_VERSION ?= $(DEB_VERSION) RPM_REVISION ?= 0 # used by hack/jenkins/release_build_and_upload.sh and KVM_BUILD_IMAGE, see also BUILD_IMAGE below -GO_VERSION ?= 1.16.0 +GO_VERSION ?= 1.15.8 +KUBE_CROSS_VERSION ?= 1.16.0-1 INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) BUILDROOT_BRANCH ?= 2020.02.10 @@ -47,7 +48,7 @@ HYPERKIT_BUILD_IMAGE ?= karalabe/xgo-1.12.x # NOTE: "latest" as of 2021-02-06. kube-cross images aren't updated as often as Kubernetes # https://github.com/kubernetes/kubernetes/blob/master/build/build-image/cross/VERSION # -BUILD_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1 +BUILD_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(KUBE_CROSS_VERSION) ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image KVM_BUILD_IMAGE ?= $(REGISTRY)/kvm-build-image:$(GO_VERSION) From dd7aa7f195c5d1620d6039509e993306b08fc573 Mon Sep 17 00:00:00 2001 From: Ilya Zuyev Date: Tue, 2 Mar 2021 14:33:39 -0800 Subject: [PATCH 6/8] 1.16 for kvm-build-image --- Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 379eb7bda1aa..e0aa020096a7 100644 --- a/Makefile +++ b/Makefile @@ -32,8 +32,11 @@ RPM_VERSION ?= $(DEB_VERSION) RPM_REVISION ?= 0 # used by hack/jenkins/release_build_and_upload.sh and KVM_BUILD_IMAGE, see also BUILD_IMAGE below -GO_VERSION ?= 1.15.8 -KUBE_CROSS_VERSION ?= 1.16.0-1 +GO_VERSION ?= 1.16.0 + +# replace "x.y.0" => "x.y". kube-cross and golang.org/dl use different formats for x.y.0 go versions +KVM_GO_VERSION ?= $(GO_VERSION:.0=) + INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) BUILDROOT_BRANCH ?= 2020.02.10 @@ -48,10 +51,10 @@ HYPERKIT_BUILD_IMAGE ?= karalabe/xgo-1.12.x # NOTE: "latest" as of 2021-02-06. kube-cross images aren't updated as often as Kubernetes # https://github.com/kubernetes/kubernetes/blob/master/build/build-image/cross/VERSION # -BUILD_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(KUBE_CROSS_VERSION) +BUILD_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1 ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image -KVM_BUILD_IMAGE ?= $(REGISTRY)/kvm-build-image:$(GO_VERSION) +KVM_BUILD_IMAGE ?= $(REGISTRY)/kvm-build-image:$(KVM_GO_VERSION) KIC_BASE_IMAGE_GCR ?= $(REGISTRY)/kicbase:$(KIC_VERSION) KIC_BASE_IMAGE_HUB ?= kicbase/stable:$(KIC_VERSION) @@ -772,7 +775,7 @@ out/docker-machine-driver-kvm2-$(RPM_VERSION)-0.%.rpm: out/docker-machine-driver .PHONY: kvm-image kvm-image: installers/linux/kvm/Dockerfile ## Convenient alias to build the docker container - docker build --build-arg "GO_VERSION=$(GO_VERSION)" -t $(KVM_BUILD_IMAGE) -f $< $(dir $<) + docker build --build-arg "GO_VERSION=$(KVM_GO_VERSION)" -t $(KVM_BUILD_IMAGE) -f $< $(dir $<) @echo "" @echo "$(@) successfully built" From c9abd28ad605e103770a32bec93d6d9911018a21 Mon Sep 17 00:00:00 2001 From: Ilya Zuyev Date: Wed, 3 Mar 2021 13:59:59 -0800 Subject: [PATCH 7/8] Bump go version to 1.16.0 in GitHub action workflows --- .github/workflows/build.yml | 7 +++--- .github/workflows/iso.yml | 5 +++-- .github/workflows/master.yml | 35 +++++++++++++++--------------- .github/workflows/pr.yml | 35 +++++++++++++++--------------- .github/workflows/pr_verified.yaml | 7 +++--- 5 files changed, 47 insertions(+), 42 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0b0de34c3547..6bb2a09b6dbe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,6 +10,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org + GO_VERSION: 1.16.0 jobs: build_minikube: runs-on: ubuntu-18.04 @@ -17,7 +18,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Download Dependencies run: go mod download @@ -44,7 +45,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install libvirt run: | @@ -63,7 +64,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install libvirt run: | diff --git a/.github/workflows/iso.yml b/.github/workflows/iso.yml index 315948f1dee4..d4a6ec5c74af 100644 --- a/.github/workflows/iso.yml +++ b/.github/workflows/iso.yml @@ -5,6 +5,7 @@ on: - "deploy/iso/**" env: GOPROXY: https://proxy.golang.org + GO_VERSION: 1.16.0 jobs: build_test_iso: runs-on: [self-hosted, debian9, baremetal, equinix] @@ -20,7 +21,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Download Dependencies run: go mod download @@ -71,7 +72,7 @@ jobs: make checksum - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install kubectl shell: bash diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 827a21d8315b..f6d0889503ce 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -12,6 +12,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org + GO_VERSION: 1.16.0 jobs: # Runs before all other jobs # builds the minikube binaries @@ -21,7 +22,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Download Dependencies run: go mod download @@ -48,7 +49,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install libvirt run: | @@ -67,7 +68,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install libvirt run: | @@ -114,7 +115,7 @@ jobs: # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install gopogh @@ -199,7 +200,7 @@ jobs: # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install gopogh @@ -344,7 +345,7 @@ jobs: echo "------------------------" - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install tools continue-on-error: true @@ -480,7 +481,7 @@ jobs: Get-WmiObject -class Win32_ComputerSystem - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install tools continue-on-error: true @@ -586,7 +587,7 @@ jobs: # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install gopogh @@ -716,7 +717,7 @@ jobs: echo "------------------------" - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install tools continue-on-error: true @@ -809,7 +810,7 @@ jobs: Get-WmiObject -class Win32_ComputerSystem - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install tools continue-on-error: true @@ -892,7 +893,7 @@ jobs: # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308 - uses: actions/setup-go@v2 with: - go-version: '1.15.2' + go-version: ${{env.GO_VERSION}} stable: true - name: Download Binaries @@ -990,7 +991,7 @@ jobs: # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install gopogh @@ -1072,7 +1073,7 @@ jobs: # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install gopogh @@ -1184,7 +1185,7 @@ jobs: # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install gopogh @@ -1268,7 +1269,7 @@ jobs: # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install gopogh @@ -1375,7 +1376,7 @@ jobs: # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install gopogh @@ -1457,7 +1458,7 @@ jobs: # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install gopogh diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7214c116b3ce..b6f0f3756759 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,6 +10,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org + GO_VERSION: 1.16.0 jobs: # Runs before all other jobs # builds the minikube binaries @@ -19,7 +20,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Download Dependencies run: go mod download @@ -46,7 +47,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install libvirt run: | @@ -65,7 +66,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install libvirt run: | @@ -112,7 +113,7 @@ jobs: # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install gopogh @@ -197,7 +198,7 @@ jobs: # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install gopogh @@ -342,7 +343,7 @@ jobs: echo "------------------------" - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install tools continue-on-error: true @@ -478,7 +479,7 @@ jobs: Get-WmiObject -class Win32_ComputerSystem - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install tools continue-on-error: true @@ -620,7 +621,7 @@ jobs: echo "------------------------" - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install tools continue-on-error: true @@ -713,7 +714,7 @@ jobs: Get-WmiObject -class Win32_ComputerSystem - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install tools continue-on-error: true @@ -776,7 +777,7 @@ jobs: # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install gopogh @@ -891,7 +892,7 @@ jobs: # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308 - uses: actions/setup-go@v2 with: - go-version: '1.15.2' + go-version: ${{env.GO_VERSION}} stable: true - name: Download Binaries @@ -988,7 +989,7 @@ jobs: # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install gopogh shell: bash @@ -1069,7 +1070,7 @@ jobs: # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install gopogh @@ -1181,7 +1182,7 @@ jobs: # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install gopogh @@ -1265,7 +1266,7 @@ jobs: # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install gopogh @@ -1372,7 +1373,7 @@ jobs: # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install gopogh @@ -1454,7 +1455,7 @@ jobs: # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install gopogh diff --git a/.github/workflows/pr_verified.yaml b/.github/workflows/pr_verified.yaml index 6ed01e799b3a..f156c3e10767 100644 --- a/.github/workflows/pr_verified.yaml +++ b/.github/workflows/pr_verified.yaml @@ -19,6 +19,7 @@ on: - deleted env: GOPROXY: https://proxy.golang.org + GO_VERSION: 1.16.0 jobs: # Runs before all other jobs @@ -30,7 +31,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Download Dependencies run: go mod download @@ -71,7 +72,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install tools @@ -160,7 +161,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: '1.15.8' + go-version: ${{env.GO_VERSION}} stable: true - name: Install tools From 86117e1197142ff4d6c511c7c4a81822de828118 Mon Sep 17 00:00:00 2001 From: Ilya Zuyev Date: Wed, 3 Mar 2021 14:07:39 -0800 Subject: [PATCH 8/8] update hack/jenkins/common.sh to use go 1.16 --- hack/jenkins/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index ccbaec3b1592..1d3bc108ecf7 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -39,7 +39,7 @@ if [ "$(uname)" != "Darwin" ]; then fi # installing golang so we could do go get for gopogh -sudo ./installers/check_install_golang.sh "1.15.8" "/usr/local" || true +sudo ./installers/check_install_golang.sh "1.16" "/usr/local" || true # install docker and kubectl if not present sudo ./installers/check_install_docker.sh