get image from kubecross

pull/12059/head
Medya Gh 2021-07-28 15:17:48 -07:00
parent 8e09395fdf
commit ec3fdf17b4
13 changed files with 16 additions and 14 deletions

View File

@ -12,7 +12,7 @@ on:
- "!deploy/iso/**"
env:
GOPROXY: https://proxy.golang.org
GO_VERSION: '1.16.6'
GO_VERSION: '1.16.4'
jobs:
build_minikube:
runs-on: ubuntu-18.04

View File

@ -6,7 +6,7 @@ on:
- master
env:
GOPROXY: https://proxy.golang.org
GO_VERSION: '1.16.6'
GO_VERSION: '1.16.4'
jobs:
generate-docs:
runs-on: ubuntu-18.04

View File

@ -7,7 +7,7 @@ on:
release:
types: [published]
env:
GO_VERSION: '1.16.6'
GO_VERSION: '1.16.4'
jobs:
update-leaderboard:
runs-on: ubuntu-latest

View File

@ -14,7 +14,7 @@ on:
- "!deploy/iso/**"
env:
GOPROXY: https://proxy.golang.org
GO_VERSION: '1.16.6'
GO_VERSION: '1.16.4'
jobs:
# Runs before all other jobs
# builds the minikube binaries

View File

@ -12,7 +12,7 @@ on:
- "!deploy/iso/**"
env:
GOPROXY: https://proxy.golang.org
GO_VERSION: '1.16.6'
GO_VERSION: '1.16.4'
jobs:
# Runs before all other jobs
# builds the minikube binaries

View File

@ -21,7 +21,7 @@ on:
- deleted
env:
GOPROXY: https://proxy.golang.org
GO_VERSION: '1.16.6'
GO_VERSION: '1.16.4'
jobs:
# Runs before all other jobs

View File

@ -6,7 +6,7 @@ on:
- cron: "0 2,14 * * *"
env:
GOPROXY: https://proxy.golang.org
GO_VERSION: '1.16.6'
GO_VERSION: '1.16.4'
jobs:
time-to-k8s-public-chart:
runs-on: ubuntu-latest

View File

@ -5,7 +5,7 @@ on:
types: [released]
env:
GOPROXY: https://proxy.golang.org
GO_VERSION: '1.16.6'
GO_VERSION: '1.16.4'
jobs:
benchmark:
runs-on: ubuntu-20.04

View File

@ -6,7 +6,7 @@ on:
- "translations/**"
env:
GOPROXY: https://proxy.golang.org
GO_VERSION: '1.16.6'
GO_VERSION: '1.16.4'
jobs:
unit_test:
runs-on: ubuntu-20.04

View File

@ -6,7 +6,7 @@ on:
- cron: "0 9 * * 1"
env:
GOPROXY: https://proxy.golang.org
GO_VERSION: '1.16.6'
GO_VERSION: '1.16.4'
jobs:
bump-k8s-versions:
runs-on: ubuntu-latest

View File

@ -6,7 +6,7 @@ on:
- cron: "0 8 * * 1"
env:
GOPROXY: https://proxy.golang.org
GO_VERSION: '1.16.6'
GO_VERSION: '1.16.4'
jobs:
bump-k8s-versions:
runs-on: ubuntu-20.04

View File

@ -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.16.6
GO_VERSION ?= 1.16.4
# 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=)

View File

@ -148,7 +148,8 @@ func main() {
// goVersion returns Golang stable version.
func goVersions() (stable, stableMM string, err error) {
resp, err := http.Get("https://golang.org/VERSION?m=text")
// will update to the same image that kubernetes project uses
resp, err := http.Get("https://raw.githubusercontent.com/kubernetes/kubernetes/master/build/build-image/cross/VERSION")
if err != nil {
return "", "", err
}
@ -156,7 +157,8 @@ func goVersions() (stable, stableMM string, err error) {
if err != nil {
return "", "", err
}
stable = strings.TrimPrefix(string(body), "go")
stable = strings.TrimPrefix(string(body), "v")
stable = strings.Split(stable, "-")[0]
mmp := strings.SplitN(stable, ".", 3)
stableMM = strings.Join(mmp[0:2], ".") // <major>.<minor> version
return stable, stableMM, nil