mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-20 18:31:15 +00:00
[go1.15] Update to go1.15
Signed-off-by: Stephen Augustus <saugustus@vmware.com>
This commit is contained in:
parent
5d1e299230
commit
aa2bb18a2b
@ -1 +1 @@
|
||||
v1.15.0-rc.2-1
|
||||
v1.15.0-1
|
||||
|
@ -82,21 +82,17 @@ dependencies:
|
||||
- path: cluster/images/etcd/migrate/options.go
|
||||
|
||||
# Golang
|
||||
- name: "golang"
|
||||
version: 1.15.0-rc.2
|
||||
- name: "golang: upstream version"
|
||||
version: 1.15
|
||||
refPaths:
|
||||
- path: build/build-image/cross/VERSION
|
||||
- path: build/root/WORKSPACE
|
||||
match: (override_)?go_version = "((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)"
|
||||
|
||||
- name: "golang: upstream container image"
|
||||
version: 1.15rc2
|
||||
refPaths:
|
||||
match: (override_)?go_version = "\d+.\d+(alpha|beta|rc)?\.?\d+"
|
||||
- path: test/images/Makefile
|
||||
match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)?\.?\d+
|
||||
|
||||
- name: "k8s.gcr.io/kube-cross: dependents"
|
||||
version: v1.15.0-rc.2-1
|
||||
version: v1.15.0-1
|
||||
refPaths:
|
||||
- path: build/build-image/cross/VERSION
|
||||
- path: test/images/sample-apiserver/Dockerfile
|
||||
|
@ -23,10 +23,7 @@ load("@io_k8s_repo_infra//:repos.bzl", repo_infra_configure = "configure", repo_
|
||||
# 'override_go_version': used to specify an alternate go version provided
|
||||
# by kubernetes/repo-infra
|
||||
repo_infra_configure(
|
||||
# TODO(go1.15): Uncomment once we've published a repo-infra release that supports go1.15
|
||||
#go_version = "1.15.0",
|
||||
# TODO(go1.15): Comment out once we've published a repo-infra release that supports go1.15
|
||||
override_go_version = "1.15.0-rc.2",
|
||||
go_version = "1.15",
|
||||
minimum_bazel_version = "2.2.0",
|
||||
)
|
||||
|
||||
|
@ -16,7 +16,7 @@ REGISTRY ?= gcr.io/kubernetes-e2e-test-images
|
||||
GOARM ?= 7
|
||||
DOCKER_CERT_BASE_PATH ?=
|
||||
QEMUVERSION=v2.9.1
|
||||
GOLANG_VERSION=1.15rc2
|
||||
GOLANG_VERSION=1.15.0
|
||||
export
|
||||
|
||||
ifndef WHAT
|
||||
|
@ -13,7 +13,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
ARG BASEIMAGE
|
||||
FROM k8s.gcr.io/build-image/kube-cross:v1.15.0-rc.2-1 as build_k8s_1_17_sample_apiserver
|
||||
FROM k8s.gcr.io/build-image/kube-cross:v1.15.0-1 as build_k8s_1_17_sample_apiserver
|
||||
|
||||
ENV GOPATH /go
|
||||
RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin
|
||||
|
Loading…
Reference in New Issue
Block a user