kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #10691 from ilya-zuyev/ilyaz/use_kubecross_116_build_image 

restore kube-cross build image and bump go to version 1.16
pull/10718/head
Medya Ghazizadeh 2021-03-03 21:30:35 -08:00 committed by GitHub
parent d15dc1cd7a 65741c82e6
commit bdd50a4cb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 57 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/build.yml vendored
View File

@ -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: |

5
.github/workflows/iso.yml vendored
View File

@ -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

35
.github/workflows/master.yml vendored
View File

@ -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

35
.github/workflows/pr.yml vendored
View File

@ -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

7
.github/workflows/pr_verified.yaml vendored
View File

@ -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

15
Makefile
View File

@ -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"

2
go.mod
View File

@ -1,6 +1,6 @@
module k8s.io/minikube
go 1.15
go 1.16
require (
cloud.google.com/go/storage v1.13.0

2
hack/jenkins/common.sh
View File

@ -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