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 diff --git a/Makefile b/Makefile index c766f77595d5..75e97b465273 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +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 +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 @@ -47,13 +51,10 @@ HYPERKIT_BUILD_IMAGE ?= neilotoole/xcgo:go1.15 # 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) +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) @@ -774,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" diff --git a/go.mod b/go.mod index 68753660fdd5..00baba9b813d 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 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