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

fix regex

pull/12375/head
Medya Gh 2021-08-30 15:01:56 -07:00
parent 50e14f30c3
commit 2e9915dbbf
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -35,7 +35,7 @@ RPM_REVISION ?= 0
# update this only by running `make update-golang-version`
GO_VERSION ?= 1.16.7
# update this only by running `make update-golang-version`
GO_K8S_VERSION_PREFIX ?= v1.23.0
GO_K8S_VERSION_PREFIX ?= v1.21.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=)

12
hack/update/golang_version/update_golang_version.go
View File

@ -119,8 +119,8 @@ var (
"Makefile": {
Replace: map[string]string{
// searching for 1.* so it does NOT match "KVM_GO_VERSION ?= $(GO_VERSION:.0=)" in the Makefile
`GO_VERSION \?= 1.*`: `GO_VERSION ?= {{.StableVersion}}`,
`GO_K8S_VERSION \?= 1.*`: `GO_K8S_VERSION ?= {{.K8sVersion}}`,
`GO_VERSION \?= 1.*`: `GO_VERSION ?= {{.StableVersion}}`,
`GO_K8S_VERSION \?= v1.*`: `GO_K8S_VERSION ?= {{.K8SVersion}}`,
},
},
}
@ -135,7 +135,7 @@ var (
type Data struct {
StableVersion string `json:"stableVersion"`
StableVersionMM string `json:"stableVersionMM"` // go.mod wants go version in <major>.<minor> format
K8SVersion string `json:"k8sVersionMM"` // as of v1.23.0 Kubernetes uses k8s version in golang image name because: https://github.com/kubernetes/kubernetes/pull/103692#issuecomment-908659826
K8SVersion string `json:"k8sVersion"` // as of v1.23.0 Kubernetes uses k8s version in golang image name because: https://github.com/kubernetes/kubernetes/pull/103692#issuecomment-908659826
}
@ -160,15 +160,15 @@ func goVersions() (stable, stableMM, k8sVersion string, err error) {
// 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
return "", "", "", err
}
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return "", "", err
return "", "", "", err
}
// example response: v1.23.0-go1.17-buster.0
stable = string(body)
k8sVersion := strings.Split(stable, "-")[0]
k8sVersion = strings.Split(stable, "-")[0]
stable = strings.Split(stable, "-")[1]
stable = strings.Replace(stable, "go", "", 1)
mmp := strings.SplitN(stable, ".", 3)